Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: allow glob after directory

Browse Source
This commit is contained in:
K. Lange 2018-10-05 20:29:48 +09:00
parent ebf6e3f746
commit e943b521ee
1 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
apps/sh.c
View File

@ -1044,43 +1044,70 @@ _done:
int has_before = !!strlen(before); int has_before = !!strlen(before);
int has_after = !!strlen(after); int has_after = !!strlen(after);
if (!has_before || !strchr(before,'/')) { if (1) {
/* read current directory, add all */ /* read current directory, add all */
DIR * dirp = opendir("."); DIR * dirp;
char * prepend = "";
if (has_before) {
char * dir = strrchr(before,'/');
if (!dir) {
dirp = opendir(".");
} else if (dir == before) {
dirp = opendir("/");
prepend = before;
before++;
} else {
*dir = '\0';
dirp = opendir(before);
prepend = before;
before = dir+1;
}
} else {
dirp = opendir(".");
}
int before_i = i; int before_i = i;
struct dirent * ent = readdir(dirp); if (dirp) {
while (ent != NULL) { struct dirent * ent = readdir(dirp);
if (ent->d_name[0] != '.') { while (ent != NULL) {
char * s = malloc(sizeof(char) * (strlen(ent->d_name) + 1)); if (ent->d_name[0] != '.') {
memcpy(s, ent->d_name, strlen(ent->d_name) + 1); char * s = malloc(sizeof(char) * (strlen(ent->d_name) + 1));
memcpy(s, ent->d_name, strlen(ent->d_name) + 1);
char * t = s; char * t = s;
if (has_before) { if (has_before) {
if (strstr(s,before) != s) { if (strstr(s,before) != s) {
goto _nope; free(s);
} goto _nope;
t = &s[strlen(before)];
}
if (has_after) {
if (strlen(t) >= strlen(after)) {
if (!strcmp(after,&t[strlen(t)-strlen(after)])) {
argv[i] = s;
i++;
argcs[cmdi]++;
} }
t = &s[strlen(before)];
} }
} else { if (has_after) {
argv[i] = s; if (strlen(t) >= strlen(after)) {
i++; if (!strcmp(after,&t[strlen(t)-strlen(after)])) {
argcs[cmdi]++; char * out = malloc(strlen(s) + 2 + strlen(prepend));
sprintf(out,"%s%s%s", prepend, !!*prepend ? "/" : "", s);
argv[i] = out;
i++;
argcs[cmdi]++;
}
}
} else {
char * out = malloc(strlen(s) + 2 + strlen(prepend));
sprintf(out,"%s%s%s", prepend, !!*prepend ? "/" : "", s);
argv[i] = out;
i++;
argcs[cmdi]++;
}
free(s);
} }
}
_nope: _nope:
ent = readdir(dirp); ent = readdir(dirp);
}
closedir(dirp);
} }
closedir(dirp);
if (before_i == i) { if (before_i == i) {
/* no matches */ /* no matches */
@ -1092,12 +1119,6 @@ _nope:
} else { } else {
free(c); free(c);
} }
} else {
/* directory globs not supported */
glob[0] = '*';
argv[i] = c;
i++;
argcs[cmdi]++;
} }
} else { } else {
argv[i] = c; argv[i] = c;