lsx: return failure on error

[dmenu.git] / lsx.c

diff --git a/lsx.c b/lsx.c
index 7b84acc..57c03bf 100644 (file)
--- a/lsx.c
+++ b/lsx.c
@@ -1,12 +1,14 @@
 /* See LICENSE file for copyright and license details. */
 #include <dirent.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 +16,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
@@ -29,15 +29,13 @@ lsx(const char *dir) {
        DIR *dp;
 
        if(!(dp = opendir(dir))) {
+               status = EXIT_FAILURE;
                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)
+       while((d = readdir(dp)))
+               if(snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name) < (int)sizeof buf
+               && stat(buf, &st) == 0 && S_ISREG(st.st_mode) && access(buf, X_OK) == 0)
                        puts(d->d_name);
-       }
        closedir(dp);
 }