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

Made a correction to a bad test expression. Props to Larry Doolittle for

Browse Source 
spotting this one.
This commit is contained in:
Mark Whitley 2001-04-20 23:27:17 +00:00
parent 3e310ac309
commit 497ef46587
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

@ -317,7 +317,7 @@ static int parse_edit_cmd(struct sed_cmd *sed_cmd, const char *editstr)
/* now we need to go through * and: s/\\[\r\n]$/\n/g on the edit line */ /* now we need to go through * and: s/\\[\r\n]$/\n/g on the edit line */
while (ptr[idx]) { while (ptr[idx]) {
while (ptr[idx] != '\\' && (ptr[idx+1] != '\n' || ptr[idx+1] != '\r')) { while (ptr[idx] != '\\' || (ptr[idx+1] != '\n' && ptr[idx+1] != '\r')) {
idx++; idx++;
if (!ptr[idx]) { if (!ptr[idx]) {
goto out; goto out;
@ -343,7 +343,6 @@ out:
/* this accounts for the fact that A) we started at index 3, not at index /* this accounts for the fact that A) we started at index 3, not at index
* 0 and B) that we added an extra '\n' at the end (if you think the next * 0 and B) that we added an extra '\n' at the end (if you think the next
* line should read 'idx += 4' remember, arrays are zero-based) */ * line should read 'idx += 4' remember, arrays are zero-based) */
idx += 3; idx += 3;
return idx; return idx;

3
sed.c
View File

@ -317,7 +317,7 @@ static int parse_edit_cmd(struct sed_cmd *sed_cmd, const char *editstr)
/* now we need to go through * and: s/\\[\r\n]$/\n/g on the edit line */ /* now we need to go through * and: s/\\[\r\n]$/\n/g on the edit line */
while (ptr[idx]) { while (ptr[idx]) {
while (ptr[idx] != '\\' && (ptr[idx+1] != '\n' || ptr[idx+1] != '\r')) { while (ptr[idx] != '\\' || (ptr[idx+1] != '\n' && ptr[idx+1] != '\r')) {
idx++; idx++;
if (!ptr[idx]) { if (!ptr[idx]) {
goto out; goto out;
@ -343,7 +343,6 @@ out:
/* this accounts for the fact that A) we started at index 3, not at index /* this accounts for the fact that A) we started at index 3, not at index
* 0 and B) that we added an extra '\n' at the end (if you think the next * 0 and B) that we added an extra '\n' at the end (if you think the next
* line should read 'idx += 4' remember, arrays are zero-based) */ * line should read 'idx += 4' remember, arrays are zero-based) */
idx += 3; idx += 3;
return idx; return idx;