Patch from Jason Schoon to add optional SIGUSR1 support to dd.

[oweals/busybox.git] / editors / awk.c

diff --git a/editors/awk.c b/editors/awk.c
index 80ff8c77b3a878902e93d2f1ed71ffe463376858..e11c8350f77c94eb3007b22be809fce2cfdfd8c5 100644 (file)
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -45,7 +45,7 @@ typedef struct var_s {
        double number;
        char *string;
        union {
-               int aidx;                               /* func arg index (on compilation stage) */
+               int aidx;                               /* func arg idx (for compilation stage) */
                struct xhash_s *array;  /* array ptr */
                struct var_s *parent;   /* for func args, ptr to actual parameter */
                char **walker;                  /* list of array elements (for..in) */
@@ -392,7 +392,7 @@ static char * vValues =
 /* hash size may grow to these values */
 #define FIRST_PRIME 61;
 static const unsigned int PRIMES[] = { 251, 1021, 4093, 16381, 65521 };
-static const unsigned int NPRIMES = sizeof(PRIMES) / sizeof(unsigned int);
+enum { NPRIMES = sizeof(PRIMES) / sizeof(unsigned int) };
 
 /* globals */
 
@@ -948,7 +948,7 @@ static uint32_t next_token(uint32_t expected)
                                *(p-1) = '\0';
                                tc = TC_VARIABLE;
                                /* also consume whitespace between functionname and bracket */
-                               skip_spaces(&p);
+                               if (! (expected & TC_VARIABLE)) skip_spaces(&p);
                                if (*p == '(') {
                                        tc = TC_FUNCTION;
                                } else {
@@ -1656,6 +1656,7 @@ static int awk_getline(rstream *rsm, var *v)
                                }
                        } else if (c != '\0') {
                                s = strchr(b+pp, c);
+                               if (! s) s = memchr(b+pp, '\0', p - pp);
                                if (s) {
                                        so = eo = s-b;
                                        eo++;
@@ -2611,10 +2612,10 @@ static rstream *next_input_file(void)
        return &rsm;
 }
 
-extern int awk_main(int argc, char **argv)
+int awk_main(int argc, char **argv)
 {
        char *s, *s1;
-       int i, j, c;
+       int i, j, c, flen;
        var *v;
        static var tv;
        char **envp;
@@ -2682,9 +2683,16 @@ keep_going:
                                F = afopen(programname = optarg, "r");
                                s = NULL;
                                /* one byte is reserved for some trick in next_token */
-                               for (i=j=1; j>0; i+=j) {
-                                       s = (char *)xrealloc(s, i+4096);
-                                       j = fread(s+i, 1, 4094, F);
+                               if (fseek(F, 0, SEEK_END) == 0) {
+                                       flen = ftell(F);
+                                       s = (char *)xmalloc(flen+4);
+                                       fseek(F, 0, SEEK_SET);
+                                       i = 1 + fread(s+1, 1, flen, F);
+                               } else {
+                                       for (i=j=1; j>0; i+=j) {
+                                               s = (char *)xrealloc(s, i+4096);
+                                               j = fread(s+i, 1, 4094, F);
+                                       }
                                }
                                s[i] = '\0';
                                fclose(F);