diff options
author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
---|---|---|
committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /coreutils/test.c | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) | |
download | busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.bz2 busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.zip |
Major coreutils update.
Diffstat (limited to 'coreutils/test.c')
-rw-r--r-- | coreutils/test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/test.c b/coreutils/test.c index 83e31ea5c..0bce66e6f 100644 --- a/coreutils/test.c +++ b/coreutils/test.c | |||
@@ -180,9 +180,9 @@ extern int test_main(int argc, char **argv) | |||
180 | { | 180 | { |
181 | int res; | 181 | int res; |
182 | 182 | ||
183 | if (strcmp(applet_name, "[") == 0) { | 183 | if (strcmp(bb_applet_name, "[") == 0) { |
184 | if (strcmp(argv[--argc], "]")) | 184 | if (strcmp(argv[--argc], "]")) |
185 | error_msg_and_die("missing ]"); | 185 | bb_error_msg_and_die("missing ]"); |
186 | argv[argc] = NULL; | 186 | argv[argc] = NULL; |
187 | } | 187 | } |
188 | /* Implement special cases from POSIX.2, section 4.62.4 */ | 188 | /* Implement special cases from POSIX.2, section 4.62.4 */ |
@@ -226,9 +226,9 @@ extern int test_main(int argc, char **argv) | |||
226 | static void syntax(const char *op, const char *msg) | 226 | static void syntax(const char *op, const char *msg) |
227 | { | 227 | { |
228 | if (op && *op) { | 228 | if (op && *op) { |
229 | error_msg_and_die("%s: %s", op, msg); | 229 | bb_error_msg_and_die("%s: %s", op, msg); |
230 | } else { | 230 | } else { |
231 | error_msg_and_die("%s", msg); | 231 | bb_error_msg_and_die("%s", msg); |
232 | } | 232 | } |
233 | } | 233 | } |
234 | 234 | ||
@@ -450,13 +450,13 @@ static int getn(const char *s) | |||
450 | r = strtol(s, &p, 10); | 450 | r = strtol(s, &p, 10); |
451 | 451 | ||
452 | if (errno != 0) | 452 | if (errno != 0) |
453 | error_msg_and_die("%s: out of range", s); | 453 | bb_error_msg_and_die("%s: out of range", s); |
454 | 454 | ||
455 | while (isspace(*p)) | 455 | while (isspace(*p)) |
456 | p++; | 456 | p++; |
457 | 457 | ||
458 | if (*p) | 458 | if (*p) |
459 | error_msg_and_die("%s: bad number", s); | 459 | bb_error_msg_and_die("%s: bad number", s); |
460 | 460 | ||
461 | return (int) r; | 461 | return (int) r; |
462 | } | 462 | } |