commit 0628567a28f3510f506ae46cb9b24b73a6d2dc5d
author Jari Aalto <jari.aalto@cante.net> Tue Oct 10 14:15:34 2006 +0000
committer Jari Aalto <jari.aalto@cante.net> Sat Sep 12 16:46:58 2009 +0000
tree da84934c41272cdc655694846c15c1c5db807445
parent 95732b497d12c98613bb3c5db16b61f377501a59

Imported from ../bash-3.2.tar.gz.

shell.c

diff --git a/shell.c b/shell.c
index 6d07c78..6693f85 100644
--- a/shell.c
+++ b/shell.c
@@ -532,6 +532,7 @@
      Variables from the environment are expected to be set, etc. */
   shell_initialize ();
 
+  set_default_lang ();
   set_default_locale_vars ();
 
   if (interactive_shell)
@@ -1208,7 +1209,7 @@
       wl = global_command->value.Simple->words;
       if (protected_mode)
 	for (tl = wl; tl; tl = tl->next)
-	  tl->word->flags |= W_NOCOMSUB;
+	  tl->word->flags |= W_NOCOMSUB|W_NOPROCSUB;
       result = wl ? expand_words_no_vars (wl) : (WORD_LIST *)0;
     }
   else
@@ -1533,9 +1534,10 @@
      any startup files; just try to be more like /bin/sh. */
   shell_name = argv0 ? base_pathname (argv0) : PROGRAM;
 
-  if (*shell_name == '-')
+  if (argv0 && *argv0 == '-')
     {
-      shell_name++;
+      if (*shell_name == '-')
+	shell_name++;
       login_shell++;
     }