vodz, last patch 103

2 files changed, 114 insertions, 136 deletions

diff --git a/coreutils/expr.c b/coreutils/expr.c
index ecba825d5..f58f4b062 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -7,6 +7,7 @@
  *
  * Busybox modifications 
  * Copyright (c) 2000  Edward Betts <edward@debian.org>.
+ * Aug 2003  Vladimir Oleynik - reduced 464 bytes.
  *
  * this program is free software; you can redistribute it and/or modify
  * it under the terms of the gnu general public license as published by
@@ -40,6 +41,7 @@
 #include <stdlib.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <errno.h>
 #include "busybox.h"
 
 
@@ -135,10 +137,8 @@ static int null (VALUE *v)
         switch (v->type) {
                 case integer:
                         return v->u.i == 0;
-                case string:
+                default: /* string: */
                         return v->u.s[0] == '\0' || strcmp (v->u.s, "0") == 0;
-                default:
-                        abort ();
         }
 }
 
@@ -156,13 +156,9 @@ static void tostring (VALUE *v)
 
 static int toarith (VALUE *v)
 {
+        if(v->type == string) {
         int i;
 
-        switch (v->type) {
-                case integer:
-                        return 1;
-                case string:
-                        i = 0;
                         /* Don't interpret the empty string as an integer.  */
                         if (v->u.s == 0)
                                 return 0;
@@ -170,10 +166,8 @@ static int toarith (VALUE *v)
                         free (v->u.s);
                         v->u.i = i;
                         v->type = integer;
-                        return 1;
-                default:
-                        abort ();
         }
+        return 1;
 }
 
 /* Return nonzero if the next token matches STR exactly.
@@ -189,56 +183,59 @@ nextarg (char *str)
 
 /* The comparison operator handling functions.  */
 
-#define cmpf(name, rel)                                 \
-static int name (VALUE *l, VALUE *r)            \
-{                                                       \
-        if (l->type == string || r->type == string) {           \
-                tostring (l);                           \
-                tostring (r);                           \
-                return strcmp (l->u.s, r->u.s) rel 0;   \
-        }                                               \
-        else                                            \
-                return l->u.i rel r->u.i;               \
-}
- cmpf (less_than, <)
- cmpf (less_equal, <=)
- cmpf (equal, ==)
- cmpf (not_equal, !=)
- cmpf (greater_equal, >=)
- cmpf (greater_than, >)
+static int cmp_common (VALUE *l, VALUE *r, int op)
+{
+        int cmpval;
 
-#undef cmpf
+        if (l->type == string || r->type == string) {
+                tostring (l);
+                tostring (r);
+                cmpval = strcmp (l->u.s, r->u.s);
+        }
+        else
+                cmpval = l->u.i - r->u.i;
+        switch(op) {
+                case '<':
+                        return cmpval < 0;
+                case ('L'+'E'):
+                        return cmpval <= 0;
+                case '=':
+                        return cmpval == 0;
+                case '!':
+                        return cmpval != 0;
+                case '>':
+                        return cmpval > 0;
+                default: /* >= */
+                        return cmpval >= 0;
+        }
+}
 
 /* The arithmetic operator handling functions.  */
 
-#define arithf(name, op)                        \
-static                                          \
-int name (VALUE *l, VALUE *r)           \
-{                                               \
-  if (!toarith (l) || !toarith (r))             \
-    bb_error_msg_and_die ("non-numeric argument");      \
-  return l->u.i op r->u.i;                      \
-}
-
-#define arithdivf(name, op)                     \
-static int name (VALUE *l, VALUE *r)            \
-{                                               \
-  if (!toarith (l) || !toarith (r))             \
-    bb_error_msg_and_die ( "non-numeric argument");     \
-  if (r->u.i == 0)                              \
-    bb_error_msg_and_die ( "division by zero");         \
-  return l->u.i op r->u.i;                      \
+static int arithmetic_common (VALUE *l, VALUE *r, int op)
+{
+  int li, ri;
+
+  if (!toarith (l) || !toarith (r))
+    bb_error_msg_and_die ("non-numeric argument");
+  li = l->u.i;
+  ri = r->u.i;
+  if((op == '/' || op == '%') && ri == 0)
+    bb_error_msg_and_die ( "division by zero");
+  switch(op) {
+        case '+':
+                return li + ri;
+        case '-':
+                return li - ri;
+        case '*':
+                return li * ri;
+        case '/':
+                return li / ri;
+        default:
+                return li % ri;
+  }
 }
 
- arithf (plus, +)
- arithf (minus, -)
- arithf (multiply, *)
- arithdivf (divide, /)
- arithdivf (mod, %)
-
-#undef arithf
-#undef arithdivf
-
 /* Do the : operator.
    SV is the VALUE for the lhs (the string),
    PV is the VALUE for the rhs (the pattern).  */
@@ -408,21 +405,21 @@ static VALUE *eval5 (void)
 static VALUE *eval4 (void)
 {
         VALUE *l, *r;
-        int (*fxn) (VALUE *, VALUE *), val;
+        int op, val;
 
         l = eval5 ();
         while (1) {
                 if (nextarg ("*"))
-                        fxn = multiply;
+                        op = '*';
                 else if (nextarg ("/"))
-                        fxn = divide;
+                        op = '/';
                 else if (nextarg ("%"))
-                        fxn = mod;
+                        op = '%';
                 else
                         return l;
                 args++;
                 r = eval5 ();
-                val = (*fxn) (l, r);
+                val = arithmetic_common (l, r, op);
                 freev (l);
                 freev (r);
                 l = int_value (val);
@@ -434,19 +431,19 @@ static VALUE *eval4 (void)
 static VALUE *eval3 (void)
 {
         VALUE *l, *r;
-        int (*fxn) (VALUE *, VALUE *), val;
+        int op, val;
 
         l = eval4 ();
         while (1) {
                 if (nextarg ("+"))
-                        fxn = plus;
+                        op = '+';
                 else if (nextarg ("-"))
-                        fxn = minus;
+                        op = '+';
                 else
                         return l;
                 args++;
                 r = eval4 ();
-                val = (*fxn) (l, r);
+                val = arithmetic_common (l, r, op);
                 freev (l);
                 freev (r);
                 l = int_value (val);
@@ -458,29 +455,29 @@ static VALUE *eval3 (void)
 static VALUE *eval2 (void)
 {
         VALUE *l, *r;
-        int (*fxn) (VALUE *, VALUE *), val;
+        int op, val;
 
         l = eval3 ();
         while (1) {
                 if (nextarg ("<"))
-                        fxn = less_than;
+                        op = '<';
                 else if (nextarg ("<="))
-                        fxn = less_equal;
+                        op = 'L'+'E';
                 else if (nextarg ("=") || nextarg ("=="))
-                        fxn = equal;
+                        op = '=';
                 else if (nextarg ("!="))
-                        fxn = not_equal;
+                        op = '!';
                 else if (nextarg (">="))
-                        fxn = greater_equal;
+                        op = 'G'+'E';
                 else if (nextarg (">"))
-                        fxn = greater_than;
+                        op = '>';
                 else
                         return l;
                 args++;
                 r = eval3 ();
                 toarith (l);
                 toarith (r);
-                val = (*fxn) (l, r);
+                val = cmp_common (l, r, op);
                 freev (l);
                 freev (r);
                 l = int_value (val);
diff --git a/shell/ash.c b/shell/ash.c
index 547ad906b..ec33a106c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -1625,9 +1625,8 @@ static int fmtstr(char *, size_t, const char *, ...)
     __attribute__((__format__(__printf__,3,4)));
 static void xwrite(int, const void *, size_t);
 
+static int preverrout_fd;   /* save fd2 before print debug if xflag is set. */
 
-#define outerr(f)       ferror(f)
-#define out2c(c)        outcslow((c), stderr)
 
 static void out1str(const char *p)
 {
@@ -1637,15 +1636,7 @@ static void out1str(const char *p)
 static void out2str(const char *p)
 {
         outstr(p, stderr);
-}
-
-static void out1c(char c)
-{
-        char s[2];
-
-        s[0] = c;
-        s[1] = 0;
-        outstr(s, stdout);
+        flushout(stderr);
 }
 
 /*
@@ -1988,6 +1979,7 @@ static int nextopt(const char *);
 
 /* flags passed to redirect */
 #define REDIR_PUSH 01           /* save previous values of file descriptors */
+#define REDIR_SAVEFD2 03       /* set preverrout */
 
 union node;
 static void redirect(union node *, int);
@@ -2674,7 +2666,6 @@ static void evalcommand(union node *, int);
 static int evalbltin(const struct builtincmd *, int, char **);
 static int evalfun(struct funcnode *, int, char **, int);
 static void prehash(union node *);
-static int eprintlist(struct strlist *, int);
 static int bltincmd(int, char **);
 
 
@@ -2765,7 +2756,7 @@ evaltree(union node *n, int flags)
         default:
 #ifdef DEBUG
                 out1fmt("Node type = %d\n", n->type);
-                flushout(stdout);
+                fflush(stdout);
                 break;
 #endif
         case NNOT:
@@ -3201,7 +3192,7 @@ evalcommand(union node *cmd, int flags)
         struct arglist varlist;
         char **argv;
         int argc;
-        struct strlist *sp;
+        const struct strlist *sp;
         struct cmdentry cmdentry;
         struct job *jp;
         char *lastarg;
@@ -3244,8 +3235,9 @@ evalcommand(union node *cmd, int flags)
         if (iflag && funcnest == 0 && argc > 0)
                 lastarg = nargv[-1];
 
+        preverrout_fd = 2;
         expredir(cmd->ncmd.redirect);
-        status = redirectsafe(cmd->ncmd.redirect, REDIR_PUSH);
+        status = redirectsafe(cmd->ncmd.redirect, REDIR_PUSH|REDIR_SAVEFD2);
 
         path = vpath.text;
         for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) {
@@ -3266,14 +3258,24 @@ evalcommand(union node *cmd, int flags)
 
         /* Print the command if xflag is set. */
         if (xflag) {
-                int sep;
+                int n;
+                const char *p = " %s";
 
-                out2str(ps4val());
-                sep = 0;
-                sep = eprintlist(varlist.list, sep);
-                eprintlist(arglist.list, sep);
-                out2c('\n');
-                flushall();
+                p++;
+                dprintf(preverrout_fd, p, ps4val());
+
+                sp = varlist.list;
+                for(n = 0; n < 2; n++) {
+                        while (sp) {
+                                dprintf(preverrout_fd, p, sp->text);
+                                sp = sp->next;
+                                if(*p == '%') {
+                                        p--;
+                                }
+                        }
+                        sp = arglist.list;
+                }
+                xwrite(preverrout_fd, "\n", 1);
         }
 
         cmd_is_exec = 0;
@@ -3418,7 +3420,7 @@ evalbltin(const struct builtincmd *cmd, int argc, char **argv) {
         exitstatus = (*cmd->builtin)(argc, argv);
         flushall();
 cmddone:
-        exitstatus |= outerr(stdout);
+        exitstatus |= ferror(stdout);
         commandname = savecmdname;
         exsig = 0;
         handler = savehandler;
@@ -3588,20 +3590,6 @@ execcmd(int argc, char **argv)
 }
 
 
-static int
-eprintlist(struct strlist *sp, int sep)
-{
-        while (sp) {
-                const char *p;
-
-                p = " %s" + (1 - sep);
-                sep |= 1;
-                fprintf(stderr, p, sp->text);
-                sp = sp->next;
-        }
-
-        return sep;
-}
 /*      $NetBSD: exec.c,v 1.35 2003/01/22 20:36:04 dsl Exp $    */
 
 /*
@@ -3632,7 +3620,6 @@ static int builtinloc = -1;             /* index in path of %builtin, or -1 */
 
 
 static void tryexec(char *, char **, char **);
-static void printentry(struct tblentry *);
 static void clearcmdentry(int);
 static struct tblentry *cmdlookup(const char *, int);
 static void delete_cmd_entry(void);
@@ -3797,9 +3784,24 @@ padvance(const char **path, const char *name)
 }
 
 
-
 /*** Command hashing code ***/
 
+static void
+printentry(struct tblentry *cmdp)
+{
+        int idx;
+        const char *path;
+        char *name;
+
+        idx = cmdp->param.index;
+        path = pathval();
+        do {
+                name = padvance(&path, cmdp->cmdname);
+                stunalloc(name);
+        } while (--idx >= 0);
+        out1fmt("%s%s\n", name, (cmdp->rehash ? "*" : nullstr));
+}
+
 
 static int
 hashcmd(int argc, char **argv)
@@ -3838,25 +3840,6 @@ hashcmd(int argc, char **argv)
 }
 
 
-static void
-printentry(struct tblentry *cmdp)
-{
-        int idx;
-        const char *path;
-        char *name;
-
-        idx = cmdp->param.index;
-        path = pathval();
-        do {
-                name = padvance(&path, cmdp->cmdname);
-                stunalloc(name);
-        } while (--idx >= 0);
-        out1str(name);
-        out1fmt(snlfmt, cmdp->rehash ? "*" : nullstr);
-}
-
-
-
 /*
  * Resolve a command name.  If you change this routine, you may have to
  * change the shellexec routine as well.
@@ -4401,7 +4384,7 @@ describe_command(char *command)
         }
 
 out:
-        out1c('\n');
+        outstr("\n", stdout);
         return 0;
 }
 
@@ -6155,7 +6138,6 @@ check:
 
         if (vflag) {
                 out2str(parsenextc);
-                flushout(stderr);
         }
 
         *q = savec;
@@ -9208,9 +9190,8 @@ nextopt(const char *optstring)
         return c;
 }
 
-/*      $NetBSD: output.c,v 1.27 2002/11/24 22:35:42 christos Exp $     */
-
 
+/*      $NetBSD: output.c,v 1.27 2002/11/24 22:35:42 christos Exp $     */
 
 void
 outstr(const char *p, FILE *file)
@@ -9229,7 +9210,6 @@ flushall(void)
         INTON;
 }
 
-
 void
 flushout(FILE *dest)
 {
@@ -11119,6 +11099,8 @@ redirect(union node *redir, int flags)
                 dupredirect(n, newfd);
         } while ((n = n->nfile.next));
         INTON;
+        if (flags & REDIR_SAVEFD2 && sv && sv->renamed[2] >= 0)
+                preverrout_fd = sv->renamed[2];
 }
 
 
@@ -12544,7 +12526,6 @@ readcmd(int argc, char **argv)
         }
         if (prompt && isatty(0)) {
                 out2str(prompt);
-                flushall();
         }
         if (*(ap = argptr) == NULL)
                 error("arg count");