Changeset 2306 in kBuild for trunk/src

Timestamp:

Mar 1, 2009 7:55:50 AM (16 years ago)

Author:

bird

Message:

kash: better CRLF hack for backtick.

File:

• trunk/src/kash/expand.c (modified) (3 diffs)

trunk/src/kash/expand.c

@@ -419 +419 @@
         int saveherefd;
         int quotes = flag & (EXP_FULL | EXP_CASE);
+#ifdef SH_DEAL_WITH_CRLF
+        int pending_cr = 0;
+#endif
 
         INTOFF;
@@ -448 +451 @@
                 }
                 lastc = *p++;
+#ifdef SH_DEAL_WITH_CRLF
+                if (pending_cr) {
+                        pending_cr = 0;
+                        if (lastc != '\n') {
+                                if (quotes && syntax[(int)'\r'] == CCTL)
+                                        STPUTC(psh, CTLESC, dest);
+                                STPUTC(psh, '\r', dest);
+                        }
+                }
+                if (lastc == '\r')
+                        pending_cr = '\r';
+                else
+#endif
                 if (lastc != '\0') {
                         if (quotes && syntax[(int)lastc] == CCTL)
@@ -454 +470 @@
                 }
         }
+#ifdef SH_DEAL_WITH_CRLF
+        if (pending_cr) {
+                if (quotes && syntax[(int)'\r'] == CCTL)
+                        STPUTC(psh, CTLESC, dest);
+                STPUTC(psh, '\r', dest);
+        }
+#endif
 
         /* Eat all trailing newlines */
         p = stackblock(psh) + startloc;
-        while (dest > p && dest[-1] == '\n') {
+        while (dest > p && dest[-1] == '\n')
                 STUNPUTC(psh, dest);
-#ifdef SH_DEAL_WITH_CRLF
-                if (dest > p && dest[-1] == '\r')
-                        STUNPUTC(psh, dest);
-#endif
-        }
 
         if (in.fd >= 0)