system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

apply: clean up error handling.

Browse source 
Sponsored by:	Klara, Inc.
This commit is contained in:
Dag-Erling Smørgrav 2022-08-08 19:06:35 +00:00
parent 521abc32e2
commit 441202c00b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
usr.bin/apply/apply.c
View file

@ -176,23 +176,24 @@ main(int argc, char *argv[])
*/
for (rval = 0; argc > nargs; argc -= nargs, argv += nargs) {
sbuf_clear(cmdbuf);
sbuf_cat(cmdbuf, "exec ");
if (sbuf_cat(cmdbuf, "exec ") != 0)
err(1, "sbuf");
/* Expand command argv references. */
for (p = cmd; *p != '\0'; ++p) {
if (ISMAGICNO(p)) {
if (sbuf_cat(cmdbuf, argv[(++p)[0] - '0'])
== -1)
errc(1, ENOMEM, "sbuf");
if (sbuf_cat(cmdbuf, argv[*++p - '0']) != 0)
err(1, "sbuf");
} else {
if (sbuf_putc(cmdbuf, *p) == -1)
errc(1, ENOMEM, "sbuf");
if (sbuf_putc(cmdbuf, *p) != 0)
err(1, "sbuf");
}
if (sbuf_len(cmdbuf) > arg_max)
errc(1, E2BIG, NULL);
}
/* Terminate the command string. */
sbuf_finish(cmdbuf);
if (sbuf_finish(cmdbuf) != 0)
err(1, "sbuf");
/* Run the command. */
if (debug)