summaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorDenys Vlasenko2010-05-18 09:12:53 +0200
committerDenys Vlasenko2010-05-18 09:12:53 +0200
commite66cf821cf1e4bd8c1ef28445c0559269f69bab9 (patch)
tree3ab9c437fccd1b613570c5af054c6145278677f0 /shell/ash.c
parenta1db8b8415cbac40c679a1ac11f90e97bf5a95f9 (diff)
downloadbusybox-e66cf821cf1e4bd8c1ef28445c0559269f69bab9.zip
busybox-e66cf821cf1e4bd8c1ef28445c0559269f69bab9.tar.gz
ash,hush: make bare "." set exitcode to 2
function old new delta dotcmd 300 305 +5 builtin_source 176 171 -5 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c45
1 files changed, 25 insertions, 20 deletions
diff --git a/shell/ash.c b/shell/ash.c
index ea813e0..641a140 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12031,37 +12031,42 @@ find_dot_file(char *name)
static int FAST_FUNC
dotcmd(int argc, char **argv)
{
+ char *fullname;
struct strlist *sp;
volatile struct shparam saveparam;
for (sp = cmdenviron; sp; sp = sp->next)
setvareq(ckstrdup(sp->text), VSTRFIXED | VTEXTFIXED);
+ if (!argv[1]) {
+ /* bash says: "bash: .: filename argument required" */
+ return 2; /* bash compat */
+ }
+
/* "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]);
+ fullname = find_dot_file(argv[1]);
- argv += 2;
- argc -= 2;
- if (argc) { /* argc > 0, argv[0] != NULL */
- saveparam = shellparam;
- shellparam.malloced = 0;
- shellparam.nparam = argc;
- shellparam.p = argv;
- };
-
- setinputfile(fullname, INPUT_PUSH_FILE);
- commandname = fullname;
- cmdloop(0);
- popfile();
+ argv += 2;
+ argc -= 2;
+ if (argc) { /* argc > 0, argv[0] != NULL */
+ saveparam = shellparam;
+ shellparam.malloced = 0;
+ shellparam.nparam = argc;
+ shellparam.p = argv;
+ };
+
+ setinputfile(fullname, INPUT_PUSH_FILE);
+ commandname = fullname;
+ cmdloop(0);
+ popfile();
+
+ if (argc) {
+ freeparam(&shellparam);
+ shellparam = saveparam;
+ };
- if (argc) {
- freeparam(&shellparam);
- shellparam = saveparam;
- };
- }
return exitstatus;
}