svn commit: trunk/busybox: coreutils testsuite/echo

vda at busybox.net vda at busybox.net
Wed Apr 30 00:39:23 UTC 2008


Author: vda
Date: 2008-04-29 17:39:22 -0700 (Tue, 29 Apr 2008)
New Revision: 21897

Log:
echo: fix echo -e -n "msg\n\0"
(by "Pinedo, David" <david.pinedo AT hp.com>)



Added:
   trunk/busybox/testsuite/echo/echo-prints-slash-zero

Modified:
   trunk/busybox/coreutils/echo.c


Changeset:
Modified: trunk/busybox/coreutils/echo.c
===================================================================
--- trunk/busybox/coreutils/echo.c	2008-04-30 00:15:56 UTC (rev 21896)
+++ trunk/busybox/coreutils/echo.c	2008-04-30 00:39:22 UTC (rev 21897)
@@ -108,15 +108,19 @@
 				}
 #if !ENABLE_FEATURE_FANCY_ECHO
 				/* SUSv3 specifies that octal escapes must begin with '0'. */
-				if ( (((unsigned char)*arg) - '1') >= 7)
+				if ( ((int)(unsigned char)(*arg) - '0') >= 8) /* '8' or bigger */
 #endif
 				{
 					/* Since SUSv3 mandates a first digit of 0, 4-digit octals
 					* of the form \0### are accepted. */
-					if (*arg == '0' && ((unsigned char)(arg[1]) - '0') < 8) {
-						arg++;
+					if (*arg == '0') {
+						/* NB: don't turn "...\0" into "...\" */
+						if (arg[1] && ((unsigned char)(arg[1]) - '0') < 8) {
+							arg++;
+						}
 					}
-					/* bb_process_escape_sequence can handle nul correctly */
+					/* bb_process_escape_sequence handles NUL correctly
+					 * ("...\" case). */
 					c = bb_process_escape_sequence(&arg);
 				}
 			}

Added: trunk/busybox/testsuite/echo/echo-prints-slash-zero
===================================================================
--- trunk/busybox/testsuite/echo/echo-prints-slash-zero	                        (rev 0)
+++ trunk/busybox/testsuite/echo/echo-prints-slash-zero	2008-04-30 00:39:22 UTC (rev 21897)
@@ -0,0 +1 @@
+test "`busybox echo -e -n 'msg\n\0' | od -t x1 | head -n 1`" = "0000000 6d 73 67 0a 00"




More information about the busybox-cvs mailing list