d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort: simplify the code to handle -z flag

Browse Source
This commit is contained in:
Baptiste Daroussin 2022-10-13 10:21:48 +02:00
parent 4d4fcf619e
commit f079ef8aa4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/sort/file.c
View File

@ -605,10 +605,7 @@ file_reader_init(const char *fsrc)
ret = sort_calloc(1, sizeof(struct file_reader));
ret->elsymb = '\n';
if (sort_opts_vals.zflag)
ret->elsymb = 0;
ret->elsymb = sort_opts_vals.zflag ? '\0' : '\n';
ret->fname = sort_strdup(fsrc);
if (strcmp(fsrc, "-") && (compress_program == NULL) && use_mmap) {
@ -687,14 +684,15 @@ file_reader_readline(struct file_reader *fr)
}
}
} else {
int delim = sort_opts_vals.zflag ? '\0' : '\n';
ssize_t len = getdelim(&fr->buffer, &fr->bsz, delim, fr->file);
ssize_t len;
len = getdelim(&fr->buffer, &fr->bsz, fr->elsymb, fr->file);
if (len < 0) {
if (!feof(fr->file))
err(2, NULL);
return (NULL);
}
if (len > 0 && fr->buffer[len - 1] == delim)
if (len > 0 && fr->buffer[len - 1] == fr->elsymb)
len--;
ret = bwscsbdup(fr->buffer, len);
}