From: Roland McGrath <roland@redhat.com>
Date: Tue, 11 Nov 2003 21:24:23 +0000 (+0000)
Subject: 2003-11-11  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~675
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce0d15442eec017b1dcbfdd14ac92e73c39c586a;p=strace

2003-11-11  Roland McGrath  <roland@redhat.com>

	* strace.c (main): Bail with usage error for missing command before we
	open the -o file or fiddle uids.
---

diff --git a/strace.c b/strace.c
index 1d057fcd..fea2a13b 100644
--- a/strace.c
+++ b/strace.c
@@ -304,6 +304,9 @@ char *argv[];
 		}
 	}
 
+	if (optind == argc && !pflag_seen)
+		usage(stderr, 1);
+
 	/* See if they want to run as another user. */
 	if (username != NULL) {
 		struct passwd *pent;
@@ -408,7 +411,7 @@ char *argv[];
 				pid);
 	}
 
-	if (optind < argc) {
+	if (!pflag_seen) {
 		struct stat statbuf;
 		char *filename;
 		char pathname[MAXPATHLEN];
@@ -549,8 +552,6 @@ char *argv[];
 			break;
 		}
 	}
-	else if (pflag_seen == 0)
-		usage(stderr, 1);
 
 	sigemptyset(&empty_set);
 	sigemptyset(&blocked_set);