diff options
| author | Matt Kraai <kraai@debian.org> | 2000-07-12 00:53:06 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2000-07-12 00:53:06 +0000 |
| commit | e714bce003a1b0e2c49e58fe14af86abc8b31f23 (patch) | |
| tree | 83dc60ba6291ab2839a8eeca47076582578841c7 /coreutils | |
| parent | 3ecbe9f4dca998d224760f537dc1c3fd7269893b (diff) | |
| download | busybox-w32-e714bce003a1b0e2c49e58fe14af86abc8b31f23.tar.gz busybox-w32-e714bce003a1b0e2c49e58fe14af86abc8b31f23.tar.bz2 busybox-w32-e714bce003a1b0e2c49e58fe14af86abc8b31f23.zip | |
Use global applet_name instead of local versions.
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cut.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c index a8a9d7fd1..820074e60 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c | |||
| @@ -71,7 +71,6 @@ int num_args; | |||
| 71 | int mode; /* 0 = dump stdin to stdout, 1=-f, 2=-c */ | 71 | int mode; /* 0 = dump stdin to stdout, 1=-f, 2=-c */ |
| 72 | char delim = '\t'; /* default delimiting character */ | 72 | char delim = '\t'; /* default delimiting character */ |
| 73 | FILE *fd; | 73 | FILE *fd; |
| 74 | char *name; | ||
| 75 | char line[BUFSIZ]; | 74 | char line[BUFSIZ]; |
| 76 | int exit_status; | 75 | int exit_status; |
| 77 | int option = 0; /* for -s option */ | 76 | int option = 0; /* for -s option */ |
| @@ -91,7 +90,7 @@ void warn(int warn_number, char *option) | |||
| 91 | "%s: Cannot open %s\n" | 90 | "%s: Cannot open %s\n" |
| 92 | }; | 91 | }; |
| 93 | 92 | ||
| 94 | fprintf(stderr, warn_msg[warn_number], name, option); | 93 | fprintf(stderr, warn_msg[warn_number], applet_name, option); |
| 95 | exit_status = warn_number + 1; | 94 | exit_status = warn_number + 1; |
| 96 | 95 | ||
| 97 | } | 96 | } |
| @@ -107,7 +106,7 @@ void cuterror(int err) | |||
| 107 | "%s: MAX_ARGS exceeded\n" | 106 | "%s: MAX_ARGS exceeded\n" |
| 108 | }; | 107 | }; |
| 109 | 108 | ||
| 110 | fprintf(stderr, err_mes[err - 101], name); | 109 | fprintf(stderr, err_mes[err - 101], applet_name); |
| 111 | exit(err); | 110 | exit(err); |
| 112 | } | 111 | } |
| 113 | 112 | ||
| @@ -213,8 +212,6 @@ int cut_main(int argc, char **argv) | |||
| 213 | int i = 1; | 212 | int i = 1; |
| 214 | int numberFilenames = 0; | 213 | int numberFilenames = 0; |
| 215 | 214 | ||
| 216 | name = argv[0]; | ||
| 217 | |||
| 218 | if (argc == 1 || strcmp(argv[1], dash_dash_help)==0) | 215 | if (argc == 1 || strcmp(argv[1], dash_dash_help)==0) |
| 219 | usage( "cut [OPTION]... [FILE]...\n" | 216 | usage( "cut [OPTION]... [FILE]...\n" |
| 220 | #ifndef BB_FEATURE_TRIVIAL_HELP | 217 | #ifndef BB_FEATURE_TRIVIAL_HELP |
