From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Simple partial sync with OpenBSD: * Again accept suffixes on the
Date: Fri, 5 Jul 2013 05:33:03 -0400 (EDT) [thread overview]
Message-ID: <201307050933.r659X318023279@krisdoz.my.domain> (raw)
Log Message:
-----------
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.
Modified Files:
--------------
mdocml:
apropos.1
apropos.c
Revision Data
-------------
Index: apropos.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/apropos.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lapropos.c -Lapropos.c -u -p -r1.33 -r1.34
--- apropos.c
+++ apropos.c
@@ -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);
}
Index: apropos.1
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/apropos.1,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lapropos.1 -Lapropos.1 -u -p -r1.19 -r1.20
--- apropos.1
+++ apropos.1
@@ -24,8 +24,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl C Ar file
-.Op Fl M Ar manpath
-.Op Fl m Ar manpath
+.Op Fl M Ar path
+.Op Fl m Ar path
.Op Fl S Ar arch
.Op Fl s Ar section
.Ar expression ...
@@ -60,13 +60,13 @@ Specify an alternative configuration
in
.Xr man.conf 5
format.
-.It Fl M Ar manpath
+.It Fl M Ar path
Use the colon-separated path instead of the default list of paths
searched for
.Xr mandocdb 8
databases.
Invalid paths, or paths without manual databases, are ignored.
-.It Fl m Ar manpath
+.It Fl m Ar path
Prepend the colon-separated paths to the list of paths searched
for
.Xr mandocdb 8
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2013-07-05 9:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201307050933.r659X318023279@krisdoz.my.domain \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).