mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
Fixed bug where sed '/foo/p' was printing "invalid command".
This commit is contained in:
parent
4f7fe77d07
commit
496e33feeb
@ -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
3
sed.c
@ -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");
|
||||||
|
Loading…
Reference in New Issue
Block a user