X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=lsx.c;h=cb016cf1b4f490b738c2d565be0f19088aee2e76;hb=cf641ae49677ae0435780e0641d9b347a4325044;hp=7b84acc9a7a86e49825ab05be688dd924531446d;hpb=ab3bcac0bf42c1e63367a0f319a66524d5acdfe3;p=dmenu.git

diff --git a/lsx.c b/lsx.c
index 7b84acc..cb016cf 100644
--- a/lsx.c
+++ b/lsx.c
@@ -1,12 +1,15 @@
 /* See LICENSE file for copyright and license details. */
 #include <dirent.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
-static void lsx(const char *s);
+static void lsx(const char *dir);
+
+static int status = EXIT_SUCCESS;
 
 int
 main(int argc, char *argv[]) {
@@ -14,11 +17,9 @@ main(int argc, char *argv[]) {
 
 	if(argc < 2)
 		lsx(".");
-	else if(!strcmp(argv[1], "-v"))
-		puts("lsx-0.2, © 2006-2011 dmenu engineers, see LICENSE for details");
 	else for(i = 1; i < argc; i++)
 		lsx(argv[i]);
-	return EXIT_SUCCESS;
+	return status;
 }
 
 void
@@ -28,16 +29,15 @@ lsx(const char *dir) {
 	struct stat st;
 	DIR *dp;
 
-	if(!(dp = opendir(dir))) {
-		perror(dir);
-		return;
-	}
-	while((d = readdir(dp))) {
-		snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name);
-		if(stat(buf, &st) == -1)
-			perror(buf);
-		else if(S_ISREG(st.st_mode) && access(buf, X_OK) == 0)
+	for(dp = opendir(dir); dp && (d = readdir(dp)); errno = 0)
+		if(snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name) < (int)sizeof buf
+		&& access(buf, X_OK) == 0 && stat(buf, &st) == 0 && S_ISREG(st.st_mode))
 			puts(d->d_name);
+
+	if(errno != 0) {
+		status = EXIT_FAILURE;
+		perror(dir);
 	}
-	closedir(dp);
+	if(dp)
+		closedir(dp);
 }