auth/

2001-02-12  Marcus Brinkmann  <marcus@gnu.org>

	* auth.c (main): New variable ARGP defining a doc string.
	Pass address of ARGP to argp_parse().

exec/
2001-02-12  Marcus Brinkmann  <marcus@gnu.org>

	* main.c: Change hurd version name from proc to exec.
	(main): Add period to doc string.

ftpfs/
2001-02-12  Marcus Brinkmann  <marcus@gnu.org>

	* ftpfs.c: Include <version.h>.  Add global variable
	ARGP_PROGRAM_VERSION.  Add period to DOC.

hostmux/
2001-02-12  Marcus Brinkmann  <marcus@gnu.org>

	* hostmux.c: Include <version.h>.  Add global variable
	ARGP_PROGRAM_VERSION.  Add period to DOC.

usermux/
2001-02-12  Marcus Brinkmann  <marcus@gnu.org>

	* usermux.c (options): Include <version.h>.  Add global variable
	ARGP_PROGRAM_VERSION.  Add period to DOC.

trans/
2001-02-12  Marcus Brinkmann  <marcus@gnu.org>

	* fifo.c: Make version string say `fifo', not `null'.
	Add period to doc text in ARGP.
	* firmlink.c: Add period to doc text in ARGP_DOC, convert
	semi-colon to colon.
	* magic.c (options): Add period to DOC.
	* new-fifo.c (fifo_trans_parse_args): Add doc string to ARGP.
	Include <version.h>, new global variable ARGP_PROGRAM_VERSION.
	* crash.c: Include <version.h>, add global variable
	ARGP_PROGRAM_VERSION.
	* hello.c: Include <version.h>, add global variable
	ARGP_PROGRAM_VERSION.
	(hello_argp): Add doc string.
	* hello-mt.c: Likewise.
	* streamio.c: Add period to DOC.  Change streamdev to streamio in
	version string.
	* password.c (main): Add period to doc string in ARGP.

20 files changed, 94 insertions, 18 deletions

diff --git a/auth/ChangeLog b/auth/ChangeLog
index dbf923a8..0ef5d5dc 100644
--- a/auth/ChangeLog
+++ b/auth/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
+
+	* auth.c (main): New variable ARGP defining a doc string.
+	Pass address of ARGP to argp_parse().
+
 2000-07-26  Mark Kettenis  <kettenis@gnu.org>
 
 	* Makefile (HURDLIBS): Reorder libs such that the threads lib
diff --git a/auth/auth.c b/auth/auth.c
index dd164934..0176d30c 100644
--- a/auth/auth.c
+++ b/auth/auth.c
@@ -451,8 +451,9 @@ main (int argc, char **argv)
   process_t proc;
   mach_port_t hostpriv, masterdev;
   struct authhandle *firstauth;
+  struct argp argp = { 0, 0, 0, "Hurd standard authentication server." };
 
-  argp_parse (0, argc, argv, 0, 0, 0);
+  argp_parse (&argp, argc, argv, 0, 0, 0);
 
   auth_bucket = ports_create_bucket ();
   authhandle_portclass = ports_create_class (&destroy_authhandle, 0);
diff --git a/exec/ChangeLog b/exec/ChangeLog
index 38f1e30c..98b0adef 100644
--- a/exec/ChangeLog
+++ b/exec/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
+
+	* main.c: Change hurd version name from proc to exec.
+	(main): Add period to doc string.
+
 2000-10-01  Roland McGrath  <roland@frob.com>
 
 	* exec.c: Comments.
diff --git a/exec/main.c b/exec/main.c
index 7bf3305d..e2688d55 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -25,7 +25,7 @@
 #include <argp.h>
 #include <version.h>
 
-const char *argp_program_version = STANDARD_HURD_VERSION (proc);
+const char *argp_program_version = STANDARD_HURD_VERSION (exec);
 
 #ifdef BFD
 bfd_arch_info_type host_bfd_arch_info;
@@ -107,7 +107,7 @@ main (int argc, char **argv)
 {
   error_t err;
   mach_port_t bootstrap;
-  struct argp argp = { 0, 0, 0, "Hurd standard exec server" };
+  struct argp argp = { 0, 0, 0, "Hurd standard exec server." };
 
   argp_parse (&argp, argc, argv, 0, 0, 0);
 
diff --git a/ftpfs/ChangeLog b/ftpfs/ChangeLog
index 416bd9b7..7dd1a34c 100644
--- a/ftpfs/ChangeLog
+++ b/ftpfs/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
+
+	* ftpfs.c: Include <version.h>.  Add global variable
+	ARGP_PROGRAM_VERSION.  Add period to DOC.
+
 2001-01-07  Marcus Brinkmann  <marcus@gnu.org>
 
 	* dir.c (ftpfs_dir_create): Fix last change (calloc invocation).
diff --git a/ftpfs/ftpfs.c b/ftpfs/ftpfs.c
index 646f9b1b..63377021 100644
--- a/ftpfs/ftpfs.c
+++ b/ftpfs/ftpfs.c
@@ -25,12 +25,16 @@
 #include <argz.h>
 #include <netdb.h>
 
+#include <version.h>
+
 #include <hurd/netfs.h>
 
 #include "ftpfs.h"
 
+const char *argp_program_version = STANDARD_HURD_VERSION (ftpfs);
+
 static char *args_doc = "REMOTE_FS [SERVER]";
-static char *doc = "Hurd ftp filesystem translator"
+static char *doc = "Hurd ftp filesystem translator."
 "\vIf SERVER is not specified, an attempt is made to extract"
 " it from REMOTE_FS, using `SERVER:FS' notation."
 "  SERVER can be a hostname, in which case anonymous ftp is used,"
diff --git a/hostmux/ChangeLog b/hostmux/ChangeLog
index 0db0544d..1edc482b 100644
--- a/hostmux/ChangeLog
+++ b/hostmux/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
+
+	* hostmux.c: Include <version.h>.  Add global variable
+	ARGP_PROGRAM_VERSION.  Add period to DOC.
+
 2000-07-26  Mark Kettenis  <kettenis@gnu.org>
 
 	* Makefile (HURDLIBS): Reorder libs such that the threads lib
diff --git a/hostmux/hostmux.c b/hostmux/hostmux.c
index a69b7cf4..fd5bc748 100644
--- a/hostmux/hostmux.c
+++ b/hostmux/hostmux.c
@@ -24,8 +24,12 @@
 #include <error.h>
 #include <sys/time.h>
 
+#include <version.h>
+
 #include "hostmux.h"
 
+const char *argp_program_version = STANDARD_HURD_VERSION (hostmux);
+
 int netfs_maxsymlinks = 25;
 
 volatile struct mapped_time_value *hostmux_mapped_time;
@@ -43,7 +47,7 @@ static const struct argp_option options[] =
 };
 static const char args_doc[] = "TRANSLATOR [ARG...]";
 static const char doc[] =
-  "A translator for invoking host-specific translators"
+  "A translator for invoking host-specific translators."
   "\vThis translator appears like a directory in which hostnames can be"
   " looked up, and will start TRANSLATOR to service each resulting node.";
 
diff --git a/trans/ChangeLog b/trans/ChangeLog
index 7108b6c2..49e8b9b6 100644
--- a/trans/ChangeLog
+++ b/trans/ChangeLog
@@ -1,3 +1,22 @@
+2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
+
+	* fifo.c: Make version string say `fifo', not `null'.
+	Add period to doc text in ARGP.
+	* firmlink.c: Add period to doc text in ARGP_DOC, convert
+	semi-colon to colon.
+	* magic.c (options): Add period to DOC.
+	* new-fifo.c (fifo_trans_parse_args): Add doc string to ARGP.
+	Include <version.h>, new global variable ARGP_PROGRAM_VERSION.
+	* crash.c: Include <version.h>, add global variable
+	ARGP_PROGRAM_VERSION.
+	* hello.c: Include <version.h>, add global variable
+	ARGP_PROGRAM_VERSION.
+	(hello_argp): Add doc string.
+	* hello-mt.c: Likewise.
+	* streamio.c: Add period to DOC.  Change streamdev to streamio in
+	version string.
+	* password.c (main): Add period to doc string in ARGP.
+
 2001-01-17  Neal H Walfield  <neal@cs.uml.edu>
 
 	* pump.c (start_pfinet): Conform to new fshelp_start_translator
diff --git a/trans/crash.c b/trans/crash.c
index 0a5afe93..827306b2 100644
--- a/trans/crash.c
+++ b/trans/crash.c
@@ -1,5 +1,5 @@
 /* GNU Hurd standard crash dump server.
-   Copyright (C) 1995,96,97,99,2000 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,99,2000,2001 Free Software Foundation, Inc.
    Written by Roland McGrath.
 
 This file is part of the GNU Hurd.
@@ -27,11 +27,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <argz.h>
 #include <sys/mman.h>
 
+#include <version.h>
+
 #include "crash_S.h"
 #include "crash_reply_U.h"
 #include "msg_S.h"
 
 
+const char *argp_program_version = STANDARD_HURD_VERSION (crash);
+
 process_t procserver;		/* Our proc port, for easy access.  */
 
 /* Port bucket we service requests on.  */
diff --git a/trans/fifo.c b/trans/fifo.c
index 3b62cc21..ce48c2fb 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -50,7 +50,7 @@ struct mutex active_fifo_lock;
 /* Signal this when ACTIVE_FIFO may have changed.  */
 struct condition active_fifo_changed;
 
-const char *argp_program_version = STANDARD_HURD_VERSION (null);
+const char *argp_program_version = STANDARD_HURD_VERSION (fifo);
 
 static struct argp_option options[] =
 {
@@ -74,7 +74,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 }
 
 static const struct argp argp = {
-  options, parse_opt, 0, "Translator for fifos"
+  options, parse_opt, 0, "Translator for fifos."
 };
 
 int
diff --git a/trans/firmlink.c b/trans/firmlink.c
index de9cd19b..bb2d12a3 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -39,8 +39,8 @@ static const struct argp_option options[] =
 };
 
 static const char args_doc[] = "TARGET";
-static const char doc[] = "A translator for firmlinks"
-"\vA firmlink is sort of half-way between a symbolic link and a hard link;"
+static const char doc[] = "A translator for firmlinks."
+"\vA firmlink is sort of half-way between a symbolic link and a hard link:"
 "\n"
 "\nLike a symbolic link, it is `by name', and contains no actual reference to"
 " the target.  However, the lookup returns a node which will redirect parent"
diff --git a/trans/hello-mt.c b/trans/hello-mt.c
index 2aebbba0..f0d78614 100644
--- a/trans/hello-mt.c
+++ b/trans/hello-mt.c
@@ -28,6 +28,10 @@
 #include <cthreads.h>
 #include <rwlock.h>
 
+#include <version.h>
+
+const char *argp_program_version = STANDARD_HURD_VERSION (hello-mt);
+
 /* The message we return when we are read.  */
 static const char hello[] = "Hello, world!\n";
 static char *contents = (char *) hello;
@@ -273,7 +277,9 @@ trivfs_append_args (struct trivfs_control *fsys,
   return err;
 }
 
-static struct argp hello_argp = { options, parse_opt, 0, 0 };
+static struct argp hello_argp =
+{ options, parse_opt, 0,
+  "A multi-threaded translator providing a warm greeting." };
 
 /* Setting this variable makes libtrivfs use our argp to
    parse options passed in an fsys_set_options RPC.  */
diff --git a/trans/hello.c b/trans/hello.c
index d1657dda..4199dd34 100644
--- a/trans/hello.c
+++ b/trans/hello.c
@@ -26,6 +26,10 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#include <version.h>
+
+const char *argp_program_version = STANDARD_HURD_VERSION (hello);
+
 /* The message we return when we are read.  */
 static const char hello[] = "Hello, world!\n";
 static char *contents = (char *) hello;
@@ -244,7 +248,8 @@ trivfs_append_args (struct trivfs_control *fsys,
   return err;
 }
 
-static struct argp hello_argp = { options, parse_opt, 0, 0 };
+static struct argp hello_argp =
+{ options, parse_opt, 0, "A translator providing a warm greeting." };
 
 /* Setting this variable makes libtrivfs use our argp to
    parse options passed in an fsys_set_options RPC.  */
diff --git a/trans/magic.c b/trans/magic.c
index 680e88e1..670b6f41 100644
--- a/trans/magic.c
+++ b/trans/magic.c
@@ -36,7 +36,7 @@
 
 const char *argp_program_version = STANDARD_HURD_VERSION (magic);
 static char args_doc[] = "MAGIC";
-static char doc[] = "A translator that returns the magic retry result MAGIC";
+static char doc[] = "A translator that returns the magic retry result MAGIC.";
 static const struct argp_option options[] =
 {
   {"directory",	'd', 0,		0, "Provide virtual (empty) directory node"},
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index f57da379..b3b57d84 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -36,8 +36,12 @@
 #include <hurd/pipe.h>
 #include <hurd/paths.h>
 
+#include <version.h>
+
 #define DEFAULT_SERVER _SERVERS "fifo";
 
+const char *argp_program_version = STANDARD_HURD_VERSION (new-fifo);
+
 struct port_bucket *port_bucket;
 struct port_class *fifo_port_class, *server_port_class, *fsys_port_class;
 
@@ -164,7 +168,7 @@ fifo_trans_parse_args (struct fifo_trans *trans, int argc, char **argv,
 	}
       return 0;
     }
-  struct argp argp = {options, parse_opt};
+  struct argp argp = {options, parse_opt, 0, "A translator for fifos." };
   return argp_parse (&argp, argc, argv, print_errs ? 0 : ARGP_SILENT, 0, 0);
 }
 
diff --git a/trans/password.c b/trans/password.c
index 5f87a10f..6f15a9e8 100644
--- a/trans/password.c
+++ b/trans/password.c
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
   error_t err;
   mach_port_t bootstrap;
   struct trivfs_control *fsys;
-  const struct argp argp = { 0, 0, 0, "Hurd standard password server" };
+  const struct argp argp = { 0, 0, 0, "Hurd standard password server." };
 
   argp_parse (&argp, argc, argv, 0, 0, 0);
   
diff --git a/trans/streamio.c b/trans/streamio.c
index c1acc8a2..bc158e53 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -200,9 +200,9 @@ static struct argp_option options[] =
 };
 
 static const char args_doc[] = "DEVICE";
-static const char doc[] = "Translator for stream devices";
+static const char doc[] = "Translator for stream devices.";
 
-const char *argp_program_version = STANDARD_HURD_VERSION (streamdev);
+const char *argp_program_version = STANDARD_HURD_VERSION (streamio);
 
 
 static char *stream_name;
diff --git a/usermux/ChangeLog b/usermux/ChangeLog
index 90b0a5f4..4e94e020 100644
--- a/usermux/ChangeLog
+++ b/usermux/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
+
+	* usermux.c (options): Include <version.h>.  Add global variable
+	ARGP_PROGRAM_VERSION.  Add period to DOC.
+
 2000-07-26  Mark Kettenis  <kettenis@gnu.org>
 
 	* Makefile (HURDLIBS): Reorder libs such that the threads lib
diff --git a/usermux/usermux.c b/usermux/usermux.c
index a7bc850a..5dafb8de 100644
--- a/usermux/usermux.c
+++ b/usermux/usermux.c
@@ -25,8 +25,12 @@
 #include <sys/time.h>
 #include <hurd/paths.h>
 
+#include <version.h>
+
 #include "usermux.h"
 
+const char *argp_program_version = STANDARD_HURD_VERSION (usermux);
+
 int netfs_maxsymlinks = 25;
 
 volatile struct mapped_time_value *usermux_mapped_time;
@@ -54,7 +58,7 @@ static const struct argp_option options[] =
 };
 static const char args_doc[] = "[TRANSLATOR [ARG...]]";
 static const char doc[] =
-  "A translator for invoking user-specific translators"
+  "A translator for invoking user-specific translators."
   "\vThis translator appears like a directory in which user names can be"
   " looked up, and will start TRANSLATOR to service each resulting node."
   "  If no pattern occurs in the translator specification, the users's"