From 9ef07094816176da1ae6b38a6391f4b1481bc5be Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 5 Jul 2013 09:33:02 +0000 Subject: Simple partial sync with OpenBSD: * Again accept suffixes on the name of the whatis utility. * The usage line for whatis must not invite expressions. * Revert the argument names in the SYNOPSIS back to the usual ones. * Revert a few gratuitious changes regarding line breaks etc. --- apropos.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'apropos.c') diff --git a/apropos.c b/apropos.c index ac56a961..96313bc1 100644 --- a/apropos.c +++ b/apropos.c @@ -1,4 +1,4 @@ -/* $Id: apropos.c,v 1.33 2012/06/09 17:49:13 kristaps Exp $ */ +/* $Id: apropos.c,v 1.34 2013/07/05 09:33:02 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons * @@ -37,8 +37,9 @@ main(int argc, char *argv[]) struct mansearch search; size_t i, sz; struct manpage *res; - char *conf_file, *defpaths, *auxpaths; struct manpaths paths; + char *defpaths, *auxpaths; + char *conf_file; char *progname; extern char *optarg; extern int optind; @@ -49,10 +50,13 @@ main(int argc, char *argv[]) else ++progname; - auxpaths = defpaths = conf_file = NULL; + whatis = (0 == strncmp(progname, "whatis", 6)); + memset(&paths, 0, sizeof(struct manpaths)); memset(&search, 0, sizeof(struct mansearch)); - whatis = (0 == strcmp(progname, "whatis")); + + auxpaths = defpaths = NULL; + conf_file = NULL; while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:"))) switch (ch) { @@ -99,12 +103,8 @@ main(int argc, char *argv[]) free(res); return(sz ? EXIT_SUCCESS : EXIT_FAILURE); usage: - fprintf(stderr, "usage: %s [-C conf] " - "[-M paths] " - "[-m paths] " - "[-S arch] " - "[-s section] " - "expr ...\n", - progname); + fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] " + "[-S arch] [-s section]%s ...\n", progname, + whatis ? " name" : "\n expression"); return(EXIT_FAILURE); } -- cgit v1.2.3