Changeset 2628 in kBuild for trunk/src/kash/parser.c

Timestamp:

Sep 6, 2012 3:16:12 PM (12 years ago)

Author:

bird

Message:

kash/parser.c: Fixed incorrect handling of \r\n -> \n conversion when there is a lone \r at the end of the input buffer.

File:

• trunk/src/kash/parser.c (modified) (4 diffs)

trunk/src/kash/parser.c

@@ -767 +767 @@
             TRACE((psh, "token %s %s\n", tokname[t], t == TWORD ? psh->wordtext : ""));
         else
-            TRACE((psh, "reread token %s %s\n", tokname[t], t == TWORD ? psh->wordtext : ""));
+            TRACE((psh, "reread token %s \"%s\"\n", tokname[t], t == TWORD ? psh->wordtext : ""));
 #endif
         return (t);
@@ -809 +809 @@
         for (;;) {      /* until token or start of word found */
                 c = pgetc_macro(psh);
+trace(psh, "xxreadtoken: c=%#x", c);
                 if (c == ' ' || c == '\t')
                         continue;               /* quick check for white space first */
@@ -854 +855 @@
                 case ')':
                         RETURN(TRP);
-                default:
+                default:
                         goto breakloop;
                 }
@@ -1615 +1616 @@
 synerror(shinstance *psh, const char *msg)
 {
-        if (psh->commandname)
+        if (psh->commandname) {
+                trace(psh, "synerror: %s: %d: Syntax error: %s", psh->commandname, psh->startlinno, msg);
                 outfmt(&psh->errout, "%s: %d: ", psh->commandname, psh->startlinno);
+        } else {
+                trace(psh, "synerror: Syntax error: %s\n", msg);
+        }
         outfmt(&psh->errout, "Syntax error: %s\n", msg);
         error(psh, (char *)NULL);