sbase

commit 69b9c2444b71babe012467b13aa408894b14a6cd
parent e6d3032131760725ab409a9c3c78fa81fff3d1e2
Author: David Phillips <david@sighup.nz>
Date:   Sun,  1 Oct 2017 21:39:27 +1300

libutil/recurse: only opendir if recursing

Previous behaviour was to call opendir regardless of if we are actually going
to be recursing into the directory. Additionally, some utilities that use
DIRFIRST benefit from running the function pointed to by fn before the call
to opendir. One such example is `chmod [-R] 777 dir` on a directory with mode
000, where it will be expected for chmod to first give itself rwx before
optionally listing the directory to traverse it.

Diffstat:
M
libutil/recurse.c
 | 
18
++++++++----------

1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/libutil/recurse.c b/libutil/recurse.c
@@ -54,18 +54,17 @@ recurse(const char *path, void *data, struct recursor *r)
 		if (h->ino == st.st_ino && h->dev == st.st_dev)
 			return;
 
-	if (!(dp = opendir(path))) {
-		if (!(r->flags & SILENT)) {
-			weprintf("opendir %s:", path);
-			recurse_status = 1;
-		}
-		return;
-	}
-
 	if (!r->depth && (r->flags & DIRFIRST))
 		(r->fn)(path, &st, data, r);
 
 	if (!r->maxdepth || r->depth + 1 < r->maxdepth) {
+		if (!(dp = opendir(path))) {
+			if (!(r->flags & SILENT)) {
+				weprintf("opendir %s:", path);
+				recurse_status = 1;
+			}
+			return;
+		}
 		while ((d = readdir(dp))) {
 			if (r->follow == 'H') {
 				statf_name = "lstat";
@@ -90,6 +89,7 @@ recurse(const char *path, void *data, struct recursor *r)
 				r->depth--;
 			}
 		}
+		closedir(dp);
 	}
 
 	if (!r->depth) {
@@ -102,6 +102,4 @@ recurse(const char *path, void *data, struct recursor *r)
 			free(h);
 		}
 	}
-
-	closedir(dp);
 }