summaryrefslogtreecommitdiff
path: root/usr/src/cmd/xargs
diff options
context:
space:
mode:
authorcf46844 <none@none>2006-08-23 14:02:51 -0700
committercf46844 <none@none>2006-08-23 14:02:51 -0700
commitef69670ded4ed2349f664bb59f0d513cc0364906 (patch)
tree8e7c5194a49f7e00c627774a3e54113ee50d61e2 /usr/src/cmd/xargs
parent99b9f1a37168c210ee2f4980f8bf9c9114b4739f (diff)
downloadillumos-joyent-ef69670ded4ed2349f664bb59f0d513cc0364906.tar.gz
6459214 UNIX03: *vsc* xpg6 version of xargs fails null eofstr test
Diffstat (limited to 'usr/src/cmd/xargs')
-rw-r--r--usr/src/cmd/xargs/xargs.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/usr/src/cmd/xargs/xargs.c b/usr/src/cmd/xargs/xargs.c
index 758cbdcdb3..8e0fca455c 100644
--- a/usr/src/cmd/xargs/xargs.c
+++ b/usr/src/cmd/xargs/xargs.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -726,8 +725,8 @@ getarg()
end_arg: *next++ = '\0';
/* we finished without requeuing so free requeue_buf */
free(requeue_buf);
- if (strcmp(arg, LEOF) == 0 || (c == '\0' &&
- strlen(arg) == 0)) {
+ if ((strcmp(arg, LEOF) == 0 && *LEOF != '\0') ||
+ (c == '\0' && strlen(arg) == 0)) {
MORE = FALSE;
/* absorb the rest of the line */
if ((c != '\n') && (c != '\0'))