[BusyBox-cvs] busybox/editors Config.in,1.7,1.8 sed.c,1.150,1.151

Glenn McGrath bug1 at busybox.net
Wed Oct 1 03:06:18 UTC 2003


Update of /var/cvs/busybox/editors
In directory winder:/tmp/cvs-serv24784/editors

Modified Files:
	Config.in sed.c 
Log Message:
Patch by Rob Landley, work in progress update, fixes lots of bugs, 
introduces a few others (but they are being worked on) 


Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/editors/Config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.in	16 Sep 2003 05:25:40 -0000	1.7
+++ Config.in	1 Oct 2003 03:06:14 -0000	1.8
@@ -33,28 +33,6 @@
 	  sed is used to perform text transformations on a file
 	  or input from a pipeline.
 
-config CONFIG_FEATURE_SED_EMBEDED_NEWLINE
-	bool " Embeded newline (EXPERIMENTAL)"
-	default n
-	depends on CONFIG_SED
-	help
-	  This is a hack to allow matching of '\n' in regular expressions.
-	  It works by translating '\n' to "\n" and back.
-	  It may introduce unexpected results if you use "\n" in your text.
-
-config CONFIG_FEATURE_SED_GNU_COMPATABILITY
-	bool " Behave consistent with GNU sed"
-	default y
-	depends on CONFIG_SED
-	help
-	  Where GNU sed doesnt follow the posix standard, do as GNU sed does.
-	  Current difference are in
-	    - N command with odd number of lines (see GNU sed info page)
-	    - Blanks before substitution flags eg.
-	        GNU sed interprets 's/a/b/ g' as 's/a/b/g'
-		Standard says 's/a/b/ g' should be 's/a/b/;g'
-	    - GNU sed allows blanks between a '!' and the function.
-
 config CONFIG_VI
 	bool "vi"
 	default n

Index: sed.c
===================================================================
RCS file: /var/cvs/busybox/editors/sed.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- sed.c	24 Sep 2003 10:23:39 -0000	1.150
+++ sed.c	1 Oct 2003 03:06:15 -0000	1.151
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * sed.c - very minimalist version of sed
  *
@@ -22,6 +23,24 @@
  *
  */
 
+/* Code overview.
+
+  Files are laid out to avoid unnecessary function declarations.  So for
[...1744 lines suppressed...]
 			break;
+		}
 		default:
 			bb_show_usage();
 		}
 	}
+	/* Flush any unfinished commands. */
+	add_cmd("");
 
 	/* if we didn't get a pattern from a -e and no command file was specified,
 	 * argv[optind] should be the pattern. no pattern, no worky */
@@ -1207,7 +1105,7 @@
 		if (argv[optind] == NULL)
 			bb_show_usage();
 		else
-			add_cmd_str(argv[optind++]);
+			add_cmd(argv[optind++]);
 	}
 
 	/* argv[(optind)..(argc-1)] should be names of file to process. If no




More information about the busybox-cvs mailing list