commit bash-20170505 snapshot

builtins/builtin.def

@@ -1,7 +1,7 @@
 This file is builtin.def, from which is created builtin.c.
 It implements the builtin "builtin" in Bash.
 
-Copyright (C) 1987-2009 Free Software Foundation, Inc.
+Copyright (C) 1987-2017 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -70,7 +70,7 @@ builtin_builtin (list)
   function = find_shell_builtin (command);
 #endif /* !DISABLED_BUILTINS */
 
-  if (!function)
+  if (function == 0)
     {
       sh_notbuiltin (command);
       return (EXECUTION_FAILURE);
@@ -78,6 +78,7 @@ builtin_builtin (list)
   else
     {
       this_command_name = command;
+      this_shell_builtin = function;	/* overwrite "builtin" as this builtin */
       list = list->next;
       return ((*function) (list));
     }

builtins/read.def

@@ -627,7 +627,8 @@ read_builtin (list)
 	  pass_next = 0;
 	  if (c == '\n')
 	    {
-	      i--;		/* back up over the CTLESC */
+	      if (skip_ctlesc == 0 && i > 0)
+		i--;		/* back up over the CTLESC */
 	      if (interactive && input_is_tty && raw == 0)
 		print_ps2 = 1;
 	    }