Changeset 2304 in kBuild

Timestamp:

Mar 1, 2009 7:48:14 AM (16 years ago)

Author:

bird

Message:

kash: CRLF hacking, tests run cleanly on windows now!

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• expand.c (modified) (1 diff)
• tests/redirect-3 (modified) (1 diff)

trunk/src/kash/Makefile.kmk

@@ -40 +40 @@
 ## @todo bring over PC_SLASHES?
 kash_DEFS.win = \
-        BSD PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS YY_NO_UNISTD_H
+        BSD PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS YY_NO_UNISTD_H SH_DEAL_WITH_CRLF
 kash_DEFS.os2 = \
         HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME \

trunk/src/kash/expand.c

@@ -457 +457 @@
         /* 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)

trunk/src/kash/tests/redirect-3

@@ -11 +11 @@
 echo 3 >> $TMPFILE
 VAR=`$CMD_SED -e '/2/!d' < $TMPFILE`
-$CMD_RM -f $TMPFILE
+#$CMD_RM -f $TMPFILE
 if test "$VAR" != "2"; then
-    echo "redirect-3: FAILURE - VAR=$VAR"
+    echo "redirect-3: FAILURE - VAR=$VAR."
     exit 1
 fi