commit bash-20080925 snapshot

builtins/bind.def

@@ -116,8 +116,12 @@ bind_builtin (list)
 
   if (no_line_editing)
     {
-      builtin_error ("line editing not enabled");
+#if 0
+      builtin_error (_("line editing not enabled"));
       return (EXECUTION_FAILURE);
+#else
+      builtin_warning (_("line editing not enabled"));
+#endif
     }
 
   kmap = saved_keymap = (Keymap) NULL;
@@ -125,7 +129,7 @@ bind_builtin (list)
   initfile = map_name = fun_name = unbind_name = remove_seq = (char *)NULL;
   return_code = EXECUTION_SUCCESS;
 
-  if (!bash_readline_initialized)
+  if (bash_readline_initialized == 0)
     initialize_readline ();
 
   begin_unwind_frame ("bind_builtin");

builtins/common.c

@@ -88,16 +88,10 @@ sh_builtin_func_t *this_shell_builtin = (sh_builtin_func_t *)NULL;
 /* This is a lot like report_error (), but it is for shell builtins
    instead of shell control structures, and it won't ever exit the
    shell. */
-void
-#if defined (PREFER_STDARG)
-builtin_error (const char *format, ...)
-#else
-builtin_error (format, va_alist)
-     const char *format;
-     va_dcl
-#endif
+
+static void
+builtin_error_prolog ()
 {
-  va_list args;
   char *name;
 
   name = get_name_for_error ();
@@ -108,6 +102,41 @@ builtin_error (format, va_alist)
 
   if (this_command_name && *this_command_name)
     fprintf (stderr, "%s: ", this_command_name);
+}
+
+void
+#if defined (PREFER_STDARG)
+builtin_error (const char *format, ...)
+#else
+builtin_error (format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+
+  builtin_error_prolog ();
+
+  SH_VA_START (args, format);
+
+  vfprintf (stderr, format, args);
+  va_end (args);
+  fprintf (stderr, "\n");
+}
+
+void
+#if defined (PREFER_STDARG)
+builtin_warning (const char *format, ...)
+#else
+builtin_warning (format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+
+  builtin_error_prolog ();
+  fprintf (stderr, _("warning: "));
 
   SH_VA_START (args, format);
 

builtins/common.h

@@ -59,6 +59,7 @@
 
 /* Functions from common.c */
 extern void builtin_error __P((const char *, ...))  __attribute__((__format__ (printf, 1, 2)));
+extern void builtin_warning __P((const char *, ...))  __attribute__((__format__ (printf, 1, 2)));
 extern void builtin_usage __P((void));
 extern void no_args __P((WORD_LIST *));
 extern int no_options __P((WORD_LIST *));