Commit b8fe9fb4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-5.0 

into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-my_lread.c:
  Auto merged
BitKeeper/deleted/.del-my_lwrite.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
cmd-line-utils/readline/complete.c:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_cp1250_ch.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
mysys/my_alloc.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_pread.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/heap/_check.c:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/heap/hp_open.c:
  Auto merged
storage/heap/hp_rkey.c:
  Auto merged
storage/heap/hp_rrnd.c:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_close.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_keycache.c:
  Auto merged
storage/myisam/mi_page.c:
  Auto merged
storage/myisam/mi_statrec.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/myisammrg/myrg_extra.c:
  Auto merged
storage/ndb/include/logger/LogHandler.hpp:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/CPCD.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
vio/viossl.c:
  Auto merged
vio/viosslfactories.c:
  Auto merged
BUILD/SETUP.sh:
  Use local version
client/client_priv.h:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/ctype_cp1250_ch.result:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge
mysys/hash.c:
  Manual merge
mysys/thr_lock.c:
  Manual merge
server-tools/instance-manager/mysql_connection.cc:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/handler.cc:
  Manual merge
sql/item_timefunc.cc:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/slave.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_prepare.cc:
  Manual merge
sql/sql_view.cc:
  Manual merge
sql/table.cc:
  Manual merge
storage/archive/ha_archive.cc:
  Manual merge
storage/federated/ha_federated.cc:
  Manual merge
storage/federated/ha_federated.h:
  Manual merge
storage/innobase/handler/ha_innodb.cc:
  Manual merge
storage/ndb/include/ndb_global.h.in:
  Manual merge
storage/ndb/include/util/InputStream.hpp:
  Manual merge
storage/ndb/include/util/SimpleProperties.hpp:
  Manual merge
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  Manual merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Manual merge
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Manual merge
strings/decimal.c:
  Manual merge
vio/viosocket.c:
  Manual merge
parents 7463704e 88696530

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1252,6 +1252,7 @@ mysql-test/r/*.err 
mysql-test/r/*.log

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/*.warnings

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/backup.log

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ could be out of memory"); 
    }

    if (len < 8 && net->read_pos[0] == 254)

      break; // end of data

    DBUG_PRINT("info",( "len= %u, net->read_pos[5] = %d\n",

    DBUG_PRINT("info",( "len: %lu, net->read_pos[5]: %d\n",

			len, net->read_pos[5]));

    if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

                                        len - 1, &error_msg,

client/mysqldump.c

+82 −59
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ 
** master/autocommit code by Brian Aker <brian@tangent.org>

** SSL by

** Andrei Errapart <andreie@no.spam.ee>

** Tõnu Samuel  <tonu@please.do.not.remove.this.spam.ee>

** Tõnu Samuel  <tonu@please.do.not.remove.this.spam.ee>

** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up

** and adapted to mysqldump 05/11/01 by Jani Tolonen

** Added --single-transaction option 06/06/2002 by Peter Zaitsev

** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov

*/



#define DUMP_VERSION "10.10"

#define DUMP_VERSION "10.11"



#include <my_global.h>

#include <my_sys.h>
@@ -103,7 +103,7 @@ static my_bool verbose= 0, opt_no_create_info= 0, opt_no_data= 0, 
                opt_alltspcs=0;

static ulong opt_max_allowed_packet, opt_net_buffer_length;

static MYSQL mysql_connection,*mysql=0;

static my_bool insert_pat_inited=0;

static my_bool insert_pat_inited= 0, info_flag;

static DYNAMIC_STRING insert_pat;

static char  *opt_password=0,*current_user=0,

             *current_host=0,*path=0,*fields_terminated=0,
@@ -111,6 +111,7 @@ static char *opt_password=0,*current_user=0, 
             *where=0, *order_by=0,

             *opt_compatible_mode_str= 0,

             *err_ptr= 0;

static char **defaults_argv= 0;

static char compatible_mode_normal_str[255];

static ulong opt_compatible_mode= 0;

#define MYSQL_OPT_MASTER_DATA_EFFECTIVE_SQL 1
@@ -120,7 +121,7 @@ static my_string opt_mysql_unix_port=0; 
static int   first_error=0;

static DYNAMIC_STRING extended_row;

#include <sslopt-vars.h>

FILE  *md_result_file;

FILE  *md_result_file= 0;

#ifdef HAVE_SMEM

static char *shared_memory_base_name=0;

#endif
@@ -222,6 +223,8 @@ static struct my_option my_long_options[] = 
  {"debug", '#', "Output debug log", (gptr*) &default_dbug_option,

   (gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (gptr*) &info_flag,

   (gptr*) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"default-character-set", OPT_DEFAULT_CHARSET,

   "Set the default character set.", (gptr*) &default_charset,

   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -641,14 +644,6 @@ byte* get_table_key(const char *entry, uint *length, 
}





void init_table_rule_hash(HASH* h)

{

  if (hash_init(h, charset_info, 16, 0, 0,

                (hash_get_key) get_table_key,

                (hash_free_key) free_table_ent, 0))

    exit(EX_EOM);

}



static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

               char *argument)
@@ -691,6 +686,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    break;

  case '#':

    DBUG_PUSH(argument ? argument : default_dbug_option);

    info_flag= 1;

    break;

#include <sslopt-case.h>

  case 'V': print_version(); exit(0);
@@ -731,9 +727,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      fprintf(stderr, "Illegal use of option --ignore-table=<database>.<table>\n");

      exit(1);

    }

    if (!hash_inited(&ignore_table))

      init_table_rule_hash(&ignore_table);



    if (my_hash_insert(&ignore_table, (byte*)my_strdup(argument, MYF(0))))

      exit(EX_EOM);

    break;
@@ -809,9 +802,21 @@ static int get_options(int *argc, char ***argv) 


  md_result_file= stdout;

  load_defaults("my",load_default_groups,argc,argv);

  defaults_argv= *argv;



  if (hash_init(&ignore_table, charset_info, 16, 0, 0,

                (hash_get_key) get_table_key,

                (hash_free_key) free_table_ent, 0))

    return(EX_EOM);

  /* Don't copy cluster internal log tables */

  if (my_hash_insert(&ignore_table,

                     (byte*) my_strdup("mysql.apply_status", MYF(MY_WME))) ||

      my_hash_insert(&ignore_table,

                     (byte*) my_strdup("mysql.schema", MYF(MY_WME))))

    return(EX_EOM);



  if ((ho_error= handle_options(argc, argv, my_long_options, get_one_option)))

    exit(ho_error);

    return(ho_error);



  *mysql_params->p_max_allowed_packet= opt_max_allowed_packet;

  *mysql_params->p_net_buffer_length= opt_net_buffer_length;
@@ -823,7 +828,7 @@ static int get_options(int *argc, char ***argv) 
  {

    fprintf(stderr,

            "%s: You must use option --tab with --fields-...\n", my_progname);

    return(1);

    return(EX_USAGE);

  }



  /* Ensure consistency of the set of binlog & locking options */
@@ -833,7 +838,7 @@ static int get_options(int *argc, char ***argv) 
  {

    fprintf(stderr, "%s: You can't use --single-transaction and "

            "--lock-all-tables at the same time.\n", my_progname);

    return(1);

    return(EX_USAGE);

  }

  if (opt_master_data)

    opt_lock_all_tables= !opt_single_transaction;
@@ -842,14 +847,14 @@ static int get_options(int *argc, char ***argv) 
  if (enclosed && opt_enclosed)

  {

    fprintf(stderr, "%s: You can't use ..enclosed.. and ..optionally-enclosed.. at the same time.\n", my_progname);

    return(1);

    return(EX_USAGE);

  }

  if ((opt_databases || opt_alldbs) && path)

  {

    fprintf(stderr,

            "%s: --databases or --all-databases can't be used with --tab.\n",

            my_progname);

    return(1);

    return(EX_USAGE);

  }

  if (strcmp(default_charset, charset_info->csname) &&

      !(charset_info= get_charset_by_csname(default_charset,
@@ -858,7 +863,7 @@ static int get_options(int *argc, char ***argv) 
  if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))

  {

    short_usage();

    return 1;

    return EX_USAGE;

  }

  if (tty_password)

    opt_password=get_tty_password(NullS);
@@ -933,6 +938,23 @@ static FILE* open_sql_file_for_table(const char* table) 
}





static void free_resources()

{

  if (md_result_file && md_result_file != stdout)

    my_fclose(md_result_file, MYF(0));

  my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));

  if (hash_inited(&ignore_table))

    hash_free(&ignore_table);

  if (extended_insert)

    dynstr_free(&extended_row);

  if (insert_pat_inited)

    dynstr_free(&insert_pat);

  if (defaults_argv)

    free_defaults(defaults_argv);

  my_end(info_flag ? MY_CHECK_ERROR : 0);

}





static void safe_exit(int error)

{

  if (!first_error)
@@ -941,18 +963,19 @@ static void safe_exit(int error) 
    return;

  if (mysql)

    mysql_close(mysql);

  free_resources();

  exit(error);

}

/* safe_exit */





/*

** dbConnect -- connects to the host and selects DB.

  db_connect -- connects to the host and selects DB.

*/

static int dbConnect(char *host, char *user,char *passwd)



static int connect_to_db(char *host, char *user,char *passwd)

{

  char buff[20+FN_REFLEN];

  DBUG_ENTER("dbConnect");

  DBUG_ENTER("connect_to_db");



  verbose_msg("-- Connecting to %s...\n", host ? host : "localhost");

  mysql_init(&mysql_connection);
@@ -977,7 +1000,7 @@ static int dbConnect(char *host, char *user,char *passwd) 
                                  0)))

  {

    DB_error(&mysql_connection, "when trying to connect");

    return 1;

    DBUG_RETURN(1);

  }

  /*

    Don't dump SET NAMES with a pre-4.1 server (bug#7997).
@@ -994,7 +1017,7 @@ static int dbConnect(char *host, char *user,char *passwd) 
  if (mysql_query_with_error_report(mysql, 0, buff))

  {

    safe_exit(EX_MYSQLERR);

    return 1;

    DBUG_RETURN(1);

  }

  /*

    set time_zone to UTC to allow dumping date types between servers with
@@ -1006,11 +1029,11 @@ static int dbConnect(char *host, char *user,char *passwd) 
    if (mysql_query_with_error_report(mysql, 0, buff))

    {

      safe_exit(EX_MYSQLERR);

      return 1;

      DBUG_RETURN(1);

    }

  }

  return 0;

} /* dbConnect */

  DBUG_RETURN(0);

} /* connect_to_db */





/*
@@ -1659,7 +1682,11 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
  {

    complete_insert= opt_complete_insert;

    if (!insert_pat_inited)

      insert_pat_inited= init_dynamic_string(&insert_pat, "", 1024, 1024);

    {

      insert_pat_inited= 1;

      if (init_dynamic_string(&insert_pat, "", 1024, 1024))

        safe_exit(EX_MYSQLERR);

    }

    else

      dynstr_set(&insert_pat, "");

  }
@@ -2980,6 +3007,8 @@ static int dump_databases(char **db_names) 
{

  int result=0;

  char **db;

  DBUG_ENTER("dump_databases");



  for (db= db_names ; *db ; db++)

  {

    if (dump_all_tables_in_db(*db))
@@ -2993,7 +3022,7 @@ static int dump_databases(char **db_names) 
        result=1;

    }

  }

  return result;

  DBUG_RETURN(result);

} /* dump_databases */
@@ -3008,7 +3037,7 @@ RETURN VALUES 
  0        Success.

  1        Failure.

*/

int init_dumping_views(char *qdatabase)

int init_dumping_views(char *qdatabase __attribute__((unused)))

{

    return 0;

} /* init_dumping_views */
@@ -3105,12 +3134,11 @@ static int init_dumping(char *database, int init_func(char*)) 
} /* init_dumping */





/* Return 1 if we should copy the table */



my_bool include_table(byte* hash_key, uint len)

{

  if (hash_search(&ignore_table, (byte*) hash_key, len))

    return FALSE;



  return TRUE;

  return !hash_search(&ignore_table, (byte*) hash_key, len);

}
@@ -3119,10 +3147,10 @@ static int dump_all_tables_in_db(char *database) 
  char *table;

  uint numrows;

  char table_buff[NAME_LEN*2+3];



  char hash_key[2*NAME_LEN+2];  /* "db.tablename" */

  char *afterdot;

  int using_mysql_db= my_strcasecmp(&my_charset_latin1, database, "mysql");

  DBUG_ENTER("dump_all_tables_in_db");



  afterdot= strmov(hash_key, database);

  *afterdot++= '.';
@@ -3558,7 +3586,6 @@ static void print_value(FILE *file, MYSQL_RES *result, MYSQL_ROW row, 




/*



  SYNOPSIS



  Check if we the table is one of the table types that should be ignored:
@@ -3598,7 +3625,7 @@ char check_if_ignore_table(const char *table_name, char *table_type) 
  {

    if (mysql_errno(mysql) != ER_PARSE_ERROR)

    {                                   /* If old MySQL version */

      verbose_msg("-- Warning: Couldn't get status information for " \

      verbose_msg("-- Warning: Couldn't get status information for "

                  "table %s (%s)\n", table_name, mysql_error(mysql));

      DBUG_RETURN(result);                       /* assume table is ok */

    }
@@ -3954,19 +3981,24 @@ static my_bool get_view_structure(char *table, char* db) 


int main(int argc, char **argv)

{

  int exit_code;

  MY_INIT("mysqldump");



  compatible_mode_normal_str[0]= 0;

  default_charset= (char *)mysql_universal_client_charset;

  bzero((char*) &ignore_table, sizeof(ignore_table));



  if (get_options(&argc, &argv))

  exit_code= get_options(&argc, &argv);

  if (exit_code)

  {

    my_end(0);

    exit(EX_USAGE);

    free_resources(0);

    exit(exit_code);

  }

  if (dbConnect(current_host, current_user, opt_password))

  if (connect_to_db(current_host, current_user, opt_password))

  {

    free_resources(0);

    exit(EX_MYSQLERR);

  }

  if (!path)

    write_header(md_result_file, *argv);
@@ -4016,15 +4048,6 @@ int main(int argc, char **argv) 
  dbDisconnect(current_host);

  if (!path)

    write_footer(md_result_file);

  if (md_result_file != stdout)

    my_fclose(md_result_file, MYF(0));

  my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));

  if (hash_inited(&ignore_table))

    hash_free(&ignore_table);

  if (extended_insert)

    dynstr_free(&extended_row);

  if (insert_pat_inited)

    dynstr_free(&insert_pat);

  my_end(0);

  free_resources();

  return(first_error);

} /* main */

cmd-line-utils/readline/bind.c

+18 −22
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ rl_translate_keyseq (seq, array, len) 
{

  register int i, c, l, temp;



  for (i = l = 0; c = seq[i]; i++)

  for (i = l = 0; (c = seq[i]); i++)

    {

      if (c == '\\')

	{
@@ -765,8 +765,8 @@ _rl_read_file (filename, sizep) 


/* Re-read the current keybindings file. */

int

rl_re_read_init_file (count, ignore)

     int count, ignore;

rl_re_read_init_file (int count __attribute__((unused)),

                      int ignore __attribute__((unused)))

{

  int r;

  r = rl_read_init_file ((const char *)NULL);
@@ -987,8 +987,7 @@ parser_if (args) 


/* Invert the current parser state if there is anything on the stack. */

static int

parser_else (args)

     char *args;

parser_else (char *args __attribute__((unused)))

{

  register int i;
@@ -1018,8 +1017,7 @@ parser_else (args) 
/* Terminate a conditional, popping the value of

   _rl_parsing_conditionalized_out from the stack. */

static int

parser_endif (args)

     char *args;

parser_endif (char *args __attribute__((unused)))

{

  if (if_stack_depth)

    _rl_parsing_conditionalized_out = if_stack[--if_stack_depth];
@@ -1142,7 +1140,7 @@ rl_parse_and_bind (string) 
    {

      int passc = 0;



      for (i = 1; c = string[i]; i++)

      for (i = 1; (c = string[i]); i++)

	{

	  if (passc)

	    {
@@ -1218,7 +1216,7 @@ rl_parse_and_bind (string) 
    {

      int delimiter = string[i++], passc;



      for (passc = 0; c = string[i]; i++)

      for (passc = 0; (c = string[i]); i++)

	{

	  if (passc)

	    {
@@ -1377,7 +1375,7 @@ static struct { 
#if defined (VISIBLE_STATS)

  { "visible-stats",		&rl_visible_stats,		0 },

#endif /* VISIBLE_STATS */

  { (char *)NULL, (int *)NULL }

  { (char *)NULL, (int *)NULL, 0 }

};



static int
@@ -1446,7 +1444,7 @@ static struct { 
  { "editing-mode",	V_STRING,	sv_editmode },

  { "isearch-terminators", V_STRING,	sv_isrchterm },

  { "keymap",		V_STRING,	sv_keymap },

  { (char *)NULL,	0 }

  { (char *)NULL,	0, 0 }

};



static int
@@ -1466,7 +1464,7 @@ find_string_var (name) 
   values result in 0 (false). */

static int

bool_to_int (value)

     char *value;

const char *value;

{

  return (value == 0 || *value == '\0' ||

		(_rl_stricmp (value, "on") == 0) ||
@@ -1725,13 +1723,13 @@ char * 
rl_get_keymap_name_from_edit_mode ()

{

  if (rl_editing_mode == emacs_mode)

    return "emacs";

    return (char*) "emacs";

#if defined (VI_MODE)

  else if (rl_editing_mode == vi_mode)

    return "vi";

    return (char*) "vi";

#endif /* VI_MODE */

  else

    return "none";

    return (char*) "none";

}



/* **************************************************************** */
@@ -1966,7 +1964,7 @@ rl_function_dumper (print_readably) 


  fprintf (rl_outstream, "\n");



  for (i = 0; name = names[i]; i++)

  for (i = 0; (name = names[i]); i++)

    {

      rl_command_func_t *function;

      char **invokers;
@@ -2025,8 +2023,8 @@ rl_function_dumper (print_readably) 
   rl_outstream.  If an explicit argument is given, then print

   the output in such a way that it can be read back in. */

int

rl_dump_functions (count, key)

     int count, key;

rl_dump_functions (int count __attribute__((unused)),

                   int key  __attribute__((unused)))

{

  if (rl_dispatching)

    fprintf (rl_outstream, "\r\n");
@@ -2105,8 +2103,7 @@ rl_macro_dumper (print_readably) 
}



int

rl_dump_macros (count, key)

     int count, key;

rl_dump_macros(int count __attribute__((unused)), int key __attribute__((unused)))

{

  if (rl_dispatching)

    fprintf (rl_outstream, "\r\n");
@@ -2195,8 +2192,7 @@ rl_variable_dumper (print_readably) 
   rl_outstream.  If an explicit argument is given, then print

   the output in such a way that it can be read back in. */

int

rl_dump_variables (count, key)

     int count, key;

rl_dump_variables(int count __attribute__((unused)), int key __attribute__((unused)))

{

  if (rl_dispatching)

    fprintf (rl_outstream, "\r\n");

cmd-line-utils/readline/chardefs.h

+4 −0
Original line number Diff line number Diff line
@@ -59,7 +59,11 @@ 
#define largest_char 255		    /* Largest character value. */



#define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0))

#if largest_char >= 255

#define META_CHAR(c) ((c) > meta_character_threshold)

#else

#define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char)

#endif



#define CTRL(c) ((c) & control_character_mask)

#define META(c) ((c) | meta_character_bit)