next set of documentation updates (job control); fix read timeout problem; fix bash-source-fullpath default; brace expansion integer overflow fix; fix for help output for loadable builtins

builtins/Makefile.in

@@ -77,6 +77,9 @@ BASHINCDIR = ${topdir}/include
 
 RL_INCLUDEDIR = @RL_INCLUDEDIR@
 
+HIST_LIBSRC = ${topdir}/lib/readline
+RL_LIBSRC = ${topdir}/lib/readline
+
 INTL_LIBSRC = ${topdir}/lib/intl
 INTL_BUILDDIR = ${LIBBUILD}/intl
 INTL_LIBDIR = ${INTL_BUILDDIR}
@@ -683,7 +686,34 @@ mapfile.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
 mapfile.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/variables.h $(topdir)/conftypes.h
 mapfile.o: $(topdir)/arrayfunc.h ../pathnames.h
 
-#bind.o: $(RL_LIBSRC)chardefs.h $(RL_LIBSRC)readline.h $(RL_LIBSRC)keymaps.h
+bind.o: $(RL_LIBSRC)/rlconf.h
+bind.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/rlstdc.h
+bind.o: $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h
+bind.o: $(RL_LIBSRC)/rltypedefs.h ${RL_LIBSRC}/rlmbutil.h
+complete.o: $(RL_LIBSRC)/rlconf.h
+complete.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/rlstdc.h
+complete.o: $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h
+complete.o: $(RL_LIBSRC)/rltypedefs.h ${RL_LIBSRC}/rlmbutil.h
+history.o: $(RL_LIBSRC)/rlconf.h
+history.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/rlstdc.h
+history.o: $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h
+history.o: $(RL_LIBSRC)/rltypedefs.h ${RL_LIBSRC}/rlmbutil.h
+read.o: $(RL_LIBSRC)/rlconf.h
+read.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/rlstdc.h
+read.o: $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h
+read.o: $(RL_LIBSRC)/rltypedefs.h ${RL_LIBSRC}/rlmbutil.h
+set.o: $(RL_LIBSRC)/rlconf.h
+set.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/rlstdc.h
+set.o: $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h
+set.o: $(RL_LIBSRC)/rltypedefs.h ${RL_LIBSRC}/rlmbutil.h
+
+common.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h
+evalfile.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h
+evalstring.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h
+bind.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h
+fc.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h
+history.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h
+shopt.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h
 
 # libintl dependencies
 bind.o: ${topdir}/bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

builtins/help.def

@@ -265,12 +265,10 @@ show_desc (char *name, int i)
     line = doc ? doc[0] : (char *)NULL;
 
   printf ("%s - ", name);
-  for (j = 0; line && line[j]; j++)
-    {
-      putchar (line[j]);
-      if (line[j] == '\n')
-	break;
-    }
+  /* Don't assume LINE ends with a newline. */
+  for (j = 0; line && line[j] && line[j] != '\n'; j++)
+    putchar (line[j]);
+  putchar ('\n');
   
   fflush (stdout);
 

builtins/read.def

@@ -843,7 +843,6 @@ read_builtin (WORD_LIST *list)
 
 add_char:
       input_string[i++] = c;
-      check_read_timeout ();
 
 #if defined (HANDLE_MULTIBYTE)
       /* XXX - what if C == 127? Can DEL introduce a multibyte sequence? */
@@ -878,6 +877,8 @@ add_char:
 
       if (nchars > 0 && nr >= nchars)
 	break;
+
+      check_read_timeout ();
     }
   /* Back up over trailing CTLESC if the input ends with an unescaped
      backslash */
@@ -891,7 +892,10 @@ add_char:
     saw_escape = 0;		/* Avoid dequoting bare CTLNUL */
 
   input_string[i] = '\0';
-  check_read_timeout ();
+  /* Don't check the timeout unless we didn't read anything and zread returned
+     EOF or error. */
+  if (i == 0 && retval <= 0)
+    check_read_timeout ();
 
 #if defined (READLINE)
   if (edit)

builtins/shopt.def

@@ -376,10 +376,10 @@ reset_shopt_options (void)
   glob_ignore_case = match_ignore_case = 0;
   print_shift_error = 0;
   source_uses_path = promptvars = 1;
-  bash_source_fullpath = 0;
   varassign_redir_autoclose = 0;
   singlequote_translations = 0;
   patsub_replacement = PATSUB_REPLACE_DEFAULT;
+  bash_source_fullpath = BASH_SOURCE_FULLPATH_DEFAULT;
 
 #if defined (JOB_CONTROL)
   check_jobs_at_exit = 0;