aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Lane Smith <cls@lubutu.com>2011-10-17 10:08:04 +0100
committerConnor Lane Smith <cls@lubutu.com>2011-10-17 10:08:04 +0100
commit5e0156c0727fa8f225c3309f265da241a98edc08 (patch)
tree47ab53541e5ba56cbdfa70fd9498ae53c2a35d73
parentca7ef6d2c901b2f302e735da369b730edb3575cf (diff)
parent7bbd4c56ebe1c91b90561e7f22e875f58e7facc9 (diff)
merge lsx -> default
-rw-r--r--lsx.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/lsx.c b/lsx.c
index f337a4a..cb016cf 100644
--- a/lsx.c
+++ b/lsx.c
@@ -1,5 +1,6 @@
1/* See LICENSE file for copyright and license details. */ 1/* See LICENSE file for copyright and license details. */
2#include <dirent.h> 2#include <dirent.h>
3#include <errno.h>
3#include <limits.h> 4#include <limits.h>
4#include <stdio.h> 5#include <stdio.h>
5#include <stdlib.h> 6#include <stdlib.h>
@@ -8,6 +9,8 @@
8 9
9static void lsx(const char *dir); 10static void lsx(const char *dir);
10 11
12static int status = EXIT_SUCCESS;
13
11int 14int
12main(int argc, char *argv[]) { 15main(int argc, char *argv[]) {
13 int i; 16 int i;
@@ -16,7 +19,7 @@ main(int argc, char *argv[]) {
16 lsx("."); 19 lsx(".");
17 else for(i = 1; i < argc; i++) 20 else for(i = 1; i < argc; i++)
18 lsx(argv[i]); 21 lsx(argv[i]);
19 return EXIT_SUCCESS; 22 return status;
20} 23}
21 24
22void 25void
@@ -26,13 +29,15 @@ lsx(const char *dir) {
26 struct stat st; 29 struct stat st;
27 DIR *dp; 30 DIR *dp;
28 31
29 if(!(dp = opendir(dir))) { 32 for(dp = opendir(dir); dp && (d = readdir(dp)); errno = 0)
30 perror(dir);
31 return;
32 }
33 while((d = readdir(dp)))
34 if(snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name) < (int)sizeof buf 33 if(snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name) < (int)sizeof buf
35 && !stat(buf, &st) && S_ISREG(st.st_mode) && access(buf, X_OK) == 0) 34 && access(buf, X_OK) == 0 && stat(buf, &st) == 0 && S_ISREG(st.st_mode))
36 puts(d->d_name); 35 puts(d->d_name);
37 closedir(dp); 36
37 if(errno != 0) {
38 status = EXIT_FAILURE;
39 perror(dir);
40 }
41 if(dp)
42 closedir(dp);
38} 43}