Bash-4.4 patch 5

diff --git a/builtins/evalstring.c b/builtins/evalstring.c
index e22159144c91c3ec61ce2b9afeee7c8ab384e042..6dc756c276e5cdc9b047b34fba5324cd35848999 100644 (file)
--- a/builtins/evalstring.c
+++ b/builtins/evalstring.c
@@ -104,12 +104,9 @@ should_suppress_fork (command)
          running_trap == 0 &&
          *bash_input.location.string == '\0' &&
          command->type == cm_simple &&
-#if 0
          signal_is_trapped (EXIT_TRAP) == 0 &&
          signal_is_trapped (ERROR_TRAP) == 0 &&
-#else
          any_signals_trapped () < 0 &&
-#endif
          command->redirects == 0 && command->value.Simple->redirects == 0 &&
          ((command->flags & CMD_TIME_PIPELINE) == 0) &&
          ((command->flags & CMD_INVERT_RETURN) == 0));

diff --git a/patchlevel.h b/patchlevel.h
index c059f0bd769b78ddf0bf0c5c1394e2ec8858d067..1bc098b84f43c98059b287b9d16049ec84a76278 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 4
+#define PATCHLEVEL 5
 
 #endif /* _PATCHLEVEL_H_ */