From cd10dc40e4057d081caf7676a4fed31977f2d94d Mon Sep 17 00:00:00 2001
From: Denys Vlasenko
Date: Mon, 17 May 2010 17:10:46 +0200
Subject: ash: fix ". empty_file" exitcode. +5 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 shell/ash.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'shell/ash.c')

diff --git a/shell/ash.c b/shell/ash.c
index 75bfbf1..ef5b2d4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12031,13 +12031,16 @@ dotcmd(int argc, char **argv)
 {
 	struct strlist *sp;
 	volatile struct shparam saveparam;
-	int status = 0;
 
 	for (sp = cmdenviron; sp; sp = sp->next)
 		setvareq(ckstrdup(sp->text), VSTRFIXED | VTEXTFIXED);
 
+	/* "false; . empty_file; echo $?" should print 0, not 1: */
+	exitstatus = 0;
+
 	if (argv[1]) {        /* That's what SVR2 does */
 		char *fullname = find_dot_file(argv[1]);
+
 		argv += 2;
 		argc -= 2;
 		if (argc) { /* argc > 0, argv[0] != NULL */
@@ -12056,9 +12059,8 @@ dotcmd(int argc, char **argv)
 			freeparam(&shellparam);
 			shellparam = saveparam;
 		};
-		status = exitstatus;
 	}
-	return status;
+	return exitstatus;
 }
 
 static int FAST_FUNC
-- 
cgit v1.1