pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-27 15:43:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20150424 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2015-05-15 11:04:28 -04:00
parent 85ec0778f9
commit 48abf0fdc9
23 changed files with 474 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell.c
+19 -14
View File
@@ -390,9 +390,7 @@ main (argc, argv, env)
xtrace_init ();
#if defined (USING_BASH_MALLOC) && defined (DEBUG) && !defined (DISABLE_MALLOC_WRAPPERS)
# if 1
malloc_set_register (1);
# endif
malloc_set_register (0); /* XXX - change to 1 for malloc debugging */
#endif
check_dev_tty ();
@@ -512,8 +510,6 @@ main (argc, argv, env)
}
this_command_name = (char *)NULL;
cmd_init(); /* initialize the command object caches */
/* First, let the outside world know about our interactive status.
A shell is interactive if the `-i' flag was given, or if all of
the following conditions are met:
@@ -684,6 +680,8 @@ main (argc, argv, env)
}
#endif
cmd_init(); /* initialize the command object caches */
if (command_execution_string)
{
arg_index = bind_args (argv, arg_index, argc, 0);
@@ -1470,6 +1468,14 @@ open_shell_script (script_name)
exit ((e == ENOENT) ? EX_NOTFOUND : EX_NOINPUT);
}
free (dollar_vars[0]);
dollar_vars[0] = exec_argv0 ? savestring (exec_argv0) : savestring (script_name);
if (exec_argv0)
{
free (exec_argv0);
exec_argv0 = (char *)NULL;
}
if (file_isdir (filename))
{
#if defined (EISDIR)
@@ -1481,14 +1487,6 @@ open_shell_script (script_name)
exit (EX_NOINPUT);
}
free (dollar_vars[0]);
dollar_vars[0] = exec_argv0 ? savestring (exec_argv0) : savestring (script_name);
if (exec_argv0)
{
free (exec_argv0);
exec_argv0 = (char *)NULL;
}
#if defined (ARRAY_VARS)
GET_ARRAY_FROM_VAR ("FUNCNAME", funcname_v, funcname_a);
GET_ARRAY_FROM_VAR ("BASH_SOURCE", bash_source_v, bash_source_a);
@@ -1521,7 +1519,14 @@ open_shell_script (script_name)
{
e = errno;
if ((fstat (fd, &sb) == 0) && S_ISDIR (sb.st_mode))
internal_error (_("%s: is a directory"), filename);
{
#if defined (EISDIR)
errno = EISDIR;
file_error (filename);
#else
internal_error (_("%s: Is a directory"), filename);
#endif
}
else
{
errno = e;