makefile: *.o depend on draw.h

[dmenu.git] / lsx.c

diff --git a/lsx.c b/lsx.c
index 325c508..cb016cf 100644 (file)
--- a/lsx.c
+++ b/lsx.c
@@ -1,24 +1,25 @@
 /* See LICENSE file for copyright and license details. */
 #include <dirent.h>
 /* See LICENSE file for copyright and license details. */
 #include <dirent.h>

+#include <errno.h>
+#include <limits.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>

 #include <unistd.h>
 #include <sys/stat.h>
 
 static void lsx(const char *dir);
 
 #include <unistd.h>
 #include <sys/stat.h>
 
 static void lsx(const char *dir);
 

+static int status = EXIT_SUCCESS;
+

 int
 main(int argc, char *argv[]) {
        int i;
 
        if(argc < 2)
                lsx(".");
 int
 main(int argc, char *argv[]) {
        int i;
 
        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]);
        else for(i = 1; i < argc; i++)
                lsx(argv[i]);

-       return EXIT_SUCCESS;
+       return status;

 }
 
 void
 }
 
 void


@@ -28,14 +29,15 @@ lsx(const char *dir) {
        struct stat st;
        DIR *dp;
 
        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) == 0 && 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);
                        puts(d->d_name);

+
+       if(errno != 0) {
+               status = EXIT_FAILURE;
+               perror(dir);

        }
        }

-       closedir(dp);
+       if(dp)
+               closedir(dp);

 }
 }