diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-05-31 16:27:49 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-05-31 16:48:41 +0300 |
| commit | b1e9413a5b6a6e156a2a8851ef4088ca7c929999 (patch) | |
| tree | 57759feeaa56900be4ca31917fd051b593620569 /rpmio/rpmglob.c | |
| parent | 8516fc22123919b4bb82db07a07764414a4a2ac7 (diff) | |
| download | rpm-b1e9413a5b6a6e156a2a8851ef4088ca7c929999.tar.gz | |
Eliminate shell interruptability hack in rpmglob
Diffstat (limited to 'rpmio/rpmglob.c')
| -rw-r--r-- | rpmio/rpmglob.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c index 00b3c46e2..e18e34463 100644 --- a/rpmio/rpmglob.c +++ b/rpmio/rpmglob.c @@ -511,22 +511,7 @@ glob(const char *pattern, int flags, For each name we found, call glob_in_dir on it and FILENAME, appending the results to PGLOB. */ for (i = 0; i < dirs.gl_pathc; ++i) { - int old_pathc; - -#ifdef SHELL - { - /* Make globbing interruptible in the bash shell. */ - extern int interrupt_state; - - if (interrupt_state) { - globfree(&dirs); - globfree(&files); - return GLOB_ABORTED; - } - } -#endif /* SHELL. */ - - old_pathc = pglob->gl_pathc; + int old_pathc = pglob->gl_pathc; status = glob_in_dir(filename, dirs.gl_pathv[i], ((flags | GLOB_APPEND) & ~(GLOB_NOCHECK | GLOB_ERR)), |