aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Whitley <markw@lineo.com>2000-11-03 20:23:49 +0000
committerMark Whitley <markw@lineo.com>2000-11-03 20:23:49 +0000
commiteb69ead09102ef9cb404a4b3e72b6615321b49e6 (patch)
treee3c2b2a36eb3f318628c36023ad646103cd97a23
parente7ff2842dd180f1d9b35ae6d6d7bca5ee8af77d9 (diff)
downloadbusybox-w32-eb69ead09102ef9cb404a4b3e72b6615321b49e6.tar.gz
busybox-w32-eb69ead09102ef9cb404a4b3e72b6615321b49e6.tar.bz2
busybox-w32-eb69ead09102ef9cb404a4b3e72b6615321b49e6.zip
Removed REG_NEWLINE from regcomp to fix the same bug found in grep where it
would not match blank lines (bug #1064). Followed Matt Kraii's suit on his 1.42 revision of grep. Tested it, works.
-rw-r--r--editors/sed.c2
-rw-r--r--sed.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/editors/sed.c b/editors/sed.c
index bc0e96187..707ab9308 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -222,7 +222,7 @@ static int get_address(const char *str, int *line, regex_t **regex)
222 fatalError("unterminated match expression\n"); 222 fatalError("unterminated match expression\n");
223 my_str[idx] = '\0'; 223 my_str[idx] = '\0';
224 *regex = (regex_t *)xmalloc(sizeof(regex_t)); 224 *regex = (regex_t *)xmalloc(sizeof(regex_t));
225 xregcomp(*regex, my_str+1, REG_NEWLINE); 225 xregcomp(*regex, my_str+1, 0);
226 idx++; /* so it points to the next character after the last '/' */ 226 idx++; /* so it points to the next character after the last '/' */
227 } 227 }
228 else { 228 else {
diff --git a/sed.c b/sed.c
index bc0e96187..707ab9308 100644
--- a/sed.c
+++ b/sed.c
@@ -222,7 +222,7 @@ static int get_address(const char *str, int *line, regex_t **regex)
222 fatalError("unterminated match expression\n"); 222 fatalError("unterminated match expression\n");
223 my_str[idx] = '\0'; 223 my_str[idx] = '\0';
224 *regex = (regex_t *)xmalloc(sizeof(regex_t)); 224 *regex = (regex_t *)xmalloc(sizeof(regex_t));
225 xregcomp(*regex, my_str+1, REG_NEWLINE); 225 xregcomp(*regex, my_str+1, 0);
226 idx++; /* so it points to the next character after the last '/' */ 226 idx++; /* so it points to the next character after the last '/' */
227 } 227 }
228 else { 228 else {