From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 17 Aug 2009 00:12:20 +0000 (+0200)
Subject: ash: fix bug 571 (jobs %string misbehaving)
X-Git-Tag: 1_15_0~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ffc39202aad7858bbe4a894f0e81e7ec313b5478;p=oweals%2Fbusybox.git

ash: fix bug 571 (jobs %string misbehaving)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/shell/ash.c b/shell/ash.c
index 3755202eb..077f5e5fc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3510,7 +3510,7 @@ getjob(const char *name, int getctl)
 {
 	struct job *jp;
 	struct job *found;
-	const char *err_msg = "No such job: %s";
+	const char *err_msg = "%s: no such job";
 	unsigned num;
 	int c;
 	const char *p;
@@ -3562,10 +3562,8 @@ getjob(const char *name, int getctl)
 		p++;
 	}
 
-	found = 0;
-	while (1) {
-		if (!jp)
-			goto err;
+	found = NULL;
+	while (jp) {
 		if (match(jp->ps[0].cmd, p)) {
 			if (found)
 				goto err;
@@ -3574,6 +3572,9 @@ getjob(const char *name, int getctl)
 		}
 		jp = jp->prev_job;
 	}
+	if (!found)
+		goto err;
+	jp = found;
 
  gotit:
 #if JOBS