tmerge lsx -> default - dmenu - Dmenu fork with xft fonts.
 (HTM) git clone git://r-36.net/dmenu
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 5e0156c0727fa8f225c3309f265da241a98edc08
 (DIR) parent ca7ef6d2c901b2f302e735da369b730edb3575cf
 (HTM) Author: Connor Lane Smith <cls@lubutu.com>
       Date:   Mon, 17 Oct 2011 10:08:04 +0100
       
       merge lsx -> default
       Diffstat:
         lsx.c                               |      21 +++++++++++++--------
       
       1 file changed, 13 insertions(+), 8 deletions(-)
       ---
 (DIR) diff --git a/lsx.c b/lsx.c
       t@@ -1,5 +1,6 @@
        /* See LICENSE file for copyright and license details. */
        #include <dirent.h>
       +#include <errno.h>
        #include <limits.h>
        #include <stdio.h>
        #include <stdlib.h>
       t@@ -8,6 +9,8 @@
        
        static void lsx(const char *dir);
        
       +static int status = EXIT_SUCCESS;
       +
        int
        main(int argc, char *argv[]) {
                int i;
       t@@ -16,7 +19,7 @@ main(int argc, char *argv[]) {
                        lsx(".");
                else for(i = 1; i < argc; i++)
                        lsx(argv[i]);
       -        return EXIT_SUCCESS;
       +        return status;
        }
        
        void
       t@@ -26,13 +29,15 @@ lsx(const char *dir) {
                struct stat st;
                DIR *dp;
        
       -        if(!(dp = opendir(dir))) {
       -                perror(dir);
       -                return;
       -        }
       -        while((d = readdir(dp)))
       +        for(dp = opendir(dir); dp && (d = readdir(dp)); errno = 0)
                        if(snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name) < (int)sizeof buf
       -                && !stat(buf, &st) && S_ISREG(st.st_mode) && access(buf, X_OK) == 0)
       +                && access(buf, X_OK) == 0 && stat(buf, &st) == 0 && S_ISREG(st.st_mode))
                                puts(d->d_name);
       -        closedir(dp);
       +
       +        if(errno != 0) {
       +                status = EXIT_FAILURE;
       +                perror(dir);
       +        }
       +        if(dp)
       +                closedir(dp);
        }