mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

Suppress a spurious empty arg at EOF w/ "find -0" caused by the last commit.

Browse Source
This commit is contained in:
millert 2023-12-23 15:58:58 +00:00
parent 9342ba5ef4
commit d1526e1c2b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/xargs/xargs.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: xargs.c,v 1.37 2023/12/22 17:12:13 millert Exp $ */
/* $OpenBSD: xargs.c,v 1.38 2023/12/23 15:58:58 millert Exp $ */
/* $FreeBSD: xargs.c,v 1.51 2003/05/03 19:09:11 obrien Exp $ */
/*-
@ -296,8 +296,12 @@ arg2:
foundeof = *eofstr != '\0' &&
strcmp(argp, eofstr) == 0;
/* Do not make empty args unless they are quoted */
if ((zflag || argp != p || wasquoted) && !foundeof) {
/*
* Do not make empty args unless they are quoted or
* we are run as "find -0" and not at EOF.
*/
if (((zflag && ch != EOF) || argp != p || wasquoted) &&
!foundeof) {
*p++ = '\0';
*xp++ = argp;
if (Iflag) {