commit 7bbd4c56ebe1c91b90561e7f22e875f58e7facc9
parent c71abdc65c8a7ff9597f7b6b5bf60a59be174224
Author: Connor Lane Smith <cls@lubutu.com>
Date:   Mon, 17 Oct 2011 01:44:07 +0100

lsx: detect read errors
Diffstat:

Mlsx.c | 16+++++++++-------


1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lsx.c b/lsx.c
@@ -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>
@@ -28,14 +29,15 @@ lsx(const char *dir) {
 	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) == 0 && S_ISREG(st.st_mode) && access(buf, X_OK) == 0)
-			puts(d->d_name);
-	closedir(dp);
+	if(dp)
+		closedir(dp);
 }