tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libexec/makewhatis - Update makewhatis to accommodate zlib API change.

Browse Source 
Syncs with NetBSD-HEAD 17/11/18
This commit is contained in:
Sevan Janiyan 2018-11-17 20:08:21 +00:00
parent 7dc68e4759
commit b102ab2595
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libexec/makewhatis/makewhatis.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: makewhatis.c,v 1.49 2013/06/24 20:57:47 christos Exp $ */ /* $NetBSD: makewhatis.c,v 1.51 2017/10/02 22:14:32 christos Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
#if !defined(lint) #if !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1999\ __COPYRIGHT("@(#) Copyright (c) 1999\
The NetBSD Foundation, Inc. All rights reserved."); The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: makewhatis.c,v 1.49 2013/06/24 20:57:47 christos Exp $"); __RCSID("$NetBSD: makewhatis.c,v 1.51 2017/10/02 22:14:32 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/types.h> #include <sys/types.h>
@ -58,6 +58,7 @@ __RCSID("$NetBSD: makewhatis.c,v 1.49 2013/06/24 20:57:47 christos Exp $");
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include <zlib.h> #include <zlib.h>
#include <util.h> #include <util.h>
@ -97,19 +98,16 @@ static void addwhatis(whatis **, char *, char *);
static char *makesection(int); static char *makesection(int);
static char *makewhatisline(const char *, const char *, const char *); static char *makewhatisline(const char *, const char *, const char *);
static void catpreprocess(char *); static void catpreprocess(char *);
static char *parsecatpage(const char *, gzFile *); static char *parsecatpage(const char *, gzFile);
static int manpreprocess(char *); static int manpreprocess(char *);
static char *nroff(const char *, gzFile *); static char *nroff(const char *, gzFile);
static char *parsemanpage(const char *, gzFile *, int); static char *parsemanpage(const char *, gzFile, int);
static char *getwhatisdata(char *); static char *getwhatisdata(char *);
static void processmanpages(manpage **, whatis **); static void processmanpages(manpage **, whatis **);
static void dumpwhatis(FILE *, whatis *); static void dumpwhatis(FILE *, whatis *);
static int makewhatis(char * const *manpath); static int makewhatis(char * const *manpath);
static char * const default_manpath[] = { static char * const default_manpath[] = {
#if defined(__minix)
"/usr/man",
#endif /* defined(__minix) */
"/usr/share/man", "/usr/share/man",
NULL NULL
}; };
@ -627,7 +625,7 @@ makewhatisline(const char *file, const char *line, const char *section)
} }
static char * static char *
parsecatpage(const char *name, gzFile *in) parsecatpage(const char *name, gzFile in)
{ {
char buffer[8192]; char buffer[8192];
char *section, *ptr, *last; char *section, *ptr, *last;
@ -772,7 +770,7 @@ manpreprocess(char *line)
} }
static char * static char *
nroff(const char *inname, gzFile *in) nroff(const char *inname, gzFile in)
{ {
char tempname[MAXPATHLEN], buffer[65536], *data; char tempname[MAXPATHLEN], buffer[65536], *data;
int tempfd, bytes, pipefd[2], status; int tempfd, bytes, pipefd[2], status;
@ -871,7 +869,7 @@ nroff(const char *inname, gzFile *in)
} }
static char * static char *
parsemanpage(const char *name, gzFile *in, int defaultsection) parsemanpage(const char *name, gzFile in, int defaultsection)
{ {
char *section, buffer[8192], *ptr; char *section, buffer[8192], *ptr;
static const char POD[] = ".\\\" Automatically generated by Pod"; static const char POD[] = ".\\\" Automatically generated by Pod";
@ -1100,7 +1098,7 @@ parsemanpage(const char *name, gzFile *in, int defaultsection)
static char * static char *
getwhatisdata(char *name) getwhatisdata(char *name)
{ {
gzFile *in; gzFile in;
char *data; char *data;
int section; int section;