[BUILTIN] Dotcmd should exit with zero when doing nothing
Tim Allen wrote:
> The POSIX specification for the dot command[1] states:
>
> EXIT STATUS
> Returns the value of the last command executed, or a zero exit
> status if no command is executed.
>
> If an empty file is sourced, then "no command is executed"
I agree. Looking through "git log --patch src/main.c", though, I find
v0.5.3~42 (Do not clobber exit status in dotcmd., 2005-03-03), which
appears to have been meant to take care of the following case:
$ cat printstatus.sh
echo $?
$ false
$ . ./printstatus.sh
1
I wonder if the following on top might help (imitating evalcmd)?
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/ChangeLog b/ChangeLog
index 6d02fa9..8a832bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-10 Jonathan Nieder <jrnieder@gmail.com>
+
+ * Dotcmd should exit with zero when doing nothing.
+
2011-03-10 Herbert Xu <herbert@gondor.apana.org.au>
* Fix CTLESC clobbering by read(1).
diff --git a/src/main.c b/src/main.c
index 1735c67..b38dc27 100644
--- a/src/main.c
+++ b/src/main.c
@@ -202,6 +202,7 @@
union node *n;
struct stackmark smark;
int inter;
+ int status = 0;
int numeof = 0;
TRACE(("cmdloop(%d) called\n", top));
@@ -235,6 +236,7 @@
job_warning = (job_warning == 2) ? 1 : 0;
numeof = 0;
evaltree(n, 0);
+ status = exitstatus;
}
popstackmark(&smark);
@@ -245,7 +247,7 @@
}
}
- return 0;
+ return status;
}
@@ -325,9 +327,8 @@
fullname = find_dot_file(argv[1]);
setinputfile(fullname, INPUT_PUSH_FILE);
commandname = fullname;
- cmdloop(0);
+ status = cmdloop(0);
popfile();
- status = exitstatus;
}
return status;
}