X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=libfstools%2Foverlay.c;h=e610b8d36e7342190352c463eac6cd87ec87abb3;hp=8423a57c36df8fd67b445c3ff76ecc9b2afd8db6;hb=de6b026d685670fbb10279c4a75a9227d94f22d2;hpb=11efbf3b90f031ce634fc38cad07a4aef2985777

diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index 8423a57..e610b8d 100644
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -67,15 +67,29 @@ handle_rmdir(const char *dir)
 void
 foreachdir(const char *dir, int (*cb)(const char*))
 {
+	static char *globdir = NULL;
+	static size_t globdirlen = 0;
 	struct stat s = { 0 };
-	char globdir[256];
+	size_t dirlen = strlen(dir);
 	glob_t gl;
 	int j;
 
-	if (dir[strlen(dir) - 1] == '/')
-		snprintf(globdir, 256, "%s*", dir);
+	if (dirlen + sizeof("/*") > globdirlen) {
+		/* Alloc extra 256 B to avoid too many reallocs */
+		size_t len = dirlen + sizeof("/*") + 256;
+		char *tmp;
+
+		tmp = realloc(globdir, len);
+		if (!tmp)
+			return;
+		globdir = tmp;
+		globdirlen = len;
+	}
+
+	if (dir[dirlen - 1] == '/')
+		sprintf(globdir, "%s*", dir);
 	else
-		snprintf(globdir, 256, "%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++) {