makewhatis.c revision 1.40.16.1 1 1.40.16.1 yamt /* $NetBSD: makewhatis.c,v 1.40.16.1 2008/05/18 12:30:45 yamt Exp $ */
2 1.1 tron
3 1.1 tron /*-
4 1.1 tron * Copyright (c) 1999 The NetBSD Foundation, Inc.
5 1.1 tron * All rights reserved.
6 1.1 tron *
7 1.1 tron * This code is derived from software contributed to The NetBSD Foundation
8 1.1 tron * by Matthias Scheler.
9 1.1 tron *
10 1.1 tron * Redistribution and use in source and binary forms, with or without
11 1.1 tron * modification, are permitted provided that the following conditions
12 1.1 tron * are met:
13 1.1 tron * 1. Redistributions of source code must retain the above copyright
14 1.1 tron * notice, this list of conditions and the following disclaimer.
15 1.1 tron * 2. Redistributions in binary form must reproduce the above copyright
16 1.1 tron * notice, this list of conditions and the following disclaimer in the
17 1.1 tron * documentation and/or other materials provided with the distribution.
18 1.1 tron *
19 1.1 tron * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 1.1 tron * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 1.1 tron * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 1.18 christos * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 1.1 tron * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 1.1 tron * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 1.1 tron * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 1.1 tron * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 1.1 tron * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 1.1 tron * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 1.1 tron * POSSIBILITY OF SUCH DAMAGE.
30 1.1 tron */
31 1.1 tron
32 1.30 lukem #if HAVE_NBTOOL_CONFIG_H
33 1.30 lukem #include "nbtool_config.h"
34 1.30 lukem #endif
35 1.30 lukem
36 1.1 tron #include <sys/cdefs.h>
37 1.30 lukem #if !defined(lint)
38 1.1 tron __COPYRIGHT("@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\n\
39 1.1 tron All rights reserved.\n");
40 1.40.16.1 yamt __RCSID("$NetBSD: makewhatis.c,v 1.40.16.1 2008/05/18 12:30:45 yamt Exp $");
41 1.1 tron #endif /* not lint */
42 1.21 tv
43 1.1 tron #include <sys/types.h>
44 1.8 tron #include <sys/param.h>
45 1.23 jdolecek #include <sys/queue.h>
46 1.1 tron #include <sys/stat.h>
47 1.8 tron #include <sys/wait.h>
48 1.1 tron
49 1.1 tron #include <ctype.h>
50 1.21 tv #include <err.h>
51 1.1 tron #include <errno.h>
52 1.10 tron #include <fcntl.h>
53 1.21 tv #include <fts.h>
54 1.23 jdolecek #include <glob.h>
55 1.1 tron #include <locale.h>
56 1.8 tron #include <paths.h>
57 1.11 tron #include <signal.h>
58 1.1 tron #include <stdio.h>
59 1.1 tron #include <stdlib.h>
60 1.1 tron #include <string.h>
61 1.1 tron #include <unistd.h>
62 1.1 tron #include <zlib.h>
63 1.40 christos #include <util.h>
64 1.1 tron
65 1.26 thorpej #include <man/manconf.h>
66 1.23 jdolecek #include <man/pathnames.h>
67 1.23 jdolecek
68 1.28 wiz #ifndef NROFF
69 1.28 wiz #define NROFF "nroff"
70 1.28 wiz #endif
71 1.28 wiz
72 1.1 tron typedef struct manpagestruct manpage;
73 1.1 tron struct manpagestruct {
74 1.1 tron manpage *mp_left,*mp_right;
75 1.1 tron ino_t mp_inode;
76 1.22 jdolecek size_t mp_sdoff;
77 1.22 jdolecek size_t mp_sdlen;
78 1.18 christos char mp_name[1];
79 1.1 tron };
80 1.1 tron
81 1.1 tron typedef struct whatisstruct whatis;
82 1.1 tron struct whatisstruct {
83 1.1 tron whatis *wi_left,*wi_right;
84 1.1 tron char *wi_data;
85 1.22 jdolecek char wi_prefix[1];
86 1.1 tron };
87 1.1 tron
88 1.37 tron int main(int, char * const *);
89 1.37 tron static char *findwhitespace(char *);
90 1.37 tron static char *strmove(char *,char *);
91 1.37 tron static char *GetS(gzFile, char *, size_t);
92 1.37 tron static int pathnamesection(const char *, const char *);
93 1.37 tron static int manpagesection(char *);
94 1.37 tron static char *createsectionstring(char *);
95 1.37 tron static void addmanpage(manpage **, ino_t, char *, size_t, size_t);
96 1.37 tron static void addwhatis(whatis **, char *, char *);
97 1.37 tron static char *makesection(int);
98 1.37 tron static char *makewhatisline(const char *, const char *, const char *);
99 1.37 tron static void catpreprocess(char *);
100 1.37 tron static char *parsecatpage(const char *, gzFile *);
101 1.37 tron static int manpreprocess(char *);
102 1.37 tron static char *nroff(const char *, gzFile *);
103 1.37 tron static char *parsemanpage(const char *, gzFile *, int);
104 1.37 tron static char *getwhatisdata(char *);
105 1.37 tron static void processmanpages(manpage **,whatis **);
106 1.37 tron static void dumpwhatis(FILE *, whatis *);
107 1.37 tron static int makewhatis(char * const *manpath);
108 1.1 tron
109 1.37 tron static char * const default_manpath[] = {
110 1.1 tron "/usr/share/man",
111 1.1 tron NULL
112 1.1 tron };
113 1.1 tron
114 1.37 tron static const char *sectionext = "0123456789ln";
115 1.37 tron static const char *whatisdb = _PATH_WHATIS;
116 1.37 tron static int dowarn = 0;
117 1.37 tron
118 1.37 tron #define ISALPHA(c) isalpha((unsigned char)(c))
119 1.37 tron #define ISDIGIT(c) isdigit((unsigned char)(c))
120 1.37 tron #define ISSPACE(c) isspace((unsigned char)(c))
121 1.1 tron
122 1.1 tron int
123 1.22 jdolecek main(int argc, char *const *argv)
124 1.1 tron {
125 1.37 tron char * const *manpath;
126 1.37 tron int c, dofork;
127 1.37 tron const char *conffile;
128 1.37 tron ENTRY *ep;
129 1.37 tron TAG *tp;
130 1.37 tron int rv, jobs, status;
131 1.37 tron glob_t pg;
132 1.37 tron char *paths[2], **p, *sl;
133 1.37 tron int retval;
134 1.37 tron
135 1.37 tron dofork = 1;
136 1.37 tron conffile = NULL;
137 1.37 tron jobs = 0;
138 1.37 tron retval = EXIT_SUCCESS;
139 1.23 jdolecek
140 1.23 jdolecek (void)setlocale(LC_ALL, "");
141 1.23 jdolecek
142 1.37 tron while ((c = getopt(argc, argv, "C:fw")) != -1) {
143 1.37 tron switch (c) {
144 1.23 jdolecek case 'C':
145 1.23 jdolecek conffile = optarg;
146 1.23 jdolecek break;
147 1.23 jdolecek case 'f':
148 1.23 jdolecek /* run all processing on foreground */
149 1.23 jdolecek dofork = 0;
150 1.23 jdolecek break;
151 1.34 christos case 'w':
152 1.34 christos dowarn++;
153 1.34 christos break;
154 1.23 jdolecek default:
155 1.35 wiz fprintf(stderr, "Usage: %s [-fw] [-C file] [manpath ...]\n",
156 1.23 jdolecek getprogname());
157 1.23 jdolecek exit(EXIT_FAILURE);
158 1.23 jdolecek }
159 1.23 jdolecek }
160 1.23 jdolecek argc -= optind;
161 1.23 jdolecek argv += optind;
162 1.23 jdolecek
163 1.24 jdolecek if (argc >= 1) {
164 1.23 jdolecek manpath = &argv[0];
165 1.23 jdolecek
166 1.23 jdolecek mkwhatis:
167 1.37 tron return makewhatis(manpath);
168 1.23 jdolecek }
169 1.23 jdolecek
170 1.23 jdolecek /*
171 1.23 jdolecek * Try read config file, fallback to default_manpath[]
172 1.23 jdolecek * if man.conf not available.
173 1.23 jdolecek */
174 1.23 jdolecek config(conffile);
175 1.39 chuck if ((tp = gettag("_whatdb", 0)) == NULL) {
176 1.23 jdolecek manpath = default_manpath;
177 1.23 jdolecek goto mkwhatis;
178 1.23 jdolecek }
179 1.23 jdolecek
180 1.23 jdolecek /* Build individual databases */
181 1.23 jdolecek paths[1] = NULL;
182 1.39 chuck TAILQ_FOREACH(ep, &tp->entrylist, q) {
183 1.23 jdolecek if ((rv = glob(ep->s,
184 1.23 jdolecek GLOB_BRACE | GLOB_NOSORT | GLOB_ERR | GLOB_NOCHECK,
185 1.23 jdolecek NULL, &pg)) != 0)
186 1.23 jdolecek err(EXIT_FAILURE, "glob('%s')", ep->s);
187 1.23 jdolecek
188 1.23 jdolecek /* We always have something to work with here */
189 1.23 jdolecek for (p = pg.gl_pathv; *p; p++) {
190 1.23 jdolecek sl = strrchr(*p, '/');
191 1.37 tron if (sl == NULL) {
192 1.37 tron err(EXIT_FAILURE, "glob: _whatdb entry '%s' "
193 1.37 tron "doesn't contain slash", ep->s);
194 1.37 tron }
195 1.23 jdolecek
196 1.23 jdolecek /*
197 1.23 jdolecek * Cut the last component of path, leaving just
198 1.23 jdolecek * the directory. We will use the result as root
199 1.23 jdolecek * for manpage search.
200 1.23 jdolecek * glob malloc()s space for the paths, so it's
201 1.23 jdolecek * okay to change it in-place.
202 1.23 jdolecek */
203 1.23 jdolecek *sl = '\0';
204 1.23 jdolecek paths[0] = *p;
205 1.23 jdolecek
206 1.23 jdolecek if (!dofork) {
207 1.23 jdolecek /* Do not fork child */
208 1.23 jdolecek makewhatis(paths);
209 1.23 jdolecek continue;
210 1.23 jdolecek }
211 1.23 jdolecek
212 1.23 jdolecek switch (fork()) {
213 1.23 jdolecek case 0:
214 1.23 jdolecek exit(makewhatis(paths));
215 1.23 jdolecek break;
216 1.23 jdolecek case -1:
217 1.23 jdolecek warn("fork");
218 1.23 jdolecek makewhatis(paths);
219 1.23 jdolecek break;
220 1.23 jdolecek default:
221 1.23 jdolecek jobs++;
222 1.23 jdolecek break;
223 1.23 jdolecek }
224 1.23 jdolecek
225 1.23 jdolecek }
226 1.23 jdolecek
227 1.23 jdolecek globfree(&pg);
228 1.23 jdolecek }
229 1.23 jdolecek
230 1.23 jdolecek /* Wait for the childern to finish */
231 1.37 tron while (jobs > 0) {
232 1.37 tron (void)wait(&status);
233 1.23 jdolecek if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
234 1.23 jdolecek retval = EXIT_FAILURE;
235 1.23 jdolecek jobs--;
236 1.23 jdolecek }
237 1.23 jdolecek
238 1.37 tron return retval;
239 1.23 jdolecek }
240 1.23 jdolecek
241 1.23 jdolecek static int
242 1.23 jdolecek makewhatis(char * const * manpath)
243 1.23 jdolecek {
244 1.1 tron FTS *fts;
245 1.1 tron FTSENT *fe;
246 1.18 christos manpage *source;
247 1.1 tron whatis *dest;
248 1.1 tron FILE *out;
249 1.22 jdolecek size_t sdoff, sdlen;
250 1.1 tron
251 1.18 christos if ((fts = fts_open(manpath, FTS_LOGICAL, NULL)) == NULL)
252 1.18 christos err(EXIT_FAILURE, "Cannot open `%s'", *manpath);
253 1.1 tron
254 1.1 tron source = NULL;
255 1.1 tron while ((fe = fts_read(fts)) != NULL) {
256 1.1 tron switch (fe->fts_info) {
257 1.1 tron case FTS_F:
258 1.22 jdolecek if (manpagesection(fe->fts_path) >= 0) {
259 1.22 jdolecek /*
260 1.22 jdolecek * Get manpage subdirectory prefix. Most
261 1.22 jdolecek * commonly, this is arch-specific subdirectory.
262 1.22 jdolecek */
263 1.22 jdolecek if (fe->fts_level >= 3) {
264 1.37 tron int sl;
265 1.37 tron const char *s, *lsl;
266 1.22 jdolecek
267 1.37 tron lsl = NULL;
268 1.37 tron s = &fe->fts_path[fe->fts_pathlen - 1];
269 1.37 tron for(sl = fe->fts_level - 1; sl > 0;
270 1.37 tron sl--) {
271 1.22 jdolecek s--;
272 1.37 tron while (s[0] != '/')
273 1.37 tron s--;
274 1.37 tron if (lsl == NULL)
275 1.22 jdolecek lsl = s;
276 1.22 jdolecek }
277 1.22 jdolecek
278 1.22 jdolecek /* Include trailing '/', so we get
279 1.22 jdolecek * 'arch/'. */
280 1.22 jdolecek sdoff = s + 1 - fe->fts_path;
281 1.22 jdolecek sdlen = lsl - s + 1;
282 1.22 jdolecek } else {
283 1.22 jdolecek sdoff = 0;
284 1.22 jdolecek sdlen = 0;
285 1.22 jdolecek }
286 1.22 jdolecek
287 1.18 christos addmanpage(&source, fe->fts_statp->st_ino,
288 1.22 jdolecek fe->fts_path, sdoff, sdlen);
289 1.22 jdolecek }
290 1.18 christos /*FALLTHROUGH*/
291 1.1 tron case FTS_D:
292 1.4 tron case FTS_DC:
293 1.4 tron case FTS_DEFAULT:
294 1.1 tron case FTS_DP:
295 1.38 christos case FTS_SL:
296 1.38 christos case FTS_DOT:
297 1.38 christos case FTS_W:
298 1.38 christos case FTS_NSOK:
299 1.38 christos case FTS_INIT:
300 1.38 christos break;
301 1.4 tron case FTS_SLNONE:
302 1.38 christos warnx("Symbolic link with no target: `%s'",
303 1.38 christos fe->fts_path);
304 1.38 christos break;
305 1.38 christos case FTS_DNR:
306 1.38 christos warnx("Unreadable directory: `%s'", fe->fts_path);
307 1.38 christos break;
308 1.38 christos case FTS_NS:
309 1.38 christos errno = fe->fts_errno;
310 1.38 christos warn("Cannot stat `%s'", fe->fts_path);
311 1.38 christos break;
312 1.38 christos case FTS_ERR:
313 1.38 christos errno = fe->fts_errno;
314 1.38 christos warn("Error reading `%s'", fe->fts_path);
315 1.1 tron break;
316 1.1 tron default:
317 1.38 christos errx(EXIT_FAILURE, "Unknown info %d returned from fts "
318 1.38 christos " for path: `%s'", fe->fts_info, fe->fts_path);
319 1.1 tron }
320 1.1 tron }
321 1.1 tron
322 1.1 tron (void)fts_close(fts);
323 1.1 tron
324 1.1 tron dest = NULL;
325 1.1 tron processmanpages(&source, &dest);
326 1.1 tron
327 1.18 christos if (chdir(manpath[0]) == -1)
328 1.18 christos err(EXIT_FAILURE, "Cannot change dir to `%s'", manpath[0]);
329 1.1 tron
330 1.18 christos (void)unlink(whatisdb);
331 1.1 tron if ((out = fopen(whatisdb, "w")) == NULL)
332 1.18 christos err(EXIT_FAILURE, "Cannot open `%s'", whatisdb);
333 1.1 tron
334 1.18 christos dumpwhatis(out, dest);
335 1.18 christos if (fchmod(fileno(out), S_IRUSR|S_IRGRP|S_IROTH) == -1)
336 1.18 christos err(EXIT_FAILURE, "Cannot chmod `%s'", whatisdb);
337 1.18 christos if (fclose(out) != 0)
338 1.18 christos err(EXIT_FAILURE, "Cannot close `%s'", whatisdb);
339 1.1 tron
340 1.1 tron return EXIT_SUCCESS;
341 1.1 tron }
342 1.1 tron
343 1.37 tron static char *
344 1.18 christos findwhitespace(char *str)
345 1.6 tron {
346 1.37 tron while (!ISSPACE(*str))
347 1.6 tron if (*str++ == '\0') {
348 1.6 tron str = NULL;
349 1.6 tron break;
350 1.6 tron }
351 1.6 tron
352 1.6 tron return str;
353 1.6 tron }
354 1.6 tron
355 1.37 tron static char
356 1.14 tron *strmove(char *dest,char *src)
357 1.14 tron {
358 1.14 tron return memmove(dest, src, strlen(src) + 1);
359 1.14 tron }
360 1.14 tron
361 1.37 tron static char *
362 1.18 christos GetS(gzFile in, char *buffer, size_t length)
363 1.5 tron {
364 1.5 tron char *ptr;
365 1.5 tron
366 1.18 christos if (((ptr = gzgets(in, buffer, (int)length)) != NULL) && (*ptr == '\0'))
367 1.5 tron ptr = NULL;
368 1.5 tron
369 1.5 tron return ptr;
370 1.5 tron }
371 1.5 tron
372 1.37 tron static char *
373 1.34 christos makesection(int s)
374 1.34 christos {
375 1.34 christos char sectionbuffer[24];
376 1.34 christos if (s == -1)
377 1.34 christos return NULL;
378 1.34 christos (void)snprintf(sectionbuffer, sizeof(sectionbuffer),
379 1.34 christos " (%c) - ", sectionext[s]);
380 1.34 christos return estrdup(sectionbuffer);
381 1.34 christos }
382 1.34 christos
383 1.37 tron static int
384 1.34 christos pathnamesection(const char *pat, const char *name)
385 1.34 christos {
386 1.34 christos char *ptr, *ext;
387 1.34 christos size_t len = strlen(pat);
388 1.34 christos
389 1.34 christos
390 1.34 christos while ((ptr = strstr(name, pat)) != NULL) {
391 1.34 christos if ((ext = strchr(sectionext, ptr[len])) != NULL) {
392 1.34 christos return ext - sectionext;
393 1.34 christos }
394 1.34 christos name = ptr + 1;
395 1.34 christos }
396 1.34 christos return -1;
397 1.34 christos }
398 1.34 christos
399 1.34 christos
400 1.37 tron static int
401 1.1 tron manpagesection(char *name)
402 1.1 tron {
403 1.1 tron char *ptr;
404 1.1 tron
405 1.1 tron if ((ptr = strrchr(name, '/')) != NULL)
406 1.1 tron ptr++;
407 1.1 tron else
408 1.1 tron ptr = name;
409 1.1 tron
410 1.4 tron while ((ptr = strchr(ptr, '.')) != NULL) {
411 1.4 tron int section;
412 1.4 tron
413 1.4 tron ptr++;
414 1.34 christos section = 0;
415 1.4 tron while (sectionext[section] != '\0')
416 1.4 tron if (sectionext[section] == *ptr)
417 1.4 tron return section;
418 1.4 tron else
419 1.4 tron section++;
420 1.4 tron }
421 1.1 tron return -1;
422 1.1 tron }
423 1.1 tron
424 1.37 tron static char *
425 1.18 christos createsectionstring(char *section_id)
426 1.14 tron {
427 1.29 itojun char *section;
428 1.29 itojun
429 1.29 itojun if (asprintf(§ion, " (%s) - ", section_id) < 0)
430 1.29 itojun err(EXIT_FAILURE, "malloc failed");
431 1.14 tron return section;
432 1.14 tron }
433 1.14 tron
434 1.37 tron static void
435 1.22 jdolecek addmanpage(manpage **tree,ino_t inode,char *name, size_t sdoff, size_t sdlen)
436 1.1 tron {
437 1.18 christos manpage *mp;
438 1.1 tron
439 1.1 tron while ((mp = *tree) != NULL) {
440 1.1 tron if (mp->mp_inode == inode)
441 1.18 christos return;
442 1.18 christos tree = inode < mp->mp_inode ? &mp->mp_left : &mp->mp_right;
443 1.1 tron }
444 1.1 tron
445 1.18 christos mp = emalloc(sizeof(manpage) + strlen(name));
446 1.1 tron mp->mp_left = NULL;
447 1.1 tron mp->mp_right = NULL;
448 1.1 tron mp->mp_inode = inode;
449 1.22 jdolecek mp->mp_sdoff = sdoff;
450 1.22 jdolecek mp->mp_sdlen = sdlen;
451 1.18 christos (void)strcpy(mp->mp_name, name);
452 1.1 tron *tree = mp;
453 1.1 tron }
454 1.1 tron
455 1.37 tron static void
456 1.22 jdolecek addwhatis(whatis **tree, char *data, char *prefix)
457 1.1 tron {
458 1.1 tron whatis *wi;
459 1.1 tron int result;
460 1.1 tron
461 1.37 tron while (ISSPACE(*data))
462 1.7 tron data++;
463 1.7 tron
464 1.7 tron if (*data == '/') {
465 1.7 tron char *ptr;
466 1.7 tron
467 1.7 tron ptr = ++data;
468 1.37 tron while ((*ptr != '\0') && !ISSPACE(*ptr))
469 1.7 tron if (*ptr++ == '/')
470 1.7 tron data = ptr;
471 1.7 tron }
472 1.7 tron
473 1.1 tron while ((wi = *tree) != NULL) {
474 1.18 christos result = strcmp(data, wi->wi_data);
475 1.18 christos if (result == 0) return;
476 1.18 christos tree = result < 0 ? &wi->wi_left : &wi->wi_right;
477 1.1 tron }
478 1.1 tron
479 1.22 jdolecek wi = emalloc(sizeof(whatis) + strlen(prefix));
480 1.1 tron
481 1.1 tron wi->wi_left = NULL;
482 1.1 tron wi->wi_right = NULL;
483 1.1 tron wi->wi_data = data;
484 1.22 jdolecek if (prefix[0] != '\0')
485 1.22 jdolecek (void) strcpy(wi->wi_prefix, prefix);
486 1.22 jdolecek else
487 1.22 jdolecek wi->wi_prefix[0] = '\0';
488 1.1 tron *tree = wi;
489 1.1 tron }
490 1.1 tron
491 1.37 tron static void
492 1.1 tron catpreprocess(char *from)
493 1.1 tron {
494 1.1 tron char *to;
495 1.1 tron
496 1.1 tron to = from;
497 1.37 tron while (ISSPACE(*from)) from++;
498 1.1 tron
499 1.1 tron while (*from != '\0')
500 1.37 tron if (ISSPACE(*from)) {
501 1.37 tron while (ISSPACE(*++from));
502 1.1 tron if (*from != '\0')
503 1.1 tron *to++ = ' ';
504 1.1 tron }
505 1.32 christos else if (*(from + 1) == '\b')
506 1.1 tron from += 2;
507 1.1 tron else
508 1.1 tron *to++ = *from++;
509 1.1 tron
510 1.1 tron *to = '\0';
511 1.1 tron }
512 1.1 tron
513 1.37 tron static char *
514 1.34 christos makewhatisline(const char *file, const char *line, const char *section)
515 1.1 tron {
516 1.34 christos static const char *del[] = {
517 1.34 christos " - ",
518 1.34 christos " -- ",
519 1.34 christos "- ",
520 1.34 christos " -",
521 1.34 christos NULL
522 1.34 christos };
523 1.34 christos size_t i, pos;
524 1.34 christos size_t llen, slen, dlen;
525 1.34 christos char *result, *ptr;
526 1.1 tron
527 1.36 lukem ptr = NULL;
528 1.34 christos if (section == NULL) {
529 1.34 christos if (dowarn)
530 1.34 christos warnx("%s: No section provided for `%s'", file, line);
531 1.34 christos return estrdup(line);
532 1.34 christos }
533 1.1 tron
534 1.34 christos for (i = 0; del[i]; i++)
535 1.34 christos if ((ptr = strstr(line, del[i])) != NULL)
536 1.34 christos break;
537 1.1 tron
538 1.34 christos if (del[i] == NULL) {
539 1.34 christos if (dowarn)
540 1.34 christos warnx("%s: Bad format line `%s'", file, line);
541 1.34 christos return estrdup(line);
542 1.34 christos }
543 1.34 christos
544 1.34 christos slen = strlen(section);
545 1.34 christos llen = strlen(line);
546 1.34 christos dlen = strlen(del[i]);
547 1.34 christos
548 1.34 christos result = emalloc(llen - dlen + slen + 1);
549 1.34 christos pos = ptr - line;
550 1.34 christos
551 1.34 christos (void)memcpy(result, line, pos);
552 1.34 christos (void)memcpy(&result[pos], section, slen);
553 1.34 christos (void)strcpy(&result[pos + slen], &line[pos + dlen]);
554 1.1 tron return result;
555 1.1 tron }
556 1.1 tron
557 1.37 tron static char *
558 1.34 christos parsecatpage(const char *name, gzFile *in)
559 1.1 tron {
560 1.18 christos char buffer[8192];
561 1.1 tron char *section, *ptr, *last;
562 1.18 christos size_t size;
563 1.1 tron
564 1.1 tron do {
565 1.5 tron if (GetS(in, buffer, sizeof(buffer)) == NULL)
566 1.1 tron return NULL;
567 1.1 tron }
568 1.1 tron while (buffer[0] == '\n');
569 1.1 tron
570 1.1 tron section = NULL;
571 1.1 tron if ((ptr = strchr(buffer, '(')) != NULL) {
572 1.1 tron if ((last = strchr(ptr + 1, ')')) !=NULL) {
573 1.18 christos size_t length;
574 1.1 tron
575 1.1 tron length = last - ptr + 1;
576 1.18 christos section = emalloc(length + 5);
577 1.1 tron *section = ' ';
578 1.1 tron (void) memcpy(section + 1, ptr, length);
579 1.1 tron (void) strcpy(section + 1 + length, " - ");
580 1.1 tron }
581 1.1 tron }
582 1.1 tron
583 1.1 tron for (;;) {
584 1.5 tron if (GetS(in, buffer, sizeof(buffer)) == NULL) {
585 1.1 tron free(section);
586 1.1 tron return NULL;
587 1.1 tron }
588 1.16 tron catpreprocess(buffer);
589 1.16 tron if (strncmp(buffer, "NAME", 4) == 0)
590 1.1 tron break;
591 1.1 tron }
592 1.34 christos if (section == NULL)
593 1.34 christos section = makesection(pathnamesection("/cat", name));
594 1.1 tron
595 1.1 tron ptr = last = buffer;
596 1.1 tron size = sizeof(buffer) - 1;
597 1.5 tron while ((size > 0) && (GetS(in, ptr, size) != NULL)) {
598 1.1 tron int length;
599 1.1 tron
600 1.1 tron catpreprocess(ptr);
601 1.1 tron
602 1.1 tron length = strlen(ptr);
603 1.1 tron if (length == 0) {
604 1.1 tron *last = '\0';
605 1.1 tron
606 1.34 christos ptr = makewhatisline(name, buffer, section);
607 1.1 tron free(section);
608 1.1 tron return ptr;
609 1.1 tron }
610 1.1 tron if ((length > 1) && (ptr[length - 1] == '-') &&
611 1.37 tron ISALPHA(ptr[length - 2]))
612 1.1 tron last = &ptr[--length];
613 1.1 tron else {
614 1.1 tron last = &ptr[length++];
615 1.1 tron *last = ' ';
616 1.1 tron }
617 1.1 tron
618 1.1 tron ptr += length;
619 1.1 tron size -= length;
620 1.1 tron }
621 1.1 tron
622 1.1 tron free(section);
623 1.1 tron
624 1.1 tron return NULL;
625 1.1 tron }
626 1.1 tron
627 1.37 tron static int
628 1.1 tron manpreprocess(char *line)
629 1.1 tron {
630 1.1 tron char *from, *to;
631 1.1 tron
632 1.1 tron to = from = line;
633 1.37 tron while (ISSPACE(*from))
634 1.37 tron from++;
635 1.1 tron if (strncmp(from, ".\\\"", 3) == 0)
636 1.1 tron return 1;
637 1.1 tron
638 1.1 tron while (*from != '\0')
639 1.37 tron if (ISSPACE(*from)) {
640 1.37 tron while (ISSPACE(*++from));
641 1.1 tron if ((*from != '\0') && (*from != ','))
642 1.1 tron *to++ = ' ';
643 1.37 tron } else if (*from == '\\') {
644 1.1 tron switch (*++from) {
645 1.1 tron case '\0':
646 1.1 tron case '-':
647 1.1 tron break;
648 1.14 tron case 'f':
649 1.7 tron case 's':
650 1.14 tron from++;
651 1.7 tron if ((*from=='+') || (*from=='-'))
652 1.7 tron from++;
653 1.37 tron while (ISDIGIT(*from))
654 1.7 tron from++;
655 1.7 tron break;
656 1.1 tron default:
657 1.1 tron from++;
658 1.1 tron }
659 1.37 tron } else {
660 1.1 tron if (*from == '"')
661 1.1 tron from++;
662 1.1 tron else
663 1.1 tron *to++ = *from++;
664 1.37 tron }
665 1.1 tron
666 1.1 tron *to = '\0';
667 1.1 tron
668 1.1 tron if (strncasecmp(line, ".Xr", 3) == 0) {
669 1.1 tron char *sect;
670 1.1 tron
671 1.1 tron from = line + 3;
672 1.37 tron if (ISSPACE(*from))
673 1.1 tron from++;
674 1.1 tron
675 1.6 tron if ((sect = findwhitespace(from)) != NULL) {
676 1.19 tron size_t length;
677 1.19 tron char *trail;
678 1.1 tron
679 1.1 tron *sect++ = '\0';
680 1.19 tron if ((trail = findwhitespace(sect)) != NULL)
681 1.19 tron *trail++ = '\0';
682 1.1 tron length = strlen(from);
683 1.1 tron (void) memmove(line, from, length);
684 1.1 tron line[length++] = '(';
685 1.1 tron to = &line[length];
686 1.1 tron length = strlen(sect);
687 1.1 tron (void) memmove(to, sect, length);
688 1.19 tron if (trail == NULL) {
689 1.19 tron (void) strcpy(&to[length], ")");
690 1.19 tron } else {
691 1.19 tron to += length;
692 1.19 tron *to++ = ')';
693 1.19 tron length = strlen(trail);
694 1.19 tron (void) memmove(to, trail, length + 1);
695 1.19 tron }
696 1.1 tron }
697 1.1 tron }
698 1.1 tron
699 1.1 tron return 0;
700 1.1 tron }
701 1.1 tron
702 1.37 tron static char *
703 1.34 christos nroff(const char *inname, gzFile *in)
704 1.8 tron {
705 1.9 tron char tempname[MAXPATHLEN], buffer[65536], *data;
706 1.9 tron int tempfd, bytes, pipefd[2], status;
707 1.10 tron static int devnull = -1;
708 1.8 tron pid_t child;
709 1.8 tron
710 1.18 christos if (gzrewind(in) < 0)
711 1.18 christos err(EXIT_FAILURE, "Cannot rewind pipe");
712 1.8 tron
713 1.10 tron if ((devnull < 0) &&
714 1.18 christos ((devnull = open(_PATH_DEVNULL, O_WRONLY, 0)) < 0))
715 1.18 christos err(EXIT_FAILURE, "Cannot open `/dev/null'");
716 1.10 tron
717 1.29 itojun (void)strlcpy(tempname, _PATH_TMP "makewhatis.XXXXXX",
718 1.29 itojun sizeof(tempname));
719 1.18 christos if ((tempfd = mkstemp(tempname)) == -1)
720 1.18 christos err(EXIT_FAILURE, "Cannot create temp file");
721 1.8 tron
722 1.8 tron while ((bytes = gzread(in, buffer, sizeof(buffer))) > 0)
723 1.18 christos if (write(tempfd, buffer, (size_t)bytes) != bytes) {
724 1.8 tron bytes = -1;
725 1.8 tron break;
726 1.8 tron }
727 1.8 tron
728 1.18 christos if (bytes < 0) {
729 1.18 christos (void)close(tempfd);
730 1.18 christos (void)unlink(tempname);
731 1.18 christos err(EXIT_FAILURE, "Read from pipe failed");
732 1.18 christos }
733 1.18 christos if (lseek(tempfd, (off_t)0, SEEK_SET) == (off_t)-1) {
734 1.18 christos (void)close(tempfd);
735 1.18 christos (void)unlink(tempname);
736 1.18 christos err(EXIT_FAILURE, "Cannot rewind temp file");
737 1.18 christos }
738 1.18 christos if (pipe(pipefd) == -1) {
739 1.8 tron (void)close(tempfd);
740 1.8 tron (void)unlink(tempname);
741 1.18 christos err(EXIT_FAILURE, "Cannot create pipe");
742 1.8 tron }
743 1.8 tron
744 1.8 tron switch (child = vfork()) {
745 1.8 tron case -1:
746 1.8 tron (void)close(pipefd[1]);
747 1.8 tron (void)close(pipefd[0]);
748 1.8 tron (void)close(tempfd);
749 1.8 tron (void)unlink(tempname);
750 1.18 christos err(EXIT_FAILURE, "Fork failed");
751 1.8 tron /* NOTREACHED */
752 1.8 tron case 0:
753 1.8 tron (void)close(pipefd[0]);
754 1.10 tron if (tempfd != STDIN_FILENO) {
755 1.10 tron (void)dup2(tempfd, STDIN_FILENO);
756 1.10 tron (void)close(tempfd);
757 1.10 tron }
758 1.8 tron if (pipefd[1] != STDOUT_FILENO) {
759 1.8 tron (void)dup2(pipefd[1], STDOUT_FILENO);
760 1.8 tron (void)close(pipefd[1]);
761 1.8 tron }
762 1.10 tron if (devnull != STDERR_FILENO) {
763 1.10 tron (void)dup2(devnull, STDERR_FILENO);
764 1.10 tron (void)close(devnull);
765 1.10 tron }
766 1.28 wiz (void)execlp(NROFF, NROFF, "-S", "-man", NULL);
767 1.8 tron _exit(EXIT_FAILURE);
768 1.18 christos /*NOTREACHED*/
769 1.8 tron default:
770 1.8 tron (void)close(pipefd[1]);
771 1.8 tron (void)close(tempfd);
772 1.18 christos break;
773 1.8 tron }
774 1.8 tron
775 1.8 tron if ((in = gzdopen(pipefd[0], "r")) == NULL) {
776 1.8 tron if (errno == 0)
777 1.8 tron errno = ENOMEM;
778 1.11 tron (void)close(pipefd[0]);
779 1.11 tron (void)kill(child, SIGTERM);
780 1.11 tron while (waitpid(child, NULL, 0) != child);
781 1.8 tron (void)unlink(tempname);
782 1.18 christos err(EXIT_FAILURE, "Cannot read from pipe");
783 1.8 tron }
784 1.8 tron
785 1.34 christos data = parsecatpage(inname, in);
786 1.9 tron while (gzread(in, buffer, sizeof(buffer)) > 0);
787 1.9 tron (void)gzclose(in);
788 1.9 tron
789 1.9 tron while (waitpid(child, &status, 0) != child);
790 1.9 tron if ((data != NULL) &&
791 1.9 tron !(WIFEXITED(status) && (WEXITSTATUS(status) == 0))) {
792 1.9 tron free(data);
793 1.28 wiz errx(EXIT_FAILURE, NROFF " on `%s' exited with %d status",
794 1.27 wiz inname, WEXITSTATUS(status));
795 1.9 tron }
796 1.8 tron
797 1.8 tron (void)unlink(tempname);
798 1.8 tron return data;
799 1.8 tron }
800 1.8 tron
801 1.37 tron static char *
802 1.34 christos parsemanpage(const char *name, gzFile *in, int defaultsection)
803 1.1 tron {
804 1.1 tron char *section, buffer[8192], *ptr;
805 1.1 tron
806 1.1 tron section = NULL;
807 1.1 tron do {
808 1.5 tron if (GetS(in, buffer, sizeof(buffer) - 1) == NULL) {
809 1.1 tron free(section);
810 1.1 tron return NULL;
811 1.1 tron }
812 1.1 tron if (manpreprocess(buffer))
813 1.1 tron continue;
814 1.1 tron if (strncasecmp(buffer, ".Dt", 3) == 0) {
815 1.1 tron char *end;
816 1.1 tron
817 1.1 tron ptr = &buffer[3];
818 1.37 tron if (ISSPACE(*ptr))
819 1.1 tron ptr++;
820 1.6 tron if ((ptr = findwhitespace(ptr)) == NULL)
821 1.1 tron continue;
822 1.1 tron
823 1.6 tron if ((end = findwhitespace(++ptr)) != NULL)
824 1.1 tron *end = '\0';
825 1.1 tron
826 1.1 tron free(section);
827 1.14 tron section = createsectionstring(ptr);
828 1.14 tron }
829 1.14 tron else if (strncasecmp(buffer, ".TH", 3) == 0) {
830 1.14 tron ptr = &buffer[3];
831 1.37 tron while (ISSPACE(*ptr))
832 1.14 tron ptr++;
833 1.14 tron if ((ptr = findwhitespace(ptr)) != NULL) {
834 1.14 tron char *next;
835 1.14 tron
836 1.37 tron while (ISSPACE(*ptr))
837 1.14 tron ptr++;
838 1.14 tron if ((next = findwhitespace(ptr)) != NULL)
839 1.14 tron *next = '\0';
840 1.14 tron free(section);
841 1.14 tron section = createsectionstring(ptr);
842 1.1 tron }
843 1.1 tron }
844 1.14 tron else if (strncasecmp(buffer, ".Ds", 3) == 0) {
845 1.14 tron free(section);
846 1.14 tron return NULL;
847 1.14 tron }
848 1.14 tron } while (strncasecmp(buffer, ".Sh NAME", 8) != 0);
849 1.1 tron
850 1.1 tron do {
851 1.5 tron if (GetS(in, buffer, sizeof(buffer) - 1) == NULL) {
852 1.1 tron free(section);
853 1.1 tron return NULL;
854 1.1 tron }
855 1.1 tron } while (manpreprocess(buffer));
856 1.1 tron
857 1.1 tron if (strncasecmp(buffer, ".Nm", 3) == 0) {
858 1.18 christos size_t length, offset;
859 1.1 tron
860 1.1 tron ptr = &buffer[3];
861 1.37 tron while (ISSPACE(*ptr))
862 1.1 tron ptr++;
863 1.1 tron
864 1.1 tron length = strlen(ptr);
865 1.1 tron if ((length > 1) && (ptr[length - 1] == ',') &&
866 1.37 tron ISSPACE(ptr[length - 2])) {
867 1.1 tron ptr[--length] = '\0';
868 1.1 tron ptr[length - 1] = ',';
869 1.1 tron }
870 1.1 tron (void) memmove(buffer, ptr, length + 1);
871 1.1 tron
872 1.1 tron offset = length + 3;
873 1.1 tron ptr = &buffer[offset];
874 1.1 tron for (;;) {
875 1.18 christos size_t more;
876 1.1 tron
877 1.1 tron if ((sizeof(buffer) == offset) ||
878 1.18 christos (GetS(in, ptr, sizeof(buffer) - offset)
879 1.1 tron == NULL)) {
880 1.1 tron free(section);
881 1.1 tron return NULL;
882 1.1 tron }
883 1.1 tron if (manpreprocess(ptr))
884 1.1 tron continue;
885 1.1 tron
886 1.1 tron if (strncasecmp(ptr, ".Nm", 3) != 0) break;
887 1.1 tron
888 1.1 tron ptr += 3;
889 1.37 tron if (ISSPACE(*ptr))
890 1.1 tron ptr++;
891 1.1 tron
892 1.1 tron buffer[length++] = ' ';
893 1.1 tron more = strlen(ptr);
894 1.1 tron if ((more > 1) && (ptr[more - 1] == ',') &&
895 1.37 tron ISSPACE(ptr[more - 2])) {
896 1.1 tron ptr[--more] = '\0';
897 1.1 tron ptr[more - 1] = ',';
898 1.1 tron }
899 1.1 tron
900 1.1 tron (void) memmove(&buffer[length], ptr, more + 1);
901 1.1 tron length += more;
902 1.1 tron offset = length + 3;
903 1.1 tron
904 1.1 tron ptr = &buffer[offset];
905 1.1 tron }
906 1.1 tron
907 1.1 tron if (strncasecmp(ptr, ".Nd", 3) == 0) {
908 1.29 itojun (void) strlcpy(&buffer[length], " -",
909 1.29 itojun sizeof(buffer) - length);
910 1.1 tron
911 1.1 tron while (strncasecmp(ptr, ".Sh", 3) != 0) {
912 1.1 tron int more;
913 1.1 tron
914 1.1 tron if (*ptr == '.') {
915 1.1 tron char *space;
916 1.1 tron
917 1.37 tron if (strncasecmp(ptr, ".Nd", 3) != 0 ||
918 1.37 tron strchr(ptr, '[') != NULL) {
919 1.15 tron free(section);
920 1.15 tron return NULL;
921 1.15 tron }
922 1.14 tron space = findwhitespace(ptr);
923 1.37 tron if (space == NULL) {
924 1.1 tron ptr = "";
925 1.37 tron } else {
926 1.1 tron space++;
927 1.14 tron (void) strmove(ptr, space);
928 1.1 tron }
929 1.1 tron }
930 1.1 tron
931 1.1 tron if (*ptr != '\0') {
932 1.1 tron buffer[offset - 1] = ' ';
933 1.1 tron more = strlen(ptr) + 1;
934 1.1 tron offset += more;
935 1.1 tron }
936 1.1 tron ptr = &buffer[offset];
937 1.1 tron if ((sizeof(buffer) == offset) ||
938 1.18 christos (GetS(in, ptr, sizeof(buffer) - offset)
939 1.1 tron == NULL)) {
940 1.1 tron free(section);
941 1.1 tron return NULL;
942 1.1 tron }
943 1.1 tron if (manpreprocess(ptr))
944 1.1 tron *ptr = '\0';
945 1.1 tron }
946 1.1 tron }
947 1.1 tron }
948 1.1 tron else {
949 1.1 tron int offset;
950 1.1 tron
951 1.1 tron if (*buffer == '.') {
952 1.1 tron char *space;
953 1.1 tron
954 1.14 tron if ((space = findwhitespace(&buffer[1])) == NULL) {
955 1.1 tron free(section);
956 1.1 tron return NULL;
957 1.1 tron }
958 1.1 tron space++;
959 1.14 tron (void) strmove(buffer, space);
960 1.1 tron }
961 1.1 tron
962 1.1 tron offset = strlen(buffer) + 1;
963 1.1 tron for (;;) {
964 1.1 tron int more;
965 1.1 tron
966 1.1 tron ptr = &buffer[offset];
967 1.1 tron if ((sizeof(buffer) == offset) ||
968 1.18 christos (GetS(in, ptr, sizeof(buffer) - offset)
969 1.1 tron == NULL)) {
970 1.1 tron free(section);
971 1.1 tron return NULL;
972 1.1 tron }
973 1.1 tron if (manpreprocess(ptr) || (*ptr == '\0'))
974 1.1 tron continue;
975 1.1 tron
976 1.5 tron if ((strncasecmp(ptr, ".Sh", 3) == 0) ||
977 1.5 tron (strncasecmp(ptr, ".Ss", 3) == 0))
978 1.1 tron break;
979 1.1 tron
980 1.1 tron if (*ptr == '.') {
981 1.1 tron char *space;
982 1.1 tron
983 1.6 tron if ((space = findwhitespace(ptr)) == NULL) {
984 1.1 tron continue;
985 1.5 tron }
986 1.5 tron
987 1.1 tron space++;
988 1.5 tron (void) memmove(ptr, space, strlen(space) + 1);
989 1.1 tron }
990 1.1 tron
991 1.1 tron buffer[offset - 1] = ' ';
992 1.1 tron more = strlen(ptr);
993 1.1 tron if ((more > 1) && (ptr[more - 1] == ',') &&
994 1.37 tron ISSPACE(ptr[more - 2])) {
995 1.1 tron ptr[more - 1] = '\0';
996 1.1 tron ptr[more - 2] = ',';
997 1.1 tron }
998 1.1 tron else more++;
999 1.1 tron offset += more;
1000 1.1 tron }
1001 1.1 tron }
1002 1.1 tron
1003 1.34 christos if (section == NULL)
1004 1.34 christos section = makesection(defaultsection);
1005 1.1 tron
1006 1.34 christos ptr = makewhatisline(name, buffer, section);
1007 1.34 christos free(section);
1008 1.1 tron return ptr;
1009 1.1 tron }
1010 1.1 tron
1011 1.37 tron static char *
1012 1.1 tron getwhatisdata(char *name)
1013 1.1 tron {
1014 1.1 tron gzFile *in;
1015 1.1 tron char *data;
1016 1.1 tron int section;
1017 1.1 tron
1018 1.1 tron if ((in = gzopen(name, "r")) == NULL) {
1019 1.18 christos if (errno == 0)
1020 1.18 christos errno = ENOMEM;
1021 1.18 christos err(EXIT_FAILURE, "Cannot open `%s'", name);
1022 1.1 tron /* NOTREACHED */
1023 1.1 tron }
1024 1.1 tron
1025 1.1 tron section = manpagesection(name);
1026 1.34 christos if (section == 0) {
1027 1.34 christos data = parsecatpage(name, in);
1028 1.34 christos } else {
1029 1.34 christos data = parsemanpage(name, in, section);
1030 1.14 tron if (data == NULL)
1031 1.34 christos data = nroff(name, in);
1032 1.14 tron }
1033 1.1 tron
1034 1.1 tron (void) gzclose(in);
1035 1.1 tron return data;
1036 1.1 tron }
1037 1.1 tron
1038 1.37 tron static void
1039 1.1 tron processmanpages(manpage **source, whatis **dest)
1040 1.1 tron {
1041 1.18 christos manpage *mp;
1042 1.22 jdolecek char sd[128];
1043 1.1 tron
1044 1.1 tron mp = *source;
1045 1.1 tron *source = NULL;
1046 1.1 tron
1047 1.1 tron while (mp != NULL) {
1048 1.1 tron manpage *obsolete;
1049 1.1 tron char *data;
1050 1.1 tron
1051 1.1 tron if (mp->mp_left != NULL)
1052 1.1 tron processmanpages(&mp->mp_left,dest);
1053 1.1 tron
1054 1.22 jdolecek if ((data = getwhatisdata(mp->mp_name)) != NULL) {
1055 1.22 jdolecek /* Pass eventual directory prefix to addwhatis() */
1056 1.22 jdolecek if (mp->mp_sdlen > 0 && mp->mp_sdlen < sizeof(sd)-1)
1057 1.22 jdolecek strlcpy(sd, &mp->mp_name[mp->mp_sdoff],
1058 1.22 jdolecek mp->mp_sdlen);
1059 1.22 jdolecek else
1060 1.22 jdolecek sd[0] = '\0';
1061 1.22 jdolecek
1062 1.22 jdolecek addwhatis(dest, data, sd);
1063 1.22 jdolecek }
1064 1.1 tron
1065 1.1 tron obsolete = mp;
1066 1.1 tron mp = mp->mp_right;
1067 1.1 tron free(obsolete);
1068 1.1 tron }
1069 1.1 tron }
1070 1.1 tron
1071 1.37 tron static void
1072 1.18 christos dumpwhatis(FILE *out, whatis *tree)
1073 1.1 tron {
1074 1.1 tron while (tree != NULL) {
1075 1.1 tron if (tree->wi_left)
1076 1.18 christos dumpwhatis(out, tree->wi_left);
1077 1.1 tron
1078 1.22 jdolecek if ((tree->wi_data[0] && fputs(tree->wi_prefix, out) == EOF) ||
1079 1.22 jdolecek (fputs(tree->wi_data, out) == EOF) ||
1080 1.1 tron (fputc('\n', out) == EOF))
1081 1.18 christos err(EXIT_FAILURE, "Write failed");
1082 1.1 tron
1083 1.1 tron tree = tree->wi_right;
1084 1.1 tron }
1085 1.18 christos }
1086