mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
250 lines
6 KiB
C
250 lines
6 KiB
C
/* nls.c -- skeletal internationalization code. */
|
|
|
|
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Readline Library, a library for
|
|
reading lines of text with interactive input and history editing.
|
|
|
|
The GNU Readline Library 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.
|
|
|
|
The GNU Readline Library 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.
|
|
|
|
The GNU General Public License is often shipped with GNU software, and
|
|
is generally kept in a file called COPYING or LICENSE. If you do not
|
|
have a copy of the license, write to the Free Software Foundation,
|
|
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
|
#define READLINE_LIBRARY
|
|
|
|
#include "config_readline.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#if defined (HAVE_UNISTD_H)
|
|
# include <unistd.h>
|
|
#endif /* HAVE_UNISTD_H */
|
|
|
|
#if defined (HAVE_STDLIB_H)
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif /* HAVE_STDLIB_H */
|
|
|
|
#if defined (HAVE_LOCALE_H)
|
|
# include <locale.h>
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
|
|
#include "rldefs.h"
|
|
#include "readline.h"
|
|
#include "rlshell.h"
|
|
#include "rlprivate.h"
|
|
|
|
#if !defined (HAVE_SETLOCALE)
|
|
/* A list of legal values for the LANG or LC_CTYPE environment variables.
|
|
If a locale name in this list is the value for the LC_ALL, LC_CTYPE,
|
|
or LANG environment variable (using the first of those with a value),
|
|
readline eight-bit mode is enabled. */
|
|
static char *legal_lang_values[] =
|
|
{
|
|
"iso88591",
|
|
"iso88592",
|
|
"iso88593",
|
|
"iso88594",
|
|
"iso88595",
|
|
"iso88596",
|
|
"iso88597",
|
|
"iso88598",
|
|
"iso88599",
|
|
"iso885910",
|
|
"koi8r",
|
|
0
|
|
};
|
|
|
|
static char *normalize_codeset PARAMS((char *));
|
|
static char *find_codeset PARAMS((char *, size_t *));
|
|
#endif /* !HAVE_SETLOCALE */
|
|
|
|
static char *_rl_get_locale_var PARAMS((const char *));
|
|
|
|
static char *
|
|
_rl_get_locale_var (v)
|
|
const char *v;
|
|
{
|
|
char *lspec;
|
|
|
|
lspec = sh_get_env_value ("LC_ALL");
|
|
if (lspec == 0 || *lspec == 0)
|
|
lspec = sh_get_env_value (v);
|
|
if (lspec == 0 || *lspec == 0)
|
|
lspec = sh_get_env_value ("LANG");
|
|
|
|
return lspec;
|
|
}
|
|
|
|
/* Check for LC_ALL, LC_CTYPE, and LANG and use the first with a value
|
|
to decide the defaults for 8-bit character input and output. Returns
|
|
1 if we set eight-bit mode. */
|
|
int
|
|
_rl_init_eightbit ()
|
|
{
|
|
/* If we have setlocale(3), just check the current LC_CTYPE category
|
|
value, and go into eight-bit mode if it's not C or POSIX. */
|
|
#if defined (HAVE_SETLOCALE)
|
|
char *lspec, *t;
|
|
|
|
/* Set the LC_CTYPE locale category from environment variables. */
|
|
lspec = _rl_get_locale_var ("LC_CTYPE");
|
|
/* Since _rl_get_locale_var queries the right environment variables,
|
|
we query the current locale settings with setlocale(), and, if
|
|
that doesn't return anything, we set lspec to the empty string to
|
|
force the subsequent call to setlocale() to define the `native'
|
|
environment. */
|
|
if (lspec == 0 || *lspec == 0)
|
|
lspec = setlocale (LC_CTYPE, (char *)NULL);
|
|
if (lspec == 0)
|
|
lspec = (char*) "";
|
|
t = setlocale (LC_CTYPE, lspec);
|
|
|
|
if (t && *t && (t[0] != 'C' || t[1]) && (STREQ (t, "POSIX") == 0))
|
|
{
|
|
_rl_meta_flag = 1;
|
|
_rl_convert_meta_chars_to_ascii = 0;
|
|
_rl_output_meta_chars = 1;
|
|
return (1);
|
|
}
|
|
else
|
|
return (0);
|
|
|
|
#else /* !HAVE_SETLOCALE */
|
|
char *lspec, *t;
|
|
int i;
|
|
|
|
/* We don't have setlocale. Finesse it. Check the environment for the
|
|
appropriate variables and set eight-bit mode if they have the right
|
|
values. */
|
|
lspec = _rl_get_locale_var ("LC_CTYPE");
|
|
|
|
if (lspec == 0 || (t = normalize_codeset (lspec)) == 0)
|
|
return (0);
|
|
for (i = 0; t && legal_lang_values[i]; i++)
|
|
if (STREQ (t, legal_lang_values[i]))
|
|
{
|
|
_rl_meta_flag = 1;
|
|
_rl_convert_meta_chars_to_ascii = 0;
|
|
_rl_output_meta_chars = 1;
|
|
break;
|
|
}
|
|
free (t);
|
|
return (legal_lang_values[i] ? 1 : 0);
|
|
|
|
#endif /* !HAVE_SETLOCALE */
|
|
}
|
|
|
|
#if !defined (HAVE_SETLOCALE)
|
|
static char *
|
|
normalize_codeset (codeset)
|
|
char *codeset;
|
|
{
|
|
size_t namelen, i;
|
|
int len, all_digits;
|
|
char *wp, *retval;
|
|
|
|
codeset = find_codeset (codeset, &namelen);
|
|
|
|
if (codeset == 0)
|
|
return (codeset);
|
|
|
|
all_digits = 1;
|
|
for (len = 0, i = 0; i < namelen; i++)
|
|
{
|
|
if (ISALNUM ((unsigned char)codeset[i]))
|
|
{
|
|
len++;
|
|
all_digits &= _rl_digit_p (codeset[i]);
|
|
}
|
|
}
|
|
|
|
retval = (char *)malloc ((all_digits ? 3 : 0) + len + 1);
|
|
if (retval == 0)
|
|
return ((char *)0);
|
|
|
|
wp = retval;
|
|
/* Add `iso' to beginning of an all-digit codeset */
|
|
if (all_digits)
|
|
{
|
|
*wp++ = 'i';
|
|
*wp++ = 's';
|
|
*wp++ = 'o';
|
|
}
|
|
|
|
for (i = 0; i < namelen; i++)
|
|
if (ISALPHA ((unsigned char)codeset[i]))
|
|
*wp++ = _rl_to_lower (codeset[i]);
|
|
else if (_rl_digit_p (codeset[i]))
|
|
*wp++ = codeset[i];
|
|
*wp = '\0';
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* Isolate codeset portion of locale specification. */
|
|
static char *
|
|
find_codeset (name, lenp)
|
|
char *name;
|
|
size_t *lenp;
|
|
{
|
|
char *cp, *language, *result;
|
|
|
|
cp = language = name;
|
|
result = (char *)0;
|
|
|
|
while (*cp && *cp != '_' && *cp != '@' && *cp != '+' && *cp != ',')
|
|
cp++;
|
|
|
|
/* This does not make sense: language has to be specified. As
|
|
an exception we allow the variable to contain only the codeset
|
|
name. Perhaps there are funny codeset names. */
|
|
if (language == cp)
|
|
{
|
|
*lenp = strlen (language);
|
|
result = language;
|
|
}
|
|
else
|
|
{
|
|
/* Next is the territory. */
|
|
if (*cp == '_')
|
|
do
|
|
++cp;
|
|
while (*cp && *cp != '.' && *cp != '@' && *cp != '+' && *cp != ',' && *cp != '_');
|
|
|
|
/* Now, finally, is the codeset. */
|
|
result = cp;
|
|
if (*cp == '.')
|
|
do
|
|
++cp;
|
|
while (*cp && *cp != '@');
|
|
|
|
if (cp - result > 2)
|
|
{
|
|
result++;
|
|
*lenp = cp - result;
|
|
}
|
|
else
|
|
{
|
|
*lenp = strlen (language);
|
|
result = language;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
#endif /* !HAVE_SETLOCALE */
|