From 896b672499d6a31a6caf85411bcbdde6edc57668 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 3 Jun 2008 08:34:09 +0200 Subject: use gnulib's progname module * bootstrap.conf (gnulib_modules): Add progname. * src/*.c (program_name): Remove declaration. * (main): Call set_program_name rather than setting program_name. * src/nice.c (main): Cast program_name to "(char *)". * src/prog-fprintf.c: Include "system.h" * src/system.h: Include "progname.h". * maint.mk (sc_program_name): Adjust rule. Suggestion from Eric Blake. --- src/nice.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/nice.c') diff --git a/src/nice.c b/src/nice.c index 3981a7163..1dcb3a3cb 100644 --- a/src/nice.c +++ b/src/nice.c @@ -55,9 +55,6 @@ # define NZERO 20 #endif -/* The name this program was run with. */ -char const *program_name; - static struct option const longopts[] = { {"adjustment", required_argument, NULL, 'n'}, @@ -99,7 +96,7 @@ main (int argc, char **argv) int i; initialize_main (&argc, &argv); - program_name = argv[0]; + set_program_name (argv[0]); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); @@ -126,7 +123,7 @@ main (int argc, char **argv) char **fake_argv = argv + (i - 1); /* Ensure that any getopt diagnostics use the right name. */ - fake_argv[0] = program_name; + fake_argv[0] = (char *) program_name; /* Initialize getopt_long's internal state. */ optind = 0; -- cgit v1.2.3-54-g00ecf