Add Magnus Damm and fix alpha sorting

[oweals/busybox.git] / test.c

diff --git a/test.c b/test.c
index d1a0b6025120404fb801150fe69c9954914ad9c4..9c66cbb87150544fd391c70580b04aeeb75816ab 100644 (file)
--- a/test.c
+++ b/test.c
@@ -31,16 +31,13 @@
  *     "This program is in the Public Domain."
  */
 
-#include "busybox.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#define BB_DECLARE_EXTERN
-#define bb_need_help
-#include "messages.c"
+#include "busybox.h"
 
 /* test(1) accepts the following grammar:
        oexpr   ::= aexpr | aexpr "-o" oexpr ;
@@ -110,10 +107,10 @@ enum token_types {
        PAREN
 };
 
-struct t_op {
+static const struct t_op {
        const char *op_text;
        short op_num, op_type;
-} const ops [] = {
+} ops [] = {
        {"-r",  FILRD,  UNOP},
        {"-w",  FILWR,  UNOP},
        {"-x",  FILEX,  UNOP},
@@ -156,8 +153,8 @@ struct t_op {
        {0,     0,      0}
 };
 
-char **t_wp;
-struct t_op const *t_wp_op;
+static char **t_wp;
+static struct t_op const *t_wp_op;
 static gid_t *group_array = NULL;
 static int ngroups;
 
@@ -184,7 +181,7 @@ test_main(int argc, char** argv)
 
        if (strcmp(applet_name, "[") == 0) {
                if (strcmp(argv[--argc], "]"))
-                       error_msg_and_die("missing ]\n");
+                       error_msg_and_die("missing ]");
                argv[argc] = NULL;
        }
        /* Implement special cases from POSIX.2, section 4.62.4 */
@@ -233,9 +230,9 @@ syntax(op, msg)
        char    *msg;
 {
        if (op && *op)
-               error_msg_and_die("%s: %s\n", op, msg);
+               error_msg_and_die("%s: %s", op, msg);
        else
-               error_msg_and_die("%s\n", msg);
+               error_msg_and_die("%s", msg);
 }
 
 static int
@@ -470,13 +467,13 @@ getn(s)
        r = strtol(s, &p, 10);
 
        if (errno != 0)
-         error_msg_and_die("%s: out of range\n", s);
+         error_msg_and_die("%s: out of range", s);
 
        while (isspace(*p))
          p++;
        
        if (*p)
-         error_msg_and_die("%s: bad number\n", s);
+         error_msg_and_die("%s: bad number", s);
 
        return (int) r;
 }