aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2004-04-01 09:23:30 +0000
committerGravatar Rob Landley <rob@landley.net>2004-04-01 09:23:30 +0000
commit25d82397f764f8e72a59ec37f5296f84c0f8916e (patch)
tree4560229c70edf36b6e98fb10d677c82f0a71e30d /editors
parent0b5bf45d3252227dc44396efd196b6b97813cecf (diff)
downloadbusybox-25d82397f764f8e72a59ec37f5296f84c0f8916e.tar.gz
busybox-25d82397f764f8e72a59ec37f5296f84c0f8916e.tar.bz2
The last patch broke:
sed -i "/^boo/a fred" ipsec.conf Which works in gnu sed. (And is _supposed_ to strip all the whitespace before "fred".) It also broke: sed -i -e "/^boo/a \\" -e " fred" ipsec.conf I.E. there can legally be spaces between the a and the backslash at the end of the line. And strangely enough, gnu sed accepts the following syntax as well: sed -i "/^boo/a \\ fred" ipsec.conf Which is a way of having the significant whitespace at the start of the line, all on one line. (But notice that the whitespace BEFORE the slash is still stripped, as is the slash itself. And notice that the naieve placement of "\n" there doesn't work, it puts an n at the start of the appended line. The double slashing is for shell escapes because you could escape the quote, you see. It's turned into a single backslash. But \n there is _not_ turned into a newline by the shell. So there.) This makes all three syntaxes work in my tests. I should probably start writing better documentation at some point. I posted my current sedtests.py file to the list, which needs a lot more tests added as well...
Diffstat (limited to 'editors')
-rw-r--r--editors/sed.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/editors/sed.c b/editors/sed.c
index ea99dd856..168a69c5b 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -6,6 +6,7 @@
* Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org>
* Copyright (C) 2002 Matt Kraai
* Copyright (C) 2003 by Glenn McGrath <bug1@optushome.com.au>
+ * Copyright (C) 2003,2004 by Rob Landley <rob@landley.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -410,9 +411,13 @@ static char *parse_cmd_args(sed_cmd_t *sed_cmd, char *cmdstr)
if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c')
bb_error_msg_and_die
("only a beginning address can be specified for edit commands");
- if (*cmdstr != '\n') /* should not happen */
- bb_error_msg_and_die("A/I/C backslash not followed by NL?");
- cmdstr++; /* skip over the NL following the backslash */
+ for(;;) {
+ if(*cmdstr=='\n' || *cmdstr=='\\') {
+ cmdstr++;
+ break;
+ } else if(isspace(*cmdstr)) cmdstr++;
+ else break;
+ }
sed_cmd->string = bb_xstrdup(cmdstr);
parse_escapes(sed_cmd->string,sed_cmd->string,strlen(cmdstr),0,0);
cmdstr += strlen(cmdstr);