X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmisc%2Fwordexp.c;h=db83a69f37d996aa2a9f61bde18a60c06a727505;hb=1c9afd69051a64cf085c6fb3674a444ff9a43857;hp=a5f1b658ce0600c6d4e48d53a692a64faafaa79e;hpb=aeea71dc042d8d0a05f4293a0e98c9cd009ffc16;p=musl

diff --git a/src/misc/wordexp.c b/src/misc/wordexp.c
index a5f1b658..db83a69f 100644
--- a/src/misc/wordexp.c
+++ b/src/misc/wordexp.c
@@ -14,13 +14,7 @@
 static void reap(pid_t pid)
 {
 	int status;
-	for (;;) {
-		if (waitpid(pid, &status, 0) < 0) {
-			if (errno != EINTR) return;
-		} else {
-			if (WIFEXITED(status)) return;
-		}
-	}
+	while (waitpid(pid, &status, 0) < 0 && errno == EINTR);
 }
 
 static char *getword(FILE *f)
@@ -48,7 +42,7 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
 
 	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;
@@ -77,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;