/* shell.c -- GNU's idea of the POSIX shell specification. */
-/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2015 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
- Bash is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ Bash is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bash is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- License for more details.
+ Bash is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bash; see the file COPYING. If not, write to the Free
- Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ along with Bash. If not, see <http://www.gnu.org/licenses/>.
+*/
+/*
Birthdate:
Sunday, January 10th, 1988.
Initial author: Brian Fox
#include <signal.h>
#include <errno.h>
#include "filecntl.h"
-#include <pwd.h>
+#if defined (HAVE_PWD_H)
+# include <pwd.h>
+#endif
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
#if defined (JOB_CONTROL)
#include "jobs.h"
+#else
+extern int initialize_job_control __P((int));
+extern int get_tty_state __P((void));
#endif /* JOB_CONTROL */
#include "input.h"
# include <readline/history.h>
#endif
+#if defined (READLINE)
+# include <readline/readline.h>
+# include "bashline.h"
+#endif
+
#include <tilde/tilde.h>
#include <glob/strmatch.h>
extern int patch_level, build_version;
extern int shell_level;
extern int subshell_environment;
+extern int running_in_background;
extern int last_command_exit_value;
extern int line_number;
extern int expand_aliases;
shell exits. */
int hup_on_exit = 0;
+/* Non-zero means to list status of running and stopped jobs at shell exit */
+int check_jobs_at_exit = 0;
+
+/* Non-zero means to change to a directory name supplied as a command name */
+int autocd = 0;
+
/* Tells what state the shell was in when it started:
0 = non-interactive shell script
1 = interactive
This is a superset of the information provided by interactive_shell.
*/
int startup_state = 0;
+int reading_shell_script = 0;
/* Special debugging helper. */
int debugging_login_shell = 0;
/* Are we running in an emacs shell window? */
int running_under_emacs;
+/* Do we have /dev/fd? */
+#ifdef HAVE_DEV_FD
+int have_devfd = HAVE_DEV_FD;
+#else
+int have_devfd = 0;
+#endif
+
/* The name of the .(shell)rc file. */
-static char *bashrc_file = "~/.bashrc";
+static char *bashrc_file = DEFAULT_BASHRC;
/* Non-zero means to act more like the Bourne shell on startup. */
static int act_like_sh;
static int want_initial_help; /* --help option */
int debugging_mode = 0; /* In debugging mode with --debugger */
-int no_line_editing = 0; /* Don't do fancy line editing. */
+#if defined (READLINE)
+int no_line_editing = 0; /* non-zero -> don't do fancy line editing. */
+#else
+int no_line_editing = 1; /* can't have line editing without readline */
+#endif
int dump_translatable_strings; /* Dump strings in $"...", don't execute. */
int dump_po_strings; /* Dump strings in $"..." in po format */
int wordexp_only = 0; /* Do word expansion only */
int posixly_correct = 0; /* Non-zero means posix.2 superset. */
#endif
-
/* Some long-winded argument names. These are obviously new. */
#define Int 1
#define Charp 2
-struct {
- char *name;
+static const struct {
+ const char *name;
int type;
int *int_value;
char **char_value;
{ "noprofile", Int, &no_profile, (char **)0x0 },
{ "norc", Int, &no_rc, (char **)0x0 },
{ "posix", Int, &posixly_correct, (char **)0x0 },
+#if defined (WORDEXP_OPTION)
{ "protected", Int, &protected_mode, (char **)0x0 },
+#endif
{ "rcfile", Charp, (int *)0x0, &bashrc_file },
#if defined (RESTRICTED_SHELL)
{ "restricted", Int, &restricted, (char **)0x0 },
#endif
- { "verbose", Int, &echo_input_at_read, (char **)0x0 },
+ { "verbose", Int, &verbose_flag, (char **)0x0 },
{ "version", Int, &do_version, (char **)0x0 },
+#if defined (WORDEXP_OPTION)
{ "wordexp", Int, &wordexp_only, (char **)0x0 },
+#endif
{ (char *)0x0, Int, (int *)0x0, (char **)0x0 }
};
char **subshell_argv;
char **subshell_envp;
+char *exec_argv0;
+
#if defined (BUFFERED_INPUT)
/* The file descriptor from which the shell is reading input. */
int default_buffered_input = -1;
static int open_shell_script __P((char *));
static void set_bash_input __P((void));
static int run_one_command __P((char *));
+#if defined (WORDEXP_OPTION)
static int run_wordexp __P((char *));
+#endif
static int uidget __P((void));
static void init_interactive __P((void));
static void init_noninteractive __P((void));
+static void init_interactive_script __P((void));
static void set_shell_name __P((char *));
static void shell_initialize __P((void));
#endif
/* Catch early SIGINTs. */
- code = setjmp (top_level);
+ code = setjmp_nosigs (top_level);
if (code)
exit (2);
+ xtrace_init ();
+
#if defined (USING_BASH_MALLOC) && defined (DEBUG) && !defined (DISABLE_MALLOC_WRAPPERS)
-# if 1
- malloc_set_register (1);
-# endif
+ malloc_set_register (1); /* XXX - change to 1 for malloc debugging */
#endif
check_dev_tty ();
mcheck (programming_error, (void (*) ())0);
#endif /* USE_GNU_MALLOC_LIBRARY */
- if (setjmp (subshell_top_level))
+ if (setjmp_sigs (subshell_top_level))
{
argc = subshell_argc;
argv = subshell_argv;
shell_name++;
shell_reinitialize ();
- if (setjmp (top_level))
+ if (setjmp_nosigs (top_level))
exit (2);
}
/* Find full word arguments first. */
arg_index = parse_long_options (argv, arg_index, argc);
-
+
if (want_initial_help)
{
show_shell_usage (stdout, 1);
exit (EXECUTION_SUCCESS);
}
+ echo_input_at_read = verbose_flag; /* --verbose given */
+
/* All done with full word options; do standard shell option parsing.*/
this_command_name = shell_name; /* for error reporting */
arg_index = parse_shell_options (argv, arg_index, argc);
login_shell = -login_shell;
}
- set_login_shell (login_shell != 0);
+ set_login_shell ("login_shell", login_shell != 0);
if (dump_po_strings)
dump_translatable_strings = 1;
}
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:
else
init_noninteractive ();
-#define CLOSE_FDS_AT_LOGIN
-#if defined (CLOSE_FDS_AT_LOGIN)
/*
* Some systems have the bad habit of starting login shells with lots of open
* file descriptors. For instance, most systems that have picked up the
* pre-4.0 Sun YP code leave a file descriptor open each time you call one
* of the getpw* functions, and it's set to be open across execs. That
- * means one for login, one for xterm, one for shelltool, etc.
+ * means one for login, one for xterm, one for shelltool, etc. There are
+ * also systems that open persistent FDs to other agents or files as part
+ * of process startup; these need to be set to be close-on-exec.
*/
if (login_shell && interactive_shell)
{
for (i = 3; i < 20; i++)
- close (i);
+ SET_CLOSE_ON_EXEC (i);
}
-#endif /* CLOSE_FDS_AT_LOGIN */
/* If we're in a strict Posix.2 mode, turn on interactive comments,
alias expansion in non-interactive shells, and other Posix.2 things. */
set_default_lang ();
set_default_locale_vars ();
+ /*
+ * M-x term -> TERM=eterm-color INSIDE_EMACS='251,term:0.96' (eterm)
+ * M-x shell -> TERM='dumb' INSIDE_EMACS='25.1,comint' (no line editing)
+ *
+ * Older versions of Emacs may set EMACS to 't' or to something like
+ * '22.1 (term:0.96)' instead of (or in addition to) setting INSIDE_EMACS.
+ * They may set TERM to 'eterm' instead of 'eterm-color'. They may have
+ * a now-obsolete command that sets neither EMACS nor INSIDE_EMACS:
+ * M-x terminal -> TERM='emacs-em7955' (line editing)
+ */
if (interactive_shell)
{
- char *term, *emacs;
+ char *term, *emacs, *inside_emacs;;
+ int emacs_term, in_emacs;
term = get_string_value ("TERM");
- no_line_editing |= term && (STREQ (term, "emacs"));
emacs = get_string_value ("EMACS");
- running_under_emacs = emacs ? ((strstr (emacs, "term") != 0) ? 2 : 1) : 0;
-#if 0
- no_line_editing |= emacs && emacs[0] == 't' && emacs[1] == '\0';
-#else
- no_line_editing |= emacs && emacs[0] == 't' && emacs[1] == '\0' && STREQ (term, "dumb");
-#endif
+ inside_emacs = get_string_value ("INSIDE_EMACS");
+
+ if (inside_emacs)
+ {
+ emacs_term = strstr (inside_emacs, ",term:") != 0;
+ in_emacs = 1;
+ }
+ else if (emacs)
+ {
+ /* Infer whether we are in an older Emacs. */
+ emacs_term = strstr (emacs, " (term:") != 0;
+ in_emacs = emacs_term || STREQ (emacs, "t");
+ }
+ else
+ in_emacs = emacs_term = 0;
+
+ /* Not sure any emacs terminal emulator sets TERM=emacs any more */
+ no_line_editing |= STREQ (term, "emacs");
+ no_line_editing |= in_emacs && STREQ (term, "dumb");
+
+ /* running_under_emacs == 2 for `eterm' */
+ running_under_emacs = in_emacs || STREQN (term, "emacs", 5);
+ running_under_emacs += emacs_term && STREQN (term, "eterm", 5);
+
if (running_under_emacs)
gnu_error_format = 1;
}
/* Give this shell a place to longjmp to before executing the
startup files. This allows users to press C-c to abort the
lengthy startup. */
- code = setjmp (top_level);
+ code = setjmp_sigs (top_level);
if (code)
{
if (code == EXITPROG || code == ERREXIT)
maybe_make_restricted (shell_name);
#endif /* RESTRICTED_SHELL */
+#if defined (WORDEXP_OPTION)
if (wordexp_only)
{
startup_state = 3;
last_command_exit_value = run_wordexp (argv[arg_index]);
exit_shell (last_command_exit_value);
}
+#endif
+
+ cmd_init (); /* initialize the command object caches */
+ uwp_init ();
if (command_execution_string)
{
arg_index++;
}
else if (interactive == 0)
- /* In this mode, bash is reading a script from stdin, which is a
- pipe or redirected file. */
+ {
+ /* In this mode, bash is reading a script from stdin, which is a
+ pipe or redirected file. */
#if defined (BUFFERED_INPUT)
- default_buffered_input = fileno (stdin); /* == 0 */
+ default_buffered_input = fileno (stdin); /* == 0 */
#else
- setbuf (default_input, (char *)NULL);
+ setbuf (default_input, (char *)NULL);
#endif /* !BUFFERED_INPUT */
+ read_from_stdin = 1;
+ }
+ else if (arg_index == argc)
+ /* "If there are no operands and the -c option is not specified, the -s
+ option shall be assumed." */
+ read_from_stdin = 1;
set_bash_input ();
/* Bind remaining args to $1 ... $n */
arg_index = bind_args (argv, arg_index, argc, 1);
- if (debugging_mode && locally_skip_execution == 0 && running_setuid == 0)
+ if (debugging_mode && locally_skip_execution == 0 && running_setuid == 0 && (reading_shell_script || interactive_shell == 0))
start_debugger ();
/* Do the things that should be done only for interactive shells. */
if (interactive_shell)
{
/* Set up for checking for presence of mail. */
- remember_mail_dates ();
reset_mail_timer ();
+ init_mail_dates ();
#if defined (HISTORY)
/* Initialize the interactive history stuff. */
exit_shell (s)
int s;
{
+ fflush (stdout); /* XXX */
+ fflush (stderr);
+
+ /* Clean up the terminal if we are in a state where it's been modified. */
+#if defined (READLINE)
+ if (RL_ISSTATE (RL_STATE_TERMPREPPED) && rl_deprep_term_function)
+ (*rl_deprep_term_function) ();
+#endif
+ if (read_tty_modified ())
+ read_tty_cleanup ();
+
/* Do trap[0] if defined. Allow it to override the exit status
passed to us. */
if (signal_is_trapped (0))
#endif /* PROCESS_SUBSTITUTION */
#if defined (HISTORY)
- if (interactive_shell)
+ if (remember_on_history)
maybe_save_shell_history ();
#endif /* HISTORY */
+#if defined (COPROCESS_SUPPORT)
+ coproc_flush ();
+#endif
+
#if defined (JOB_CONTROL)
/* If the user has run `shopt -s huponexit', hangup all jobs when we exit
an interactive login shell. ksh does this unconditionally. */
if (interactive_shell && login_shell && hup_on_exit)
hangup_all_jobs ();
- /* If this shell is interactive, terminate all stopped jobs and
- restore the original terminal process group. Don't do this if we're
- in a subshell and calling exit_shell after, for example, a failed
- word expansion. */
+ /* If this shell is interactive, or job control is active, terminate all
+ stopped jobs and restore the original terminal process group. Don't do
+ this if we're in a subshell and calling exit_shell after, for example,
+ a failed word expansion. We want to do this even if the shell is not
+ interactive because we set the terminal's process group when job control
+ is enabled regardless of the interactive status. */
if (subshell_environment == 0)
end_job_control ();
#endif /* JOB_CONTROL */
#if defined (MALLOC_DEBUG) && defined (USING_BASH_MALLOC)
if (malloc_trace_at_exit)
trace_malloc_stats (get_name_for_error (), (char *)NULL);
+ /* mlocation_write_table (); */
#endif
exit (s);
}
+/* Exit a subshell, which includes calling the exit trap. We don't want to
+ do any more cleanup, since a subshell is created as an exact copy of its
+ parent. */
+void
+subshell_exit (s)
+ int s;
+{
+ fflush (stdout);
+ fflush (stderr);
+
+ /* Do trap[0] if defined. Allow it to override the exit status
+ passed to us. */
+ if (signal_is_trapped (0))
+ s = run_exit_trap ();
+
+ sh_exit (s);
+}
+
/* Source the bash startup files. If POSIXLY_CORRECT is non-zero, we obey
the Posix.2 startup file rules: $ENV is expanded, and if the file it
names exists, that file is sourced. The Posix.2 rules are in effect
void
disable_priv_mode ()
{
- setuid (current_user.uid);
- setgid (current_user.gid);
+ int e;
+
+ if (setuid (current_user.uid) < 0)
+ {
+ e = errno;
+ sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid);
+#if defined (EXIT_ON_SETUID_FAILURE)
+ if (e == EAGAIN)
+ exit (e);
+#endif
+ }
+ if (setgid (current_user.gid) < 0)
+ sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid);
+
current_user.euid = current_user.uid;
current_user.egid = current_user.gid;
}
+#if defined (WORDEXP_OPTION)
static int
run_wordexp (words)
char *words;
int code, nw, nb;
WORD_LIST *wl, *tl, *result;
- code = setjmp (top_level);
+ code = setjmp_nosigs (top_level);
if (code != NOT_JUMPED)
{
switch (code)
{
- /* Some kind of throw to top_level has occured. */
+ /* Some kind of throw to top_level has occurred. */
case FORCE_EOF:
return last_command_exit_value = 127;
case ERREXIT:
return (0);
}
+#endif
#if defined (ONESHOT)
/* Run one command, given as the argument to the -c option. Tell
{
int code;
- code = setjmp (top_level);
+ code = setjmp_nosigs (top_level);
if (code != NOT_JUMPED)
{
#endif /* PROCESS_SUBSTITUTION */
switch (code)
{
- /* Some kind of throw to top_level has occured. */
+ /* Some kind of throw to top_level has occurred. */
case FORCE_EOF:
return last_command_exit_value = 127;
case ERREXIT:
{
#if defined (DEBUGGER) && defined (DEBUGGER_START_FILE)
int old_errexit;
+ int r;
old_errexit = exit_immediately_on_error;
exit_immediately_on_error = 0;
- maybe_execute_file (DEBUGGER_START_FILE, 1);
- function_trace_mode = 1;
+ r = force_execute_file (DEBUGGER_START_FILE, 1);
+ if (r < 0)
+ {
+ internal_warning (_("cannot start debugger; debugging mode disabled"));
+ debugging_mode = 0;
+ }
+ error_trace_mode = function_trace_mode = debugging_mode;
+
+ set_shellopts ();
+ set_bashopts ();
exit_immediately_on_error += old_errexit;
#endif
{
e = errno;
file_error (filename);
- exit ((e == ENOENT) ? EX_NOTFOUND : EX_NOINPUT);
+ sh_exit ((e == ENOENT) ? EX_NOTFOUND : EX_NOINPUT);
}
free (dollar_vars[0]);
- dollar_vars[0] = savestring (script_name);
+ 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)
+ errno = EISDIR;
+#else
+ errno = EINVAL;
+#endif
+ file_error (filename);
+ sh_exit (EX_NOINPUT);
+ }
#if defined (ARRAY_VARS)
GET_ARRAY_FROM_VAR ("FUNCNAME", funcname_v, funcname_a);
{
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;
}
else if (sample_len > 0 && (check_binary_file (sample, sample_len)))
{
- internal_error ("%s: cannot execute binary file", filename);
+ internal_error (_("%s: cannot execute binary file"), filename);
exit (EX_BINARY_FILE);
}
/* Now rewind the file back to the beginning. */
/* Open the script. But try to move the file descriptor to a randomly
large one, in the hopes that any descriptors used by the script will
not match with ours. */
- fd = move_to_high_fd (fd, 0, -1);
-
-#if defined (__CYGWIN__) && defined (O_TEXT)
- setmode (fd, O_TEXT);
-#endif
+ fd = move_to_high_fd (fd, 1, -1);
#if defined (BUFFERED_INPUT)
default_buffered_input = fd;
/* But if a script is called with something like `bash -i scriptname',
we need to do a non-interactive setup here, since we didn't do it
before. */
- init_noninteractive ();
+ init_interactive_script ();
free (filename);
+
+ reading_shell_script = 1;
return (fd);
}
{
close_buffered_fd (default_buffered_input);
default_buffered_input = bash_input.location.buffered_fd = -1;
+ bash_input.type = st_none; /* XXX */
}
#else /* !BUFFERED_INPUT */
if (default_input)
{
if (*shell_name == '-')
shell_name++;
- login_shell++;
+ login_shell = 1;
}
if (shell_name[0] == 's' && shell_name[1] == 'h' && shell_name[2] == '\0')
static void
init_interactive ()
{
- interactive_shell = startup_state = interactive = 1;
- expand_aliases = 1;
+ expand_aliases = interactive_shell = startup_state = 1;
+ interactive = 1;
+#if defined (HISTORY)
+ remember_on_history = enable_history_list = 1; /* XXX */
+#endif
}
static void
expand_aliases = posixly_correct; /* XXX - was 0 not posixly_correct */
no_line_editing = 1;
#if defined (JOB_CONTROL)
- set_job_control (0);
+ /* Even if the shell is not interactive, enable job control if the -i or
+ -m option is supplied at startup. */
+ set_job_control (forced_interactive||jobs_m_flag);
#endif /* JOB_CONTROL */
}
+static void
+init_interactive_script ()
+{
+ init_noninteractive ();
+ expand_aliases = interactive_shell = startup_state = 1;
+#if defined (HISTORY)
+ remember_on_history = enable_history_list = 1; /* XXX */
+#endif
+}
+
void
get_current_user_info ()
{
/* Don't fetch this more than once. */
if (current_user.user_name == 0)
{
+#if defined (__TANDEM)
+ entry = getpwnam (getlogin ());
+#else
entry = getpwuid (current_user.uid);
+#endif
if (entry)
{
current_user.user_name = savestring (entry->pw_name);
current_user.shell = savestring ("/bin/sh");
current_user.home_dir = savestring ("/");
}
+#if defined (HAVE_GETPWENT)
endpwent ();
+#endif
}
}
shell_initialize ()
{
char hostname[256];
+ int should_be_restricted;
/* Line buffer output for stderr and stdout. */
if (shell_initialized == 0)
/* Initialize our interface to the tilde expander. */
tilde_initialize ();
+#if defined (RESTRICTED_SHELL)
+ should_be_restricted = shell_is_restricted (shell_name);
+#endif
+
/* Initialize internal and environment variables. Don't import shell
functions from the environment if we are running in privileged or
restricted mode or if the shell is running setuid. */
#if defined (RESTRICTED_SHELL)
- initialize_shell_variables (shell_environment, privileged_mode||restricted||running_setuid);
+ initialize_shell_variables (shell_environment, privileged_mode||restricted||should_be_restricted||running_setuid);
#else
initialize_shell_variables (shell_environment, privileged_mode||running_setuid);
#endif
/* Initialize the data structures for storing and running jobs. */
- initialize_job_control (0);
+ initialize_job_control (jobs_m_flag);
/* Initialize input streams to null. */
initialize_bash_input ();
initialize_flags ();
/* Initialize the shell options. Don't import the shell options
- from the environment variable $SHELLOPTS if we are running in
- privileged or restricted mode or if the shell is running setuid. */
+ from the environment variables $SHELLOPTS or $BASHOPTS if we are
+ running in privileged or restricted mode or if the shell is running
+ setuid. */
#if defined (RESTRICTED_SHELL)
- initialize_shell_options (privileged_mode||restricted||running_setuid);
+ initialize_shell_options (privileged_mode||restricted||should_be_restricted||running_setuid);
+ initialize_bashopts (privileged_mode||restricted||should_be_restricted||running_setuid);
#else
initialize_shell_options (privileged_mode||running_setuid);
+ initialize_bashopts (privileged_mode||running_setuid);
#endif
}
/* Things that get 0. */
login_shell = make_login_shell = interactive = executing = 0;
debugging = do_version = line_number = last_command_exit_value = 0;
- forced_interactive = interactive_shell = subshell_environment = 0;
+ forced_interactive = interactive_shell = 0;
+ subshell_environment = running_in_background = 0;
expand_aliases = 0;
+ /* XXX - should we set jobs_m_flag to 0 here? */
+
#if defined (HISTORY)
- bash_history_reinit (0);
+ bash_history_reinit (enable_history_list = 0);
#endif /* HISTORY */
#if defined (RESTRICTED_SHELL)
/* Ensure that the default startup file is used. (Except that we don't
execute this file for reinitialized shells). */
- bashrc_file = "~/.bashrc";
+ bashrc_file = DEFAULT_BASHRC;
/* Delete all variables and functions. They will be reinitialized when
the environment is parsed. */
delete_all_contexts (shell_variables);
delete_all_variables (shell_functions);
+ reinit_special_variables ();
+
+#if defined (READLINE)
+ bashline_reinitialize ();
+#endif
+
shell_reinitialized = 1;
}
char *set_opts, *s, *t;
if (extra)
- fprintf (fp, "GNU bash, version %s-(%s)\n", shell_version_string (), MACHTYPE);
+ fprintf (fp, _("GNU bash, version %s-(%s)\n"), shell_version_string (), MACHTYPE);
fprintf (fp, _("Usage:\t%s [GNU long option] [option] ...\n\t%s [GNU long option] [option] script-file ...\n"),
shell_name, shell_name);
fputs (_("GNU long options:\n"), fp);
fprintf (fp, "\t--%s\n", long_args[i].name);
fputs (_("Shell options:\n"), fp);
- fputs (_("\t-irsD or -c command or -O shopt_option\t\t(invocation only)\n"), fp);
+ fputs (_("\t-ilrsD or -c command or -O shopt_option\t\t(invocation only)\n"), fp);
for (i = 0, set_opts = 0; shell_builtins[i].name; i++)
if (STREQ (shell_builtins[i].name, "set"))
set_opts = savestring (shell_builtins[i].short_doc);
if (set_opts)
{
- s = xstrchr (set_opts, '[');
+ s = strchr (set_opts, '[');
if (s == 0)
s = set_opts;
while (*++s == '-')
;
- t = xstrchr (s, ']');
+ t = strchr (s, ']');
if (t)
*t = '\0';
fprintf (fp, _("\t-%s or -o option\n"), s);
fprintf (fp, _("Type `%s -c \"help set\"' for more information about shell options.\n"), shell_name);
fprintf (fp, _("Type `%s -c help' for more information about shell builtin commands.\n"), shell_name);
fprintf (fp, _("Use the `bashbug' command to report bugs.\n"));
+ fprintf (fp, "\n");
+ fprintf (fp, _("bash home page: <http://www.gnu.org/software/bash>\n"));
+ fprintf (fp, _("General help using GNU software: <http://www.gnu.org/gethelp/>\n"));
}
}
projects / thirdparty / bash.git / blobdiff