aboutsummaryrefslogtreecommitdiff
path: root/coreutils/test.c
diff options
context:
space:
mode:
authormjn3 <mjn3@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-03-19 09:13:01 +0000
committermjn3 <mjn3@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-03-19 09:13:01 +0000
commite901c15d890dbbdce4c086963cb1513653fc46b5 (patch)
treea318d0f03aa076c74b576ea45dc543a5669e8e91 /coreutils/test.c
parent40758c00616c3b2c85d83eb4afdeb04b1f65c9f1 (diff)
downloadbusybox-w32-e901c15d890dbbdce4c086963cb1513653fc46b5.tar.gz
busybox-w32-e901c15d890dbbdce4c086963cb1513653fc46b5.tar.bz2
busybox-w32-e901c15d890dbbdce4c086963cb1513653fc46b5.zip
Major coreutils update.
git-svn-id: svn://busybox.net/trunk/busybox@6751 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/test.c')
-rw-r--r--coreutils/test.c12
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)
226static void syntax(const char *op, const char *msg) 226static 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}