mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-06-30 17:09:50 +02:00
commit bash-20070329 snapshot
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* expr.c -- arithmetic expression evaluation. */
|
||||
|
||||
/* Copyright (C) 1990-2004 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1990-2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Bash, the Bourne Again SHell.
|
||||
|
||||
@@ -153,7 +153,7 @@ static void readtok __P((void)); /* lexical analyzer */
|
||||
|
||||
static intmax_t expr_streval __P((char *, int));
|
||||
static intmax_t strlong __P((char *));
|
||||
static void evalerror __P((char *));
|
||||
static void evalerror __P((const char *));
|
||||
|
||||
static void pushexp __P((void));
|
||||
static void popexp __P((void));
|
||||
@@ -205,7 +205,7 @@ extern char *this_command_name;
|
||||
extern int unbound_vars_is_error;
|
||||
|
||||
#if defined (ARRAY_VARS)
|
||||
extern char *bash_badsub_errmsg;
|
||||
extern const char * const bash_badsub_errmsg;
|
||||
#endif
|
||||
|
||||
#define SAVETOK(X) \
|
||||
@@ -1187,14 +1187,14 @@ readtok ()
|
||||
|
||||
static void
|
||||
evalerror (msg)
|
||||
char *msg;
|
||||
const char *msg;
|
||||
{
|
||||
char *name, *t;
|
||||
|
||||
name = this_command_name;
|
||||
for (t = expression; whitespace (*t); t++)
|
||||
;
|
||||
internal_error ("%s%s%s: %s (error token is \"%s\")",
|
||||
internal_error (_("%s%s%s: %s (error token is \"%s\")"),
|
||||
name ? name : "", name ? ": " : "", t,
|
||||
msg, (lasttp && *lasttp) ? lasttp : "");
|
||||
longjmp (evalbuf, 1);
|
||||
@@ -1321,7 +1321,7 @@ main (argc, argv)
|
||||
{
|
||||
v = evalexp (argv[i], &expok);
|
||||
if (expok == 0)
|
||||
fprintf (stderr, "%s: expression error\n", argv[i]);
|
||||
fprintf (stderr, _("%s: expression error\n"), argv[i]);
|
||||
else
|
||||
printf ("'%s' -> %ld\n", argv[i], v);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user