[src/netbsd-1-5]: src/libexec/makewhatis Sync with netbsd-current, approved b...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4164eed4c9cc
branches:  netbsd-1-5
changeset: 488465:4164eed4c9cc
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Jul 12 20:18:55 2000 +0000

description:
Sync with netbsd-current, approved by releng-1-5:
Invoke "nroff" and parse its output if an unformatted manual page uses
macros. Fixes PR bin/9083 by Geoff C. Wing.

diffstat:

 libexec/makewhatis/makewhatis.c |  93 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 3 deletions(-)

diffs (145 lines):

diff -r e88d6aa5a5b7 -r 4164eed4c9cc libexec/makewhatis/makewhatis.c
--- a/libexec/makewhatis/makewhatis.c   Mon Jul 10 19:58:45 2000 +0000
+++ b/libexec/makewhatis/makewhatis.c   Wed Jul 12 20:18:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makewhatis.c,v 1.7 2000/01/24 23:03:54 tron Exp $      */
+/*     $NetBSD: makewhatis.c,v 1.7.4.1 2000/07/12 20:18:55 tron Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,17 +43,20 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: makewhatis.c,v 1.7 2000/01/24 23:03:54 tron Exp $");
+__RCSID("$NetBSD: makewhatis.c,v 1.7.4.1 2000/07/12 20:18:55 tron Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
 #include <locale.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -83,6 +86,7 @@
 void            catpreprocess (char *);
 char           *parsecatpage (gzFile *);
 int             manpreprocess (char *);
+char           *nroff (gzFile *);
 char           *parsemanpage (gzFile *, int);
 char           *getwhatisdata (char *);
 void            processmanpages (manpage **,whatis **);
@@ -135,7 +139,7 @@
                default:
                        errx(EXIT_FAILURE, "%s: %s", fe->fts_path,
                            strerror(fe->fts_errno));
-                       /* NOTREACHED */
+
                }
        }
 
@@ -448,6 +452,87 @@
 }
 
 char *
+nroff(gzFile *in)
+{
+       char tempname[MAXPATHLEN], buffer[65536], *data;
+       int tempfd, bytes, pipefd[2], status;
+       pid_t child;
+
+       if (gzrewind(in) < 0) {
+               perror(__progname);
+               return NULL;
+       }
+
+       (void)strcpy(tempname, _PATH_TMP "makewhatis.XXXXXX");
+       if ((tempfd = mkstemp(tempname)) < 0) {
+               perror(__progname);
+               return NULL;
+       }
+
+       while ((bytes = gzread(in, buffer, sizeof(buffer))) > 0)
+               if (write(tempfd, buffer, bytes) != bytes) {
+                       bytes = -1;
+                       break;
+               }
+
+       if ((bytes < 0) ||
+            (lseek(tempfd, 0, SEEK_SET) < 0) ||
+            (pipe(pipefd) < 0)) {
+               perror(__progname);
+               (void)close(tempfd);
+               (void)unlink(tempname);
+               return NULL;
+       }
+
+       switch (child = vfork()) {
+       case -1:
+               perror(__progname);
+               (void)close(pipefd[1]);
+               (void)close(pipefd[0]);
+               (void)close(tempfd);
+               (void)unlink(tempname);
+               return NULL;
+               /* NOTREACHED */
+       case 0:
+               (void)close(pipefd[0]);
+               if (pipefd[1] != STDOUT_FILENO) {
+                       (void)dup2(pipefd[1], STDOUT_FILENO);
+                       (void)close(pipefd[1]);
+               }
+               (void)execlp("nroff", "nroff", "-mandoc", tempname, NULL);
+               _exit(EXIT_FAILURE);
+       default:
+               (void)close(pipefd[1]);
+               (void)close(tempfd);
+               /* NOTREACHED */
+       }
+
+       if ((in = gzdopen(pipefd[0], "r")) == NULL) {
+               if (errno == 0)
+                       errno = ENOMEM;
+               perror(__progname);
+               (void)close(pipefd[0]); /* Child will be killed by SIGPIPE. */
+               (void)unlink(tempname);
+               return NULL;
+       }
+
+       data = parsecatpage(in);
+       while (gzread(in, buffer, sizeof(buffer)) > 0);
+       (void)gzclose(in);
+
+       while (waitpid(child, &status, 0) != child);
+       if ((data != NULL) &&
+           !(WIFEXITED(status) && (WEXITSTATUS(status) == 0))) {
+               free(data);
+               data = NULL;
+       }
+
+       (void)unlink(tempname);
+
+       return data;
+}
+
+char *
 parsemanpage(gzFile *in, int defaultsection)
 {
        char    *section, buffer[8192], *ptr;
@@ -480,6 +565,8 @@
                                (void) strcat(&section[2], ") - ");
                        }
                }
+               else if (strncasecmp(buffer, ".Ds", 3) == 0)
+                       return nroff(in);
        } while ((strncasecmp(buffer, ".Sh NAME", 8) != 0));
 
        do {