commit d166f048818e10cf3799aa24a174fb22835f1acc
author Jari Aalto <jari.aalto@cante.net> Thu Jun 05 14:59:13 1997 +0000
committer Jari Aalto <jari.aalto@cante.net> Sat Sep 12 16:46:50 2009 +0000
tree 1ca27f9243900f8b236d0cde6a3862002aea9e19
parent ccc6cda312fea9f0468ee65b8f368e9653e1380b

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

builtins/exec.def

diff --git a/builtins/exec.def b/builtins/exec.def
index c14af75..cc7f5a9 100644
--- a/builtins/exec.def
+++ b/builtins/exec.def
@@ -36,7 +36,7 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include "../bashtypes.h"
 #include "../posixstat.h"
 #include <signal.h>
 #include <errno.h>
@@ -65,7 +65,7 @@
 extern int errno;
 #endif /* !errno */
 
-extern int interactive, subshell_environment;
+extern int interactive, interactive_shell, subshell_environment;
 extern REDIRECT *redirection_undo_list;
 
 int no_exit_on_failed_exec;
@@ -90,7 +90,7 @@
 {
   int exit_value = EXECUTION_FAILURE;
   int cleanenv, login, opt;
-  char *argv0, *command, **args, **env, *newname;
+  char *argv0, *command, **args, **env, *newname, *com2;
 
   cleanenv = login = 0;
   argv0 = (char *)NULL;
@@ -143,7 +143,13 @@
       goto failed_exec;
     }
 
-  command = full_pathname (command);
+  com2 = full_pathname (command);
+  if (com2)
+    {
+      if (command != args[0])
+	free (command);
+      command = com2;
+    }
 
   if (argv0)
     {
@@ -172,7 +178,8 @@
     }
 
 #if defined (HISTORY)
-  maybe_save_shell_history ();
+  if (interactive_shell && subshell_environment == 0)
+    maybe_save_shell_history ();
 #endif /* HISTORY */
 
   restore_original_signals ();
@@ -201,6 +208,9 @@
   if (subshell_environment || (interactive == 0 && no_exit_on_failed_exec == 0))
     exit_shell (exit_value);
 
+  if (args)
+    free_array (args);
+
   initialize_traps ();
   reinitialize_signals ();