simpler lsx

[dmenu.git] / lsx.c

diff --git a/lsx.c b/lsx.c
index 7b84acc..fd28625 100644 (file)
--- a/lsx.c
+++ b/lsx.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
 #include <unistd.h>
 #include <sys/stat.h>
 

-static void lsx(const char *s);
+static void lsx(const char *dir);

 
 int
 main(int argc, char *argv[]) {
 
 int
 main(int argc, char *argv[]) {


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


@@ -34,9 +32,7 @@ lsx(const char *dir) {
        }
        while((d = readdir(dp))) {
                snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name);
        }
        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)
+               if(!stat(buf, &st) && S_ISREG(st.st_mode) && access(buf, X_OK) == 0)

                        puts(d->d_name);
        }
        closedir(dp);
                        puts(d->d_name);
        }
        closedir(dp);