summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenys Vlasenko2009-05-02 02:34:19 +0200
committerDenys Vlasenko2009-05-02 02:34:19 +0200
commit54e0843e7dabc4f6d79781f8b07094dadacd4cd5 (patch)
treefb25b2bdb58f309872c4c13ec24376f89ebcf684 /shell
parent48a29defcaeb3e3bbf32ae6ed3f77de2101e083a (diff)
downloadbusybox-54e0843e7dabc4f6d79781f8b07094dadacd4cd5.zip
busybox-54e0843e7dabc4f6d79781f8b07094dadacd4cd5.tar.gz
hush: make . cmd search $PATH
function old new delta builtin_source 128 249 +121 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/hush.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 692076c..cbec2dd 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -6142,7 +6142,6 @@ int hush_main(int argc, char **argv)
/* If we are login shell... */
if (argv[0] && argv[0][0] == '-') {
FILE *input;
- /* TODO: what should argv be while sourcing /etc/profile? */
debug_printf("sourcing /etc/profile\n");
input = fopen_for_read("/etc/profile");
if (input != NULL) {
@@ -6875,6 +6874,7 @@ static int builtin_shift(char **argv)
static int builtin_source(char **argv)
{
+ const char *PATH;
FILE *input;
save_arg_t sv;
#if ENABLE_HUSH_FUNCTIONS
@@ -6884,12 +6884,36 @@ static int builtin_source(char **argv)
if (*++argv == NULL)
return EXIT_FAILURE;
-// TODO: search through $PATH is missing
+ if (strchr(*argv, '/') == NULL
+ && (PATH = get_local_var_value("PATH")) != NULL
+ ) {
+ /* Search through $PATH */
+ while (1) {
+ const char *end = strchrnul(PATH, ':');
+ int sz = end - PATH; /* must be int! */
+
+ if (sz != 0) {
+ char *tmp = xasprintf("%.*s/%s", sz, PATH, *argv);
+ input = fopen_for_read(tmp);
+ free(tmp);
+ } else {
+ /* We have xxx::yyyy in $PATH,
+ * it means "use current dir" */
+ input = fopen_for_read(*argv);
+ }
+ if (input)
+ goto opened_ok;
+ if (*end == '\0')
+ break;
+ PATH = end + 1;
+ }
+ }
input = fopen_or_warn(*argv, "r");
if (!input) {
/* bb_perror_msg("%s", *argv); - done by fopen_or_warn */
return EXIT_FAILURE;
}
+ opened_ok:
close_on_exec_on(fileno(input));
#if ENABLE_HUSH_FUNCTIONS