aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 15:18:38 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 15:18:38 +0100
commit2b4c258e74d033b75b7f34bb384290eceb5da8a6 (patch)
tree20e5fbd73bd6ec6178a7f2b8173a321dd434f620
parent265062d59dd46065ad34519f04615fb2cecefe8a (diff)
downloadbusybox-w32-2b4c258e74d033b75b7f34bb384290eceb5da8a6.tar.gz
busybox-w32-2b4c258e74d033b75b7f34bb384290eceb5da8a6.tar.bz2
busybox-w32-2b4c258e74d033b75b7f34bb384290eceb5da8a6.zip
ash: revert "make dot command search current directory first"
Reverts this: commit 8ad78e1ec7b2e873953f9f476fb63b5893526c39 Author: Denis Vlasenko <vda.linux@googlemail.com> Date: Sun Feb 15 12:40:30 2009 +0000 ash: make dot command search current directory first, as bash does. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 7c1204a47..866c7de05 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12502,16 +12502,7 @@ find_dot_file(char *name)
12502 if (strchr(name, '/')) 12502 if (strchr(name, '/'))
12503 return name; 12503 return name;
12504 12504
12505 /* IIRC standards do not say whether . is to be searched.
12506 * And it is even smaller this way, making it unconditional for now:
12507 */
12508 if (1) { /* ENABLE_ASH_BASH_COMPAT */
12509 fullname = name;
12510 goto try_cur_dir;
12511 }
12512
12513 while ((fullname = path_advance(&path, name)) != NULL) { 12505 while ((fullname = path_advance(&path, name)) != NULL) {
12514 try_cur_dir:
12515 if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) { 12506 if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) {
12516 /* 12507 /*
12517 * Don't bother freeing here, since it will 12508 * Don't bother freeing here, since it will