diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-06-03 08:34:09 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-06-03 09:15:00 +0200 |
| commit | 896b672499d6a31a6caf85411bcbdde6edc57668 (patch) | |
| tree | 27683a9e32614e6ea09de5e06d7967164593bbd7 /src/nice.c | |
| parent | 1b0b6c8d08785bf9b05931371259ac710a806e51 (diff) | |
| download | coreutils-896b672499d6a31a6caf85411bcbdde6edc57668.tar.xz | |
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.
Diffstat (limited to 'src/nice.c')
| -rw-r--r-- | src/nice.c | 7 |
1 files changed, 2 insertions, 5 deletions
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; |