midfavila/sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "fix length after '\' getline string termination"

Browse Source 
Caused a regression in sed, revert until we investigate further.
This commit is contained in:
sin 2016-03-01 15:23:23 +00:00
parent fa18379a05
commit ea0d16e928
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cut.c
View File

@ -115,8 +115,8 @@ cut(FILE *fp, const char *fname)
Range *r; Range *r;
while ((len = getline(&buf, &size, fp)) > 0) { while ((len = getline(&buf, &size, fp)) > 0) {
if (buf[len - 1] == '\n') if (len && buf[len - 1] == '\n')
buf[--len] = '\0'; buf[len - 1] = '\0';
if (mode == 'f' && !utfutf(buf, delim)) { if (mode == 'f' && !utfutf(buf, delim)) {
if (!sflag) if (!sflag)
puts(buf); puts(buf);

2
head.c
View File

@ -15,7 +15,7 @@ head(FILE *fp, const char *fname, size_t n)
while (i < n && (len = getline(&buf, &size, fp)) > 0) { while (i < n && (len = getline(&buf, &size, fp)) > 0) {
fputs(buf, stdout); fputs(buf, stdout);
i += (buf[len - 1] == '\n'); i += (len && (buf[len - 1] == '\n'));
} }
free(buf); free(buf);
if (ferror(fp)) if (ferror(fp))

4
sed.c
View File

@ -441,8 +441,8 @@ read_line(FILE *f, String *s)
eprintf("getline:"); eprintf("getline:");
return EOF; return EOF;
} }
if (s->str[len] == '\n') if (s->str[--len] == '\n')
s->str[--len] = '\0'; s->str[len] = '\0';
return 0; return 0;
} }

2
tail.c
View File

@ -23,7 +23,7 @@ dropinit(FILE *fp, const char *str, size_t n)
if (mode == 'n') { if (mode == 'n') {
while (i < n && (len = getline(&buf, &size, fp)) > 0) while (i < n && (len = getline(&buf, &size, fp)) > 0)
if (buf[len - 1] == '\n') if (len > 0 && buf[len - 1] == '\n')
i++; i++;
} else { } else {
while (i < n && (len = efgetrune(&r, fp, str))) while (i < n && (len = efgetrune(&r, fp, str)))

4
uudecode.c
View File

@ -169,9 +169,9 @@ uudecode(FILE *fp, FILE *outfp)
while ((len = getline(&bufb, &n, fp)) > 0) { while ((len = getline(&bufb, &n, fp)) > 0) {
p = bufb; p = bufb;
/* trim newlines */ /* trim newlines */
if (bufb[len - 1] != '\n') if (!len || bufb[len - 1] != '\n')
eprintf("no newline found, aborting\n"); eprintf("no newline found, aborting\n");
bufb[--len] = '\0'; bufb[len - 1] = '\0';
/* check for last line */ /* check for last line */
if ((i = DEC(*p)) <= 0) if ((i = DEC(*p)) <= 0)