int ret;
size_t nspaces;
+ const char *backslash, *forward_slash, *end_slash;
+ size_t prefix_len;
+
+ backslash = strrchr(pattern, '\\');
+ end_slash = strrchr(pattern, '/');
+
+ if (backslash > end_slash)
+ end_slash = backslash;
+
+ if (end_slash)
+ prefix_len = end_slash - pattern + 1;
+ else
+ prefix_len = 0;
+
/* This function does not support all functionality of the POSIX glob(),
* so make sure the parameters are consistent with supported
* functionality. */
pglob->gl_pathv = NULL;
nspaces = 0;
do {
- char *filename;
+ char *path;
if (pglob->gl_pathc == nspaces) {
size_t new_nspaces;
char **pathv;
pglob->gl_pathv = pathv;
nspaces = new_nspaces;
}
- filename = strdup(dat.cFileName);
- if (!filename)
+ size_t filename_len = strlen(dat.cFileName);
+ size_t len_needed = prefix_len + filename_len;
+
+ path = malloc(len_needed + 1);
+ if (!path)
goto oom;
- pglob->gl_pathv[pglob->gl_pathc++] = filename;
+
+ memcpy(path, pattern, prefix_len);
+ memcpy(path + prefix_len, dat.cFileName, filename_len + 1);
+ pglob->gl_pathv[pglob->gl_pathc++] = path;
} while (FindNextFileA(hFind, &dat));
err = GetLastError();
CloseHandle(hFind);
size_t i;
for (i = 0; i < pglob->gl_pathc; i++)
free(pglob->gl_pathv[i]);
- free(pglob->gl_pathv[i]);
+ free(pglob->gl_pathv);
}
static bool