mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
16115af97c
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
217 lines
5.8 KiB
C++
217 lines
5.8 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
/* readline for batch mode */
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include "my_readline.h"
|
|
|
|
static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,
|
|
ulong max_size);
|
|
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str);
|
|
static uint fill_buffer(LINE_BUFFER *buffer);
|
|
static char *intern_read_line(LINE_BUFFER *buffer,ulong *out_length);
|
|
|
|
|
|
LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file)
|
|
{
|
|
LINE_BUFFER *line_buff;
|
|
if (!(line_buff=(LINE_BUFFER*) my_malloc(sizeof(*line_buff),MYF(MY_WME))))
|
|
return 0;
|
|
if (init_line_buffer(line_buff,fileno(file),IO_SIZE,max_size))
|
|
{
|
|
my_free((char*) line_buff,MYF(0));
|
|
return 0;
|
|
}
|
|
return line_buff;
|
|
}
|
|
|
|
|
|
char *batch_readline(LINE_BUFFER *line_buff)
|
|
{
|
|
char *pos;
|
|
ulong out_length;
|
|
|
|
if (!(pos=intern_read_line(line_buff,&out_length)))
|
|
return 0;
|
|
if (out_length && pos[out_length-1] == '\n')
|
|
out_length--; /* Remove '\n' */
|
|
line_buff->read_length=out_length;
|
|
pos[out_length]=0;
|
|
return pos;
|
|
}
|
|
|
|
|
|
void batch_readline_end(LINE_BUFFER *line_buff)
|
|
{
|
|
if (line_buff)
|
|
{
|
|
my_free((gptr) line_buff->buffer,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free((char*) line_buff,MYF(0));
|
|
}
|
|
}
|
|
|
|
|
|
LINE_BUFFER *batch_readline_command(my_string str)
|
|
{
|
|
LINE_BUFFER *line_buff;
|
|
if (!(line_buff=(LINE_BUFFER*) my_malloc(sizeof(*line_buff),MYF(MY_WME))))
|
|
return 0;
|
|
if (init_line_buffer_from_string(line_buff,str))
|
|
{
|
|
my_free((char*) line_buff,MYF(0));
|
|
return 0;
|
|
}
|
|
return line_buff;
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
Functions to handle buffered readings of lines from a stream
|
|
******************************************************************************/
|
|
|
|
static bool
|
|
init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
|
|
{
|
|
bzero((char*) buffer,sizeof(buffer[0]));
|
|
buffer->file=file;
|
|
buffer->bufread=size;
|
|
buffer->max_size=max_buffer;
|
|
if (!(buffer->buffer = (char*) my_malloc(buffer->bufread+1,
|
|
MYF(MY_WME | MY_FAE))))
|
|
return 1;
|
|
buffer->end_of_line=buffer->end=buffer->buffer;
|
|
buffer->buffer[0]=0; /* For easy start test */
|
|
return 0;
|
|
}
|
|
|
|
|
|
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str)
|
|
{
|
|
uint length;
|
|
bzero((char*) buffer,sizeof(buffer[0]));
|
|
length=(uint) strlen(str);
|
|
if (!(buffer->buffer=buffer->start_of_line=buffer->end_of_line=
|
|
(char*)my_malloc(length+2,MYF(MY_FAE))))
|
|
return 1;
|
|
memcpy(buffer->buffer,str,length);
|
|
buffer->buffer[length]='\n';
|
|
buffer->buffer[length+1]=0;
|
|
buffer->end=buffer->buffer+length+1;
|
|
buffer->eof=1;
|
|
buffer->max_size=1;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void free_line_buffer(LINE_BUFFER *buffer)
|
|
{
|
|
if (buffer->buffer)
|
|
{
|
|
my_free((gptr) buffer->buffer,MYF(0));
|
|
buffer->buffer=0;
|
|
}
|
|
}
|
|
|
|
|
|
/* Fill the buffer retaining the last n bytes at the beginning of the
|
|
newly filled buffer (for backward context). Returns the number of new
|
|
bytes read from disk. */
|
|
|
|
|
|
static uint fill_buffer(LINE_BUFFER *buffer)
|
|
{
|
|
uint read_count;
|
|
uint bufbytes= (uint) (buffer->end - buffer->start_of_line);
|
|
|
|
if (buffer->eof)
|
|
return 0; /* Everything read */
|
|
|
|
/* See if we need to grow the buffer. */
|
|
|
|
for (;;)
|
|
{
|
|
uint start_offset=(uint) (buffer->start_of_line - buffer->buffer);
|
|
read_count=(buffer->bufread - bufbytes)/IO_SIZE;
|
|
if ((read_count*=IO_SIZE))
|
|
break;
|
|
buffer->bufread *= 2;
|
|
if (!(buffer->buffer = (char*) my_realloc(buffer->buffer,
|
|
buffer->bufread+1,
|
|
MYF(MY_WME | MY_FAE))))
|
|
return (uint) -1;
|
|
buffer->start_of_line=buffer->buffer+start_offset;
|
|
buffer->end=buffer->buffer+bufbytes;
|
|
}
|
|
|
|
/* Shift stuff down. */
|
|
if (buffer->start_of_line != buffer->buffer)
|
|
{
|
|
bmove(buffer->buffer,buffer->start_of_line,(uint) bufbytes);
|
|
buffer->end=buffer->buffer+bufbytes;
|
|
}
|
|
|
|
/* Read in new stuff. */
|
|
if ((read_count= my_read(buffer->file, (byte*) buffer->end, read_count,
|
|
MYF(MY_WME))) == MY_FILE_ERROR)
|
|
return read_count;
|
|
|
|
DBUG_PRINT("fill_buff", ("Got %d bytes", read_count));
|
|
|
|
/* Kludge to pretend every nonempty file ends with a newline. */
|
|
if (!read_count && bufbytes && buffer->end[-1] != '\n')
|
|
{
|
|
buffer->eof = read_count = 1;
|
|
*buffer->end = '\n';
|
|
}
|
|
buffer->end_of_line=(buffer->start_of_line=buffer->buffer)+bufbytes;
|
|
buffer->end+=read_count;
|
|
*buffer->end=0; /* Sentinel */
|
|
return read_count;
|
|
}
|
|
|
|
|
|
|
|
char *intern_read_line(LINE_BUFFER *buffer,ulong *out_length)
|
|
{
|
|
char *pos;
|
|
uint length;
|
|
DBUG_ENTER("intern_read_line");
|
|
|
|
buffer->start_of_line=buffer->end_of_line;
|
|
for (;;)
|
|
{
|
|
pos=buffer->end_of_line;
|
|
while (*pos != '\n' && *pos)
|
|
pos++;
|
|
if (pos == buffer->end)
|
|
{
|
|
if ((uint) (pos - buffer->start_of_line) < buffer->max_size)
|
|
{
|
|
if (!(length=fill_buffer(buffer)) || length == (uint) -1)
|
|
DBUG_RETURN(0);
|
|
continue;
|
|
}
|
|
pos--; /* break line here */
|
|
}
|
|
buffer->end_of_line=pos+1;
|
|
*out_length=(ulong) (pos + 1 - buffer->eof - buffer->start_of_line);
|
|
DBUG_RETURN(buffer->start_of_line);
|
|
}
|
|
}
|