[hackers] [dmenu] merge lsx -> default || Connor Lane Smith

From: <hg_AT_suckless.org>
Date: Mon, 17 Oct 2011 11:08:18 +0200 (CEST)

changeset: 452:b780f6cf5a73
tag: tip
parent: 451:720497b01222
parent: 450:d478c46628d6
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Mon Oct 17 10:08:04 2011 +0100
description:
merge lsx -> default


diff -r 720497b01222 -r b780f6cf5a73 lsx.c
--- a/lsx.c Mon Oct 17 02:12:33 2011 +0100
+++ b/lsx.c Mon Oct 17 10:08:04 2011 +0100
_AT_@ -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>
_AT_@ -8,6 +9,8 @@
 
 static void lsx(const char *dir);
 
+static int status = EXIT_SUCCESS;
+
 int
 main(int argc, char *argv[]) {
         int i;
_AT_@ -16,7 +19,7 @@
                 lsx(".");
         else for(i = 1; i < argc; i++)
                 lsx(argv[i]);
- return EXIT_SUCCESS;
+ return status;
 }
 
 void
_AT_@ -26,13 +29,15 @@
         struct stat st;
         DIR *dp;
 
- if(!(dp = opendir(dir))) {
+ 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);
+
+ if(errno != 0) {
+ status = EXIT_FAILURE;
                 perror(dir);
- return;
         }
- while((d = readdir(dp)))
- 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)
- puts(d->d_name);
- closedir(dp);
+ if(dp)
+ closedir(dp);
 }
Received on Mon Oct 17 2011 - 11:08:18 CEST