cmdops: fix no-args run in which and time

arsv · Nov 7, 2017 · 6eb3d35 · 6eb3d35
1 parent 11bcbc0
commit 6eb3d35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/cmdops/time.c b/src/cmdops/time.c
@@ -8,7 +8,7 @@
 #include <util.h>
 
 ERRTAG("time");
-ERRLIST(NEINVAL NEFAULT NEAGAIN NENOMEM NENOSYS NECHILD NEINTR);
+ERRLIST(NEINVAL NEFAULT NEAGAIN NENOMEM NENOSYS NECHILD NEINTR NENOENT);
 
 static void spawn(char** argv, char** envp)
 {
@@ -92,6 +92,8 @@ int main(int argc, char** argv, char** envp)
 	if(i < argc && argv[i][0] == '-')
 		if(argv[i++][1])
 			fail("unsupported options", NULL, 0);
+	if(i >= argc)
+		fail("too few arguments", NULL, 0);
 
 	sys_gettimeofday(&t0, NULL);
 

diff --git a/src/cmdops/which.c b/src/cmdops/which.c
@@ -83,6 +83,11 @@ int main(int argc, char** argv, char** envp)
 	char* path = xgetenv(envp, "PATH=");
 	int ret = 0;
 
+	if(argc < 2) {
+		warn(NULL, "too few arguments");
+		return -1;
+	}
+
 	for(i = 1; i < argc; i++)
 		ret |= which(path, argv[i], strlen(argv[i]));