/* error.c -- Functions for handling errors. */
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+
+/* Copyright (C) 1993-2009 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
- Bash is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 2, or (at your option) any later
- version.
+ Bash is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bash is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
+ Bash is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with Bash; see the file COPYING. If not, write to the Free Software
- Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+ You should have received a copy of the GNU General Public License
+ along with Bash. If not, see <http://www.gnu.org/licenses/>.
+*/
#include "config.h"
#endif /* !errno */
#include "bashansi.h"
+#include "bashintl.h"
+
+#include "shell.h"
+#include "execute_cmd.h"
#include "flags.h"
-#include "error.h"
-#include "command.h"
-#include "general.h"
-#include "externs.h"
#include "input.h"
#if defined (HISTORY)
extern int executing_line_number __P((void));
-extern int interactive_shell, interactive, startup_state;
-extern char *dollar_vars[];
-extern char *shell_name;
#if defined (JOB_CONTROL)
extern pid_t shell_pgrp;
extern int give_terminal_to __P((pid_t, int));
#endif /* JOB_CONTROL */
+#if defined (ARRAY_VARS)
+extern const char * const bash_badsub_errmsg;
+#endif
+
static void error_prolog __P((int));
/* The current maintainer of the shell. You change this in the
#define MAINTAINER "bash-maintainers@gnu.org"
#endif
-char *the_current_maintainer = MAINTAINER;
+const char * const the_current_maintainer = MAINTAINER;
+
+int gnu_error_format = 0;
static void
error_prolog (print_lineno)
int print_lineno;
{
+ char *ename;
int line;
- fprintf (stderr, "%s: ", get_name_for_error ());
+ ename = get_name_for_error ();
+ line = (print_lineno && interactive_shell == 0) ? executing_line_number () : -1;
- if (print_lineno && interactive_shell == 0)
- {
- line = executing_line_number ();
- if (line > 0)
- fprintf (stderr, "line %d: ", line);
- }
+ if (line > 0)
+ fprintf (stderr, "%s:%s%d: ", ename, gnu_error_format ? "" : _(" line "), line);
+ else
+ fprintf (stderr, "%s: ", ename);
}
/* Return the name of the shell or the shell script for error reporting. */
get_name_for_error ()
{
char *name;
+#if defined (ARRAY_VARS)
+ SHELL_VAR *bash_source_v;
+ ARRAY *bash_source_a;
+#endif
name = (char *)NULL;
if (interactive_shell == 0)
- name = dollar_vars[0];
+ {
+#if defined (ARRAY_VARS)
+ bash_source_v = find_variable ("BASH_SOURCE");
+ if (bash_source_v && array_p (bash_source_v) &&
+ (bash_source_a = array_cell (bash_source_v)))
+ name = array_reference (bash_source_a, 0);
+ if (name == 0 || *name == '\0') /* XXX - was just name == 0 */
+#endif
+ name = dollar_vars[0];
+ }
if (name == 0 && shell_name && *shell_name)
name = base_pathname (shell_name);
if (name == 0)
if (remember_on_history)
{
h = last_history_line ();
- fprintf (stderr, "last command: %s\n", h ? h : "(null)");
+ fprintf (stderr, _("last command: %s\n"), h ? h : "(null)");
}
#endif
fprintf (stderr, "Report this to %s\n", the_current_maintainer);
#endif
- fprintf (stderr, "Stopping myself...");
+ fprintf (stderr, _("Aborting..."));
fflush (stderr);
abort ();
va_end (args);
if (exit_immediately_on_error)
- sh_exit (1);
+ {
+ if (last_command_exit_value == 0)
+ last_command_exit_value = 1;
+ exit_shell (last_command_exit_value);
+ }
}
void
{
va_list args;
- fprintf (stderr, "%s: warning: ", get_name_for_error ());
+ error_prolog (1);
+ fprintf (stderr, _("warning: "));
+
+ SH_VA_START (args, format);
+
+ vfprintf (stderr, format, args);
+ fprintf (stderr, "\n");
+
+ va_end (args);
+}
+
+void
+#if defined (PREFER_STDARG)
+internal_inform (const char *format, ...)
+#else
+internal_inform (format, va_alist)
+ const char *format;
+ va_dcl
+#endif
+{
+ va_list args;
+
+ error_prolog (1);
+ /* TRANSLATORS: this is a prefix for informational messages. */
+ fprintf (stderr, _("INFORM: "));
SH_VA_START (args, format);
if (interactive)
fprintf (stderr, "%s: ", ename);
else if (interactive_shell)
- fprintf (stderr, "%s: %s: line %d: ", ename, iname, lineno);
+ fprintf (stderr, "%s: %s:%s%d: ", ename, iname, gnu_error_format ? "" : _(" line "), lineno);
else if (STREQ (ename, iname))
- fprintf (stderr, "%s: line %d: ", ename, lineno);
+ fprintf (stderr, "%s:%s%d: ", ename, gnu_error_format ? "" : _(" line "), lineno);
else
- fprintf (stderr, "%s: %s: line %d: ", ename, iname, lineno);
+ fprintf (stderr, "%s: %s:%s%d: ", ename, iname, gnu_error_format ? "" : _(" line "), lineno);
SH_VA_START (args, format);
va_end (args);
if (exit_immediately_on_error)
- sh_exit (2);
+ exit_shell (last_command_exit_value = 2);
}
#ifdef DEBUG
+/* This assumes ASCII and is suitable only for debugging */
+char *
+strescape (str)
+ const char *str;
+{
+ char *r, *result;
+ unsigned char *s;
+
+ r = result = (char *)xmalloc (strlen (str) * 2 + 1);
+
+ for (s = (unsigned char *)str; s && *s; s++)
+ {
+ if (*s < ' ')
+ {
+ *r++ = '^';
+ *r++ = *s+64;
+ }
+ else if (*s == 127)
+ {
+ *r++ = '^';
+ *r++ = '?';
+ }
+ else
+ *r++ = *s;
+ }
+
+ *r = '\0';
+ return result;
+}
+
void
#if defined (PREFER_STDARG)
itrace (const char *format, ...)
/* **************************************************************** */
-static char *cmd_error_table[] = {
- "unknown command error", /* CMDERR_DEFAULT */
- "bad command type", /* CMDERR_BADTYPE */
- "bad connector", /* CMDERR_BADCONN */
- "bad jump", /* CMDERR_BADJUMP */
+static const char * const cmd_error_table[] = {
+ N_("unknown command error"), /* CMDERR_DEFAULT */
+ N_("bad command type"), /* CMDERR_BADTYPE */
+ N_("bad connector"), /* CMDERR_BADCONN */
+ N_("bad jump"), /* CMDERR_BADJUMP */
0
};
if (code > CMDERR_LAST)
code = CMDERR_DEFAULT;
- programming_error ("%s: %s: %d", func, cmd_error_table[code], e);
+ programming_error ("%s: %s: %d", func, _(cmd_error_table[code]), e);
}
char *
if (code > CMDERR_LAST)
code = CMDERR_DEFAULT;
- return (cmd_error_table[code]);
+ return (_(cmd_error_table[code]));
}
#ifdef ARRAY_VARS
err_badarraysub (s)
const char *s;
{
- report_error ("%s: bad array subscript", s);
+ report_error ("%s: %s", s, _(bash_badsub_errmsg));
}
#endif
err_unboundvar (s)
const char *s;
{
- report_error ("%s: unbound variable", s);
+ report_error (_("%s: unbound variable"), s);
}
void
err_readonly (s)
const char *s;
{
- report_error ("%s: readonly variable", s);
+ report_error (_("%s: readonly variable"), s);
}
projects / thirdparty / bash.git / blobdiff