summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c203c2f)
Don't create a hole in the array of configs if there's a directory. Such
a hole would be mistaken for the end of the array.
Signed-off-by: Michal 'vorner' Vaner <michal.vaner@nic.cz>
{
char **configs;
glob_t globbuf;
{
char **configs;
glob_t globbuf;
+ int size, i, j, skipped;
}
size = sizeof(char *) * (globbuf.gl_pathc + 1);
}
size = sizeof(char *) * (globbuf.gl_pathc + 1);
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
p = get_filename(globbuf.gl_pathv[i]);
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
p = get_filename(globbuf.gl_pathv[i]);
- configs = uci_malloc(ctx, size);
- buf = (char *) &configs[globbuf.gl_pathc + 1];
+ configs = uci_malloc(ctx, size - skipped);
+ buf = (char *) &configs[globbuf.gl_pathc + 1 - skipped];
+ j = 0;
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
if (!uci_validate_package(p))
continue;
if (!uci_validate_package(p))
continue;
strcpy(buf, p);
buf += strlen(buf) + 1;
}
strcpy(buf, p);
buf += strlen(buf) + 1;
}