diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2012-07-07 12:25:38 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2012-07-07 12:25:38 -0400 |
| commit | c74f63f39ff38c335bffa1da56603bd58bc49b7b (patch) | |
| tree | 0f5167ac4ae8461c551cabb3a453dd4b32504c86 /lib/glob/glob.c | |
| parent | 66773245d792b68fcc1eec16badb1657bd365715 (diff) | |
| download | bash-c74f63f39ff38c335bffa1da56603bd58bc49b7b.tar.gz | |
commit bash-20120622 snapshot
Diffstat (limited to 'lib/glob/glob.c')
| -rw-r--r-- | lib/glob/glob.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/glob/glob.c b/lib/glob/glob.c index 14a44a0a..e0bab02e 100644 --- a/lib/glob/glob.c +++ b/lib/glob/glob.c @@ -683,7 +683,8 @@ glob_vector (pat, dir, flags) lose = 1; break; } - + run_pending_traps (); + dp = readdir (d); if (dp == NULL) break; @@ -857,6 +858,7 @@ glob_vector (pat, dir, flags) } QUIT; + run_pending_traps (); return ((char **)NULL); } @@ -1186,6 +1188,8 @@ glob_filename (pathname, flags) { if (free_dirname) free (directory_name); + QUIT; /* XXX - shell */ + run_pending_traps (); return (temp_results); } @@ -1210,6 +1214,7 @@ glob_filename (pathname, flags) free (directory_name); QUIT; + run_pending_traps (); return (NULL); } |