sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

hush: pass GLOB_NOCHECK to glob 

By doing so glob will not return GLOB_NOMATCH anymore but instead
just does what fake_glob would do.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2012-04-29 14:54:26 +02:00
parent 87681170f5
commit f4762eb5e7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/hush.c
View File

@ -962,11 +962,6 @@ static int xglob(o_string *dest, int flags, glob_t *pglob)
} else if (glob_needed(dest->data)) {
gr = glob(dest->data, flags, NULL, pglob);
debug("glob returned %d\n",gr);
if (gr == GLOB_NOMATCH) {
/* quote removal, or more accurately, backslash removal */
gr = fake_glob(dest->data, flags, NULL, pglob);
debug("globhack returned %d\n",gr);
}
} else {
gr = fake_glob(dest->data, flags, NULL, pglob);
debug("globhack returned %d\n",gr);
@ -1172,7 +1167,7 @@ static int done_word(o_string *dest, struct p_context *ctx)
{
struct child_prog *child = ctx->child;
glob_t *glob_target;
int gr, flags = 0;
int gr, flags = GLOB_NOCHECK;
debug("%s: %s %p\n", __func__, dest->data, child);
if (dest->length == 0 && !dest->nonnull) {