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

sort: use asprintf(3) instead of malloc + snprintf(3)

Browse Source
This commit is contained in:
Baptiste Daroussin 2022-10-13 10:34:57 +02:00
parent 958b0d4642
commit 48a53cc484
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,28 +538,26 @@ openfile(const char *fn, const char *mode)
S_IRGRP | S_IROTH);
if (is_tmp && (compress_program != NULL)) {
int r;
char *cmd;
size_t cmdsz;
cmdsz = strlen(fn) + 128;
cmd = sort_malloc(cmdsz);
fflush(stdout);
if (mode[0] == 'r')
snprintf(cmd, cmdsz - 1, "cat %s | %s -d",
r = asprintf(&cmd, "cat %s | %s -d",
fn, compress_program);
else if (mode[0] == 'w')
snprintf(cmd, cmdsz - 1, "%s > %s",
r = asprintf(&cmd, "%s > %s",
compress_program, fn);
else
err(2, "%s", getstr(7));
if (r == -1)
err(2, "aspritnf()");
if ((file = popen(cmd, mode)) == NULL)
err(2, NULL);
sort_free(cmd);
free(cmd);
} else
if ((file = fopen(fn, mode)) == NULL)
err(2, NULL);