emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug where sed '/foo/p' was printing "invalid command".

Browse Source
This commit is contained in:
Mark Whitley 2000-07-13 22:52:02 +00:00
parent 4f7fe77d07
commit 496e33feeb
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/sed.c
View File

@ -188,11 +188,9 @@ static int get_address(const char *str, int *line, regex_t **regex)
} while (isdigit(my_str[idx])); } while (isdigit(my_str[idx]));
my_str[idx] = 0; my_str[idx] = 0;
*line = atoi(my_str); *line = atoi(my_str);
*regex = NULL;
} }
else if (my_str[idx] == '$') { else if (my_str[idx] == '$') {
*line = -1; *line = -1;
*regex = NULL;
idx++; idx++;
} }
else if (my_str[idx] == '/') { else if (my_str[idx] == '/') {
@ -202,6 +200,7 @@ static int get_address(const char *str, int *line, regex_t **regex)
my_str[idx] = '\0'; my_str[idx] = '\0';
*regex = (regex_t *)xmalloc(sizeof(regex_t)); *regex = (regex_t *)xmalloc(sizeof(regex_t));
xregcomp(*regex, my_str+1, REG_NEWLINE); xregcomp(*regex, my_str+1, REG_NEWLINE);
idx++; /* so it points to the next character after the last '/' */
} }
else { else {
fprintf(stderr, "sed.c:get_address: no address found in string\n"); fprintf(stderr, "sed.c:get_address: no address found in string\n");

3
sed.c
View File

@ -188,11 +188,9 @@ static int get_address(const char *str, int *line, regex_t **regex)
} while (isdigit(my_str[idx])); } while (isdigit(my_str[idx]));
my_str[idx] = 0; my_str[idx] = 0;
*line = atoi(my_str); *line = atoi(my_str);
*regex = NULL;
} }
else if (my_str[idx] == '$') { else if (my_str[idx] == '$') {
*line = -1; *line = -1;
*regex = NULL;
idx++; idx++;
} }
else if (my_str[idx] == '/') { else if (my_str[idx] == '/') {
@ -202,6 +200,7 @@ static int get_address(const char *str, int *line, regex_t **regex)
my_str[idx] = '\0'; my_str[idx] = '\0';
*regex = (regex_t *)xmalloc(sizeof(regex_t)); *regex = (regex_t *)xmalloc(sizeof(regex_t));
xregcomp(*regex, my_str+1, REG_NEWLINE); xregcomp(*regex, my_str+1, REG_NEWLINE);
idx++; /* so it points to the next character after the last '/' */
} }
else { else {
fprintf(stderr, "sed.c:get_address: no address found in string\n"); fprintf(stderr, "sed.c:get_address: no address found in string\n");