implement -h (synopsis only) for preformatted (cat) pages;

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 0ff8b6184d830585ce16602302e64e82dffda76a..e56b2dbc3a898bed41d5c7596002479b5d13b31a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.196 2014/10/30 17:15:28 schwarze Exp $ */
+/*     $Id: main.c,v 1.197 2014/11/11 02:10:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -88,7 +88,7 @@ static        void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);
 static void              parse(struct curparse *, int,
                                const char *, enum mandoclevel *);
-static enum mandoclevel  passthrough(const char *, int);
+static enum mandoclevel  passthrough(const char *, int, int);
 static void              spawn_pager(void);
 static int               toptions(struct curparse *, char *);
 static void              usage(enum argmode) __attribute__((noreturn));
@@ -119,6 +119,7 @@ main(int argc, char *argv[])
        int              fd;
        int              show_usage;
        int              use_pager;
+       int              synopsis_only;
        int              options;
        int              c;
 
@@ -155,6 +156,7 @@ main(int argc, char *argv[])
 
        use_pager = 1;
        show_usage = 0;
+       synopsis_only = 0;
        outmode = OUTMODE_DEF;
 
        while (-1 != (c = getopt(argc, argv,
@@ -174,6 +176,7 @@ main(int argc, char *argv[])
                        break;
                case 'h':
                        (void)strlcat(curp.outopts, "synopsis,", BUFSIZ);
+                       synopsis_only = 1;
                        outmode = OUTMODE_ALL;
                        break;
                case 'I':
@@ -389,7 +392,8 @@ main(int argc, char *argv[])
                                chdir(paths.paths[resp->ipath]);
                                parse(&curp, fd, resp->file, &rc);
                        } else
-                               rc = passthrough(resp->file, fd);
+                               rc = passthrough(resp->file, fd,
+                                   synopsis_only);
                        resp++;
                } else
 #endif
@@ -579,27 +583,63 @@ parse(struct curparse *curp, int fd, const char *file,
 }
 
 static enum mandoclevel
-passthrough(const char *file, int fd)
+passthrough(const char *file, int fd, int synopsis_only)
 {
-       char             buf[BUFSIZ];
+       const char       synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS";
+       const char       synr[] = "SYNOPSIS";
+
+       FILE            *stream;
        const char      *syscall;
-       ssize_t          nr, nw, off;
+       char            *line;
+       size_t           len, off;
+       ssize_t          nw;
+       int              print;
+
+       if ((stream = fdopen(fd, "r")) == NULL) {
+               close(fd);
+               syscall = "fdopen";
+               goto fail;
+       }
 
-       while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0)
-               for (off = 0; off < nr; off += nw)
-                       if ((nw = write(STDOUT_FILENO, buf + off,
-                           (size_t)(nr - off))) == -1 || nw == 0) {
-                               close(fd);
+       print = 0;
+       while ((line = fgetln(stream, &len)) != NULL) {
+               if (synopsis_only) {
+                       if (print) {
+                               if ( ! isspace((unsigned char)*line))
+                                       goto done;
+                               while (len &&
+                                   isspace((unsigned char)*line)) {
+                                       line++;
+                                       len--;
+                               }
+                       } else {
+                               if ((len == sizeof(synb) &&
+                                    ! strncmp(line, synb, len - 1)) ||
+                                   (len == sizeof(synr) &&
+                                    ! strncmp(line, synr, len - 1)))
+                                       print = 1;
+                               continue;
+                       }
+               }
+               for (off = 0; off < len; off += nw)
+                       if ((nw = write(STDOUT_FILENO, line + off,
+                           len - off)) == -1 || nw == 0) {
+                               fclose(stream);
                                syscall = "write";
                                goto fail;
                        }
+       }
 
-       close(fd);
+       if (ferror(stream)) {
+               fclose(stream);
+               syscall = "fgetln";
+               goto fail;
+       }
 
-       if (nr == 0)
-               return(MANDOCLEVEL_OK);
+done:
+       fclose(stream);
+       return(MANDOCLEVEL_OK);
 
-       syscall = "read";
 fail:
        fprintf(stderr, "%s: %s: SYSERR: %s: %s",
            progname, file, syscall, strerror(errno));