X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc%2Fwordexp.c;h=db83a69f37d996aa2a9f61bde18a60c06a727505;hb=3a051769c4a91c3a7d1f1310d888faa4abf363e7;hp=4609b99f624c0926d8ce054230562f8080863214;hpb=145c05345d6172eef1c8c274d696dbe1c01b88ab;p=musl

diff --git a/src/misc/wordexp.c b/src/misc/wordexp.c
index 4609b99f..db83a69f 100644
--- a/src/misc/wordexp.c
+++ b/src/misc/wordexp.c
@@ -7,7 +7,15 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <signal.h>
-#include <pthread.h>
+#include <errno.h>
+#include <fcntl.h>
+#include "pthread_impl.h"
+
+static void reap(pid_t pid)
+{
+	int status;
+	while (waitpid(pid, &status, 0) < 0 && errno == EINTR);
+}
 
 static char *getword(FILE *f)
 {
@@ -22,18 +30,19 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
 	size_t np=0;
 	char *w, **tmp;
 	char *redir = (flags & WRDE_SHOWERR) ? "" : "2>/dev/null";
-	int err = 0, status;
+	int err = 0;
 	FILE *f;
 	size_t wc = 0;
 	char **wv = 0;
 	int p[2];
 	pid_t pid;
+	sigset_t set;
 
 	if (flags & WRDE_REUSE) wordfree(we);
 
 	if (flags & WRDE_NOCMD) for (i=0; s[i]; i++) switch (s[i]) {
 	case '\\':
-		if (!sq) i++;
+		if (!sq && !s[++i]) return WRDE_SYNTAX;
 		break;
 	case '\'':
 		if (!dq) sq^=1;
@@ -62,6 +71,7 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
 		if (!(sq|dq|np)) return WRDE_BADCHAR;
 		break;
 	case '$':
+		if (sq) break;
 		if (s[i+1]=='(' && s[i+2]=='(') {
 			i += 2;
 			np += 2;
@@ -80,23 +90,26 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
 	i = wc;
 	if (flags & WRDE_DOOFFS) {
 		if (we->we_offs > SIZE_MAX/sizeof(void *)/4)
-			return WRDE_NOSPACE;
+			goto nospace;
 		i += we->we_offs;
+	} else {
+		we->we_offs = 0;
 	}
 
-	if (pipe(p) < 0) return WRDE_NOSPACE;
+	if (pipe2(p, O_CLOEXEC) < 0) goto nospace;
+	__block_all_sigs(&set);
 	pid = fork();
+	__restore_sigs(&set);
 	if (pid < 0) {
 		close(p[0]);
 		close(p[1]);
-		return WRDE_NOSPACE;
+		goto nospace;
 	}
 	if (!pid) {
-		dup2(p[1], 1);
-		close(p[0]);
-		close(p[1]);
+		if (p[1] == 1) fcntl(1, F_SETFD, 0);
+		else dup2(p[1], 1);
 		execl("/bin/sh", "sh", "-c",
-			"eval \"printf %s\\\\\\\\0 $1 $2\"",
+			"eval \"printf %s\\\\\\\\0 x $1 $2\"",
 			"sh", s, redir, (char *)0);
 		_exit(1);
 	}
@@ -106,12 +119,19 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
 	if (!f) {
 		close(p[0]);
 		kill(pid, SIGKILL);
-		waitpid(pid, &status, 0);
-		return WRDE_NOSPACE;
+		reap(pid);
+		goto nospace;
 	}
 
 	l = wv ? i+1 : 0;
 
+	free(getword(f));
+	if (feof(f)) {
+		fclose(f);
+		reap(pid);
+		return WRDE_SYNTAX;
+	}
+
 	while ((w = getword(f))) {
 		if (i+1 >= l) {
 			l += l/2+10;
@@ -125,22 +145,29 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
 	if (!feof(f)) err = WRDE_NOSPACE;
 
 	fclose(f);
-	waitpid(pid, &status, 0);
-	if (WEXITSTATUS(status)) {
-		if (!(flags & WRDE_APPEND)) {
-			free(wv);
-			return WRDE_SYNTAX;
-		} else if (wv==we->we_wordv) {
-			return WRDE_SYNTAX;
-		}
-	}
+	reap(pid);
+
+	if (!wv) wv = calloc(i+1, sizeof *wv);
 
 	we->we_wordv = wv;
-	we->we_wordc = i - we->we_offs;
+	we->we_wordc = i;
+
+	if (flags & WRDE_DOOFFS) {
+		if (wv) for (i=we->we_offs; i; i--)
+			we->we_wordv[i-1] = 0;
+		we->we_wordc -= we->we_offs;
+	}
 	return err;
+
+nospace:
+	if (!(flags & WRDE_APPEND)) {
+		we->we_wordc = 0;
+		we->we_wordv = 0;
+	}
+	return WRDE_NOSPACE;
 }
 
-int wordexp(const char *s, wordexp_t *we, int flags)
+int wordexp(const char *restrict s, wordexp_t *restrict we, int flags)
 {
 	int r, cs;
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);