From: Herbert Xu <herbert@gondor.apana.org.au>
To: dash@vger.kernel.org
Subject: [PATCH] expand: Make glob(3) interruptible by SIGINT
Date: Tue, 2 Jun 2020 21:51:15 +1000 [thread overview]
Message-ID: <20200602115115.GA6951@gondor.apana.org.au> (raw)
If glob(3) is used then it can't be interrupted by SIGINT. This
is bad when an expansion causes a large number of entries to be
generated. This patch improves things by adding an int_pending
check to gl_opendir call. Note that this is still not perfect,
e.g., the sort would still be uninterruptible.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/configure.ac b/configure.ac
index ce5feec..955e2bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,13 @@ AC_CHECK_FUNC(stat64,, [
[64-bit operations are the same as 32-bit])
])
+AC_CHECK_FUNC(glob64,, [
+ AC_DEFINE(glob64_t, glob_t, [64-bit operations are the same as 32-bit])
+ AC_DEFINE(glob64, glob, [64-bit operations are the same as 32-bit])
+ AC_DEFINE(globfree64, globfree,
+ [64-bit operations are the same as 32-bit])
+])
+
dnl OS X apparently has stat64 but not open64.
AC_CHECK_FUNC(open64,, [
AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit])
diff --git a/src/expand.c b/src/expand.c
index 1730670..aea5cc4 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -120,7 +120,7 @@ static size_t memtodest(const char *p, size_t len, int flags);
STATIC ssize_t varvalue(char *, int, int, int);
STATIC void expandmeta(struct strlist *);
#ifdef HAVE_GLOB
-STATIC void addglob(const glob_t *);
+static void addglob(const glob64_t *);
#else
STATIC void expmeta(char *, unsigned, unsigned);
STATIC struct strlist *expsort(struct strlist *);
@@ -1154,6 +1154,20 @@ out:
*/
#ifdef HAVE_GLOB
+#ifdef __GLIBC__
+void *opendir_interruptible(const char *pathname)
+{
+ if (int_pending()) {
+ suppressint = 0;
+ onint();
+ }
+
+ return opendir(pathname);
+}
+#else
+#define GLOB_ALTDIRFUNC 0
+#endif
+
STATIC void
expandmeta(struct strlist *str)
{
@@ -1161,14 +1175,23 @@ expandmeta(struct strlist *str)
while (str) {
const char *p;
- glob_t pglob;
+ glob64_t pglob;
int i;
if (fflag)
goto nometa;
+
+#ifdef __GLIBC__
+ pglob.gl_closedir = (void *)closedir;
+ pglob.gl_readdir = (void *)readdir64;
+ pglob.gl_opendir = opendir_interruptible;
+ pglob.gl_lstat = lstat64;
+ pglob.gl_stat = stat64;
+#endif
+
INTOFF;
p = preglob(str->text, RMESCAPE_ALLOC | RMESCAPE_HEAP);
- i = glob(p, GLOB_NOMAGIC, 0, &pglob);
+ i = glob64(p, GLOB_ALTDIRFUNC | GLOB_NOMAGIC, 0, &pglob);
if (p != str->text)
ckfree(p);
switch (i) {
@@ -1177,12 +1200,12 @@ expandmeta(struct strlist *str)
(GLOB_NOMAGIC | GLOB_NOCHECK))
goto nometa2;
addglob(&pglob);
- globfree(&pglob);
+ globfree64(&pglob);
INTON;
break;
case GLOB_NOMATCH:
nometa2:
- globfree(&pglob);
+ globfree64(&pglob);
INTON;
nometa:
*exparg.lastp = str;
@@ -1201,9 +1224,7 @@ nometa:
* Add the result of glob(3) to the list.
*/
-STATIC void
-addglob(pglob)
- const glob_t *pglob;
+static void addglob(const glob64_t *pglob)
{
char **p = pglob->gl_pathv;
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
reply other threads:[~2020-06-02 11:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200602115115.GA6951@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=dash@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).