summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sutils/fsck.c2
-rw-r--r--sutils/halt.c4
-rw-r--r--sutils/reboot.c4
-rw-r--r--trans/ChangeLog2
-rw-r--r--trans/fifo.c2
-rw-r--r--trans/null.c2
-rw-r--r--ufs-fsck/main.c4
-rw-r--r--ufs-utils/mkfs.c4
-rw-r--r--utils/fsysopts.c4
-rw-r--r--utils/hurdids.c4
-rw-r--r--utils/login.c2
-rw-r--r--utils/portinfo.c4
-rw-r--r--utils/ps.c4
-rw-r--r--utils/settrans.c2
-rw-r--r--utils/showtrans.c4
-rw-r--r--utils/storeinfo.c4
-rw-r--r--utils/sync.c4
-rw-r--r--utils/vminfo.c4
-rw-r--r--utils/vmstat.c4
-rw-r--r--utils/w.c2
20 files changed, 34 insertions, 32 deletions
diff --git a/sutils/fsck.c b/sutils/fsck.c
index 8af86d8f..abcc3fc9 100644
--- a/sutils/fsck.c
+++ b/sutils/fsck.c
@@ -55,7 +55,7 @@
#include "fstab.h"
-char *argp_program_version = STANDARD_HURD_VERSION (fsck);
+const char *argp_program_version = STANDARD_HURD_VERSION (fsck);
/* for debugging */
diff --git a/sutils/halt.c b/sutils/halt.c
index 9b6980fa..01f06b4f 100644
--- a/sutils/halt.c
+++ b/sutils/halt.c
@@ -1,5 +1,5 @@
/* Halt the system
- Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
Written by Michael I. Bushnell.
This file is part of the GNU Hurd.
@@ -26,7 +26,7 @@
#include <hurd.h>
#include <version.h>
-char *argp_program_version = STANDARD_HURD_VERSION (halt);
+const char *argp_program_version = STANDARD_HURD_VERSION (halt);
int
main (int argc, char *argv[])
diff --git a/sutils/reboot.c b/sutils/reboot.c
index 2b3d1130..715dc90c 100644
--- a/sutils/reboot.c
+++ b/sutils/reboot.c
@@ -1,5 +1,5 @@
/* Reboot the system
- Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
Written by Michael I. Bushnell.
This file is part of the GNU Hurd.
@@ -26,7 +26,7 @@
#include <hurd.h>
#include <version.h>
-char *argp_program_version = STANDARD_HURD_VERSION (reboot);
+const char *argp_program_version = STANDARD_HURD_VERSION (reboot);
int
main (int argc, char *argv[])
diff --git a/trans/ChangeLog b/trans/ChangeLog
index 36397d0f..32dab6bd 100644
--- a/trans/ChangeLog
+++ b/trans/ChangeLog
@@ -1,5 +1,7 @@
Wed Feb 19 21:34:01 1997 Miles Bader <miles@gnu.ai.mit.edu>
+ * null.c (argp_program_version): Make const.
+
* fifo.c (argp_program_version, argp): New variables.
(parse_opt): New function.
(options): Use argp structures instead of getopt ones.
diff --git a/trans/fifo.c b/trans/fifo.c
index cc479643..6ef40e62 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;
-char *argp_program_version = STANDARD_HURD_VERSION (null);
+const char *argp_program_version = STANDARD_HURD_VERSION (null);
static struct argp_option options[] =
{
diff --git a/trans/null.c b/trans/null.c
index 5f6e48d0..9942abb4 100644
--- a/trans/null.c
+++ b/trans/null.c
@@ -32,7 +32,7 @@
#include <limits.h>
#include <argp.h>
-char *argp_program_version = STANDARD_HURD_VERSION (null);
+const char *argp_program_version = STANDARD_HURD_VERSION (null);
void
main (int argc, char **argv)
diff --git a/ufs-fsck/main.c b/ufs-fsck/main.c
index ed651795..34c32a67 100644
--- a/ufs-fsck/main.c
+++ b/ufs-fsck/main.c
@@ -1,5 +1,5 @@
/* Main program for GNU fsck
- Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
Written by Michael I. Bushnell.
This file is part of the GNU Hurd.
@@ -25,7 +25,7 @@
#include "fsck.h"
-char *argp_program_version = STANDARD_HURD_VERSION (fsck.ufs);
+const char *argp_program_version = STANDARD_HURD_VERSION (fsck.ufs);
char *lfname = "lost+found";
mode_t lfmode = 0755;
diff --git a/ufs-utils/mkfs.c b/ufs-utils/mkfs.c
index de8c712e..b6303e86 100644
--- a/ufs-utils/mkfs.c
+++ b/ufs-utils/mkfs.c
@@ -33,7 +33,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)mkfs.c 8.3 (Berkeley) 2/3/94";*/
-static char *rcsid = "$Id: mkfs.c,v 1.15 1996/09/05 16:59:14 thomas Exp $";
+static char *rcsid = "$Id: mkfs.c,v 1.16 1997/02/20 04:15:02 miles Exp $";
#endif /* not lint */
#include <unistd.h>
@@ -164,7 +164,7 @@ struct dinode zino[MAXBSIZE / sizeof(struct dinode)];
int fsi, fso;
daddr_t alloc();
-char *argp_program_version = STANDARD_HURD_VERSION (mkfs.ufs);
+const char *argp_program_version = STANDARD_HURD_VERSION (mkfs.ufs);
#define _STRINGIFY(arg) #arg
#define STRINGIFY(arg) _STRINGIFY (arg)
diff --git a/utils/fsysopts.c b/utils/fsysopts.c
index b6d7e971..e8ddf145 100644
--- a/utils/fsysopts.c
+++ b/utils/fsysopts.c
@@ -1,6 +1,6 @@
/* Set options in a running filesystem
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -32,7 +32,7 @@
#include <hurd/fsys.h>
-char *argp_program_version = STANDARD_HURD_VERSION (fsysopts);
+const char *argp_program_version = STANDARD_HURD_VERSION (fsysopts);
static struct argp_option options[] =
{
diff --git a/utils/hurdids.c b/utils/hurdids.c
index d48d0d69..b647b4ce 100644
--- a/utils/hurdids.c
+++ b/utils/hurdids.c
@@ -1,6 +1,6 @@
/* Show all hurd ids
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -31,7 +31,7 @@
#include <error.h>
#include <hurd/id.h>
-char *argp_program_version = STANDARD_HURD_VERSION (hurdids);
+const char *argp_program_version = STANDARD_HURD_VERSION (hurdids);
static struct argp_option options[] =
{
diff --git a/utils/login.c b/utils/login.c
index cab40589..13e1cfee 100644
--- a/utils/login.c
+++ b/utils/login.c
@@ -51,7 +51,7 @@ exec_reauth (auth_t auth, int secure, int must_reauth,
mach_port_t *ports, unsigned num_ports,
mach_port_t *fds, unsigned num_fds);
-char *argp_program_version = STANDARD_HURD_VERSION (login);
+const char *argp_program_version = STANDARD_HURD_VERSION (login);
/* Defaults for various login parameters. */
diff --git a/utils/portinfo.c b/utils/portinfo.c
index 3f9ce6b5..c56027b0 100644
--- a/utils/portinfo.c
+++ b/utils/portinfo.c
@@ -1,6 +1,6 @@
/* Print information about a task's ports
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -35,7 +35,7 @@
#include <portinfo.h>
#include <portxlate.h>
-char *argp_program_version = STANDARD_HURD_VERSION (portinfo);
+const char *argp_program_version = STANDARD_HURD_VERSION (portinfo);
static const struct argp_option options[] = {
{0,0,0,0,0, 1},
diff --git a/utils/ps.c b/utils/ps.c
index 4e479a23..b338791e 100644
--- a/utils/ps.c
+++ b/utils/ps.c
@@ -1,6 +1,6 @@
/* Show process information.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -34,7 +34,7 @@
#include "psout.h"
-char *argp_program_version = STANDARD_HURD_VERSION (ps);
+const char *argp_program_version = STANDARD_HURD_VERSION (ps);
#define OA OPTION_ARG_OPTIONAL
diff --git a/utils/settrans.c b/utils/settrans.c
index 86e4ec99..9230fb7a 100644
--- a/utils/settrans.c
+++ b/utils/settrans.c
@@ -31,7 +31,7 @@
#include <hurd/fshelp.h>
#include <version.h>
-char *argp_program_version = STANDARD_HURD_VERSION (settrans);
+const char *argp_program_version = STANDARD_HURD_VERSION (settrans);
#define DEFAULT_TIMEOUT 60
diff --git a/utils/showtrans.c b/utils/showtrans.c
index 1ddef038..ebac9ccc 100644
--- a/utils/showtrans.c
+++ b/utils/showtrans.c
@@ -1,6 +1,6 @@
/* Show files' passive translators.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -30,7 +30,7 @@
#include <error.h>
#include <argz.h>
-char *argp_program_version = STANDARD_HURD_VERSION (showtrans);
+const char *argp_program_version = STANDARD_HURD_VERSION (showtrans);
static struct argp_option options[] =
{
diff --git a/utils/storeinfo.c b/utils/storeinfo.c
index 46ad1624..13a5cfb2 100644
--- a/utils/storeinfo.c
+++ b/utils/storeinfo.c
@@ -1,6 +1,6 @@
/* Show where a file exists
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -32,7 +32,7 @@
#include <hurd/fs.h>
#include <hurd/store.h>
-char *argp_program_version = STANDARD_HURD_VERSION (storeinfo);
+const char *argp_program_version = STANDARD_HURD_VERSION (storeinfo);
static struct argp_option options[] =
{
diff --git a/utils/sync.c b/utils/sync.c
index c03ed2d2..81099407 100644
--- a/utils/sync.c
+++ b/utils/sync.c
@@ -1,5 +1,5 @@
/* Call sync synchronously.
- Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
Written by Michael I. Bushnell.
This file is part of the GNU Hurd.
@@ -22,7 +22,7 @@
#include <argp.h>
#include <version.h>
-char *argp_program_version = STANDARD_HURD_VERSION (sync);
+const char *argp_program_version = STANDARD_HURD_VERSION (sync);
int
main (int argc, char *argv[])
diff --git a/utils/vminfo.c b/utils/vminfo.c
index 7d56378a..73ddb99d 100644
--- a/utils/vminfo.c
+++ b/utils/vminfo.c
@@ -1,6 +1,6 @@
/* Print task vm information
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -32,7 +32,7 @@
#include <mach/default_pager.h>
#include <hurd.h>
-char *argp_program_version = STANDARD_HURD_VERSION (vminfo);
+const char *argp_program_version = STANDARD_HURD_VERSION (vminfo);
static const struct argp_option options[] = {
{"verbose", 'v', 0, 0, "Give more detailed information"},
diff --git a/utils/vmstat.c b/utils/vmstat.c
index d3d1e998..418f2878 100644
--- a/utils/vmstat.c
+++ b/utils/vmstat.c
@@ -1,6 +1,6 @@
/* Print vm statistics
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -32,7 +32,7 @@
#include <mach/default_pager.h>
#include <hurd.h>
-char *argp_program_version = STANDARD_HURD_VERSION (vmstat);
+const char *argp_program_version = STANDARD_HURD_VERSION (vmstat);
static const struct argp_option options[] = {
{"terse", 't', 0, 0, "Use short one-line output format"},
diff --git a/utils/w.c b/utils/w.c
index efbb724a..1e928f29 100644
--- a/utils/w.c
+++ b/utils/w.c
@@ -49,7 +49,7 @@ extern char *canon_host (char *host);
extern char *shared_domain (char *host1, char *host2);
extern char *localhost ();
-char *argp_program_version = STANDARD_HURD_VERSION (w);
+const char *argp_program_version = STANDARD_HURD_VERSION (w);
#define OA OPTION_ARG_OPTIONAL