Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-03 00:31:16 +00:00
Code Issues Projects Releases Wiki Activity

hush: make . cmd search $PATH

Browse Source 
function         old     new   delta
builtin_source   128     249    +121

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-05-02 02:34:19 +02:00
parent 48a29defca
commit 54e0843e7d
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
shell/hush.c
View File

@ -6142,7 +6142,6 @@ int hush_main(int argc, char **argv)
/* If we are login shell... */ /* If we are login shell... */
if (argv[0] && argv[0][0] == '-') { if (argv[0] && argv[0][0] == '-') {
FILE *input; FILE *input;
/* TODO: what should argv be while sourcing /etc/profile? */
debug_printf("sourcing /etc/profile\n"); debug_printf("sourcing /etc/profile\n");
input = fopen_for_read("/etc/profile"); input = fopen_for_read("/etc/profile");
if (input != NULL) { if (input != NULL) {
@ -6875,6 +6874,7 @@ static int builtin_shift(char **argv)
static int builtin_source(char **argv) static int builtin_source(char **argv)
{ {
const char *PATH;
FILE *input; FILE *input;
save_arg_t sv; save_arg_t sv;
#if ENABLE_HUSH_FUNCTIONS #if ENABLE_HUSH_FUNCTIONS
@ -6884,12 +6884,36 @@ static int builtin_source(char **argv)
if (*++argv == NULL) if (*++argv == NULL)
return EXIT_FAILURE; 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"); input = fopen_or_warn(*argv, "r");
if (!input) { if (!input) {
/* bb_perror_msg("%s", *argv); - done by fopen_or_warn */ /* bb_perror_msg("%s", *argv); - done by fopen_or_warn */
return EXIT_FAILURE; return EXIT_FAILURE;
} }
opened_ok:
close_on_exec_on(fileno(input)); close_on_exec_on(fileno(input));
#if ENABLE_HUSH_FUNCTIONS #if ENABLE_HUSH_FUNCTIONS