diff mbox series

[LEDE-DEV,fstools] libfstools: optimize building directory string for glob

Message ID 20180105142430.17981-1-zajec5@gmail.com
State Accepted
Delegated to: John Crispin
Headers show
Series [LEDE-DEV,fstools] libfstools: optimize building directory string for glob | expand

Commit Message

Rafał Miłecki Jan. 5, 2018, 2:24 p.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

glob should handle paths like /foo/bar//* so we probably don't need this
extra check & code.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
This optimization/simplification was suggested by Jo while reviewing
[PATCH] libfstools: support file paths longer than 255 chars
---
 libfstools/overlay.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index e610b8d..0187a55 100644
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -86,10 +86,7 @@  foreachdir(const char *dir, int (*cb)(const char*))
 		globdirlen = len;
 	}
 
-	if (dir[dirlen - 1] == '/')
-		sprintf(globdir, "%s*", dir);
-	else
-		sprintf(globdir, "%s/*", dir);
+	sprintf(globdir, "%s/*", dir);
 
 	if (!glob(globdir, GLOB_NOESCAPE | GLOB_MARK | GLOB_ONLYDIR, NULL, &gl))
 		for (j = 0; j < gl.gl_pathc; j++) {