simpler lsx

diff --git a/dmenu.1 b/dmenu.1
index 44c953b..616a2a5 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -95,4 +95,5 @@ Exit without selecting an item, returning failure.
 .B Ctrl\-y
 Paste the current X selection into the input field.
 .SH SEE ALSO
 .B Ctrl\-y
 Paste the current X selection into the input field.
 .SH SEE ALSO

-.IR dwm (1)
+.IR dwm (1),
+.IR lsx (1)

diff --git a/lsx.1 b/lsx.1
index fbb84ea..1b2a15e 100644 (file)
--- a/lsx.1
+++ b/lsx.1
@@ -3,13 +3,9 @@
 lsx \- list executables
 .SH SYNOPSIS
 .B lsx
 lsx \- list executables
 .SH SYNOPSIS
 .B lsx

-.RB [ \-v ]

 .RI [ directory ...]
 .SH DESCRIPTION
 .B lsx
 .RI [ directory ...]
 .SH DESCRIPTION
 .B lsx

-lists the executables in each directory. If no directories are given the current
-working directory is used.
-.SH OPTIONS
-.TP
-.B \-v
-prints version information to stdout, then exits.
+lists the executables in each
+.IR directory .
+If none are given the current working directory is used.

diff --git a/lsx.c b/lsx.c
index 325c508..fd28625 100644 (file)
--- a/lsx.c
+++ b/lsx.c
@@ -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,7 +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) == 0 && 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);