~drizzle-trunk/drizzle/development : contents of client/drizzle.cc at revision 1994.4.49

~drizzle-trunk/drizzle/development : (revision 1994.4.49)

77.3.7 by Monty Taylor Made mysql into a pure-C program.	1	/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2	* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
	3	*
1719.2.3 by Vijay Samuel Merge removed the drizzled/option.h include from client_priv.h and archive_reader.	4	* Copyright (C) 2010 Vijay Samuel
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	5	* Copyright (C) 2008 MySQL
	6	*
	7	* This program is free software; you can redistribute it and/or modify
	8	* it under the terms of the GNU General Public License as published by
	9	* the Free Software Foundation; either version 2 of the License, or
	10	* (at your option) any later version.
	11	*
	12	* This program is distributed in the hope that it will be useful,
1675.1.3 by Monty Taylor Merged in local client config lookup paths from vijay. Thanks.	13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	* GNU General Public License for more details.
	16	*
	17	* You should have received a copy of the GNU General Public License
	18	* along with this program; if not, write to the Free Software
	19	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	20	*/
1 by brian clean slate	21
206.3.1 by Patrick Galbraith Most everything working with client rename	22	/* drizzle command tool
1 by brian clean slate	23	* Commands compatible with mSQL by David J. Hughes
	24	*
	25	* Written by:
	26	* Michael 'Monty' Widenius
	27	* Andi Gutmans <andi@zend.com>
	28	* Zeev Suraski <zeev@zend.com>
202.1.25 by Monty Taylor Fixed change of mysql.com -> drizzle.com.	29	* Jani Tolonen <jani@mysql.com>
	30	* Matt Wagner <matt@mysql.com>
	31	* Jeremy Cole <jcole@mysql.com>
	32	* Tonu Samuel <tonu@mysql.com>
	33	* Harrison Fisk <harrison@mysql.com>
1 by brian clean slate	34	*
	35	**/
	36
1567.3.15 by Monty Taylor Removed the last vestiges of my_sys from drizzle.cc.	37	#include "config.h"
	38	#include <libdrizzle/drizzle_client.h>
	39
	40	#include "client/get_password.h"
	41
	42	#if TIME_WITH_SYS_TIME
	43	# include <sys/time.h>
	44	# include <time.h>
	45	#else
	46	# if HAVE_SYS_TIME_H
	47	# include <sys/time.h>
	48	# else
	49	# include <time.h>
	50	# endif
	51	#endif
	52
1567.3.22 by Monty Taylor Include cerrno for ENOMEM on FreeBSD.	53	#include <cerrno>
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	54	#include <string>
1241.9.1 by Monty Taylor Removed global.h. Fixed all the headers.	55	#include <drizzled/gettext.h>
	56	#include <iostream>
1567.3.8 by Vijay Samuel Refactor drizzle client.	57	#include <fstream>
1241.9.1 by Monty Taylor Removed global.h. Fixed all the headers.	58	#include <map>
713.1.4 by Monty Taylor Fixed max() problem for solaris	59	#include <algorithm>
1241.9.1 by Monty Taylor Removed global.h. Fixed all the headers.	60	#include <limits.h>
	61	#include <cassert>
1 by brian clean slate	62	#include <stdarg.h>
1241.9.1 by Monty Taylor Removed global.h. Fixed all the headers.	63	#include <math.h>
1929.1.13 by Stewart Smith fix large stack usage in handle_sigint in drizzle client	64	#include <memory>
1095.2.1 by Robert Klahn Replace typedef struct LINE_BUFFER with class LineBuffer, encapsulating current logic	65	#include "client/linebuffer.h"
1 by brian clean slate	66	#include <signal.h>
212.5.30 by Monty Taylor Removed my_net.h. Pointless.	67	#include <sys/ioctl.h>
722.1.4 by Monty Taylor Removed all the setting of DEFS everywhere. Use configmake.h to get the values	68	#include <drizzled/configmake.h>
1567.3.20 by Monty Taylor Removed UTF-8 lib that we don't use.	69	#include "drizzled/utf8/utf8.h"
1671.2.1 by Vijay Samuel Merge new user config file processing system.	70	#include <cstdlib>
212.5.30 by Monty Taylor Removed my_net.h. Pointless.	71
1 by brian clean slate	72	#if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
1 by brian clean slate	73	#include <curses.h>
139.1.15 by Trond Norbye curses.h defines clear and erase as macros causing problems calling the std::string members	74	#ifdef __sun
	75	#undef clear
	76	#undef erase
	77	#endif
1 by brian clean slate	78	#include <term.h>
	79	#else
	80	#if defined(HAVE_TERMIOS_H)
	81	#include <termios.h>
	82	#include <unistd.h>
	83	#elif defined(HAVE_TERMBITS_H)
	84	#include <termbits.h>
	85	#elif defined(HAVE_ASM_TERMBITS_H) && (!defined __GLIBC__ \|\| !(__GLIBC__ > 2 \|\| __GLIBC__ == 2 && __GLIBC_MINOR__ > 0))
206.3.1 by Patrick Galbraith Most everything working with client rename	86	#include <asm/termbits.h> // Standard linux
1 by brian clean slate	87	#endif
	88	#if defined(HAVE_TERMCAP_H)
	89	#include <termcap.h>
	90	#else
	91	#ifdef HAVE_CURSES_H
	92	#include <curses.h>
	93	#endif
206.3.1 by Patrick Galbraith Most everything working with client rename	94	#undef SYSV // hack to avoid syntax error
1 by brian clean slate	95	#ifdef HAVE_TERM_H
	96	#include <term.h>
	97	#endif
	98	#endif
	99	#endif
	100
779.2.4 by Monty Taylor Updated some more build stuff.	101	#ifdef HAVE_LIBREADLINE
	102	# if defined(HAVE_READLINE_READLINE_H)
	103	# include <readline/readline.h>
	104	# elif defined(HAVE_READLINE_H)
	105	# include <readline.h>
	106	# else /* !defined(HAVE_READLINE_H) */
	107	extern char *readline ();
	108	# endif /* !defined(HAVE_READLINE_H) */
	109	char *cmdline = NULL;
	110	#else /* !defined(HAVE_READLINE_READLINE_H) */
1441.3.1 by Vijay Samuel all required updations have been made	111	/* no readline */
779.2.4 by Monty Taylor Updated some more build stuff.	112	# error Readline Required
	113	#endif /* HAVE_LIBREADLINE */
	114
	115	#ifdef HAVE_READLINE_HISTORY
	116	# if defined(HAVE_READLINE_HISTORY_H)
	117	# include <readline/history.h>
	118	# elif defined(HAVE_HISTORY_H)
	119	# include <history.h>
	120	# else /* !defined(HAVE_HISTORY_H) */
	121	extern void add_history ();
	122	extern int write_history ();
	123	extern int read_history ();
	124	# endif /* defined(HAVE_READLINE_HISTORY_H) */
1441.3.1 by Vijay Samuel all required updations have been made	125	/* no history */
779.2.4 by Monty Taylor Updated some more build stuff.	126	#endif /* HAVE_READLINE_HISTORY */
779.2.4 by Monty Taylor Updated some more build stuff.	127
779.2.14 by Monty Taylor Fixed a coupla oopses on the Mac.	128	/**
1441.3.1 by Vijay Samuel all required updations have been made	129	Make the old readline interface look like the new one.
779.2.14 by Monty Taylor Fixed a coupla oopses on the Mac.	130	*/
1149.2.1 by Monty Taylor Workaround for half-present new-interface on Snow Leopard, combined	131	#ifndef HAVE_RL_COMPLETION
	132	typedef char *rl_completion_func_t(const char , int, int);
779.2.14 by Monty Taylor Fixed a coupla oopses on the Mac.	133	#define rl_completion_matches(str, func) \
	134	completion_matches((char )str, (CPFunction )func)
	135	#endif
779.2.4 by Monty Taylor Updated some more build stuff.	136
1149.2.1 by Monty Taylor Workaround for half-present new-interface on Snow Leopard, combined	137	#ifdef HAVE_RL_COMPENTRY
	138	# ifdef HAVE_WORKING_RL_COMPENTRY
	139	typedef rl_compentry_func_t drizzle_compentry_func_t;
	140	# else
	141	/* Snow Leopard ships an rl_compentry which cannot be assigned to
	142	* rl_completion_entry_function. We must undo the complete and total
	143	* ass-bagery.
	144	*/
	145	typedef Function drizzle_compentry_func_t;
	146	# endif
	147	#else
1149.2.2 by Monty Taylor Fixed bad assumption about non-Snow Leopard.	148	typedef Function drizzle_compentry_func_t;
1149.2.1 by Monty Taylor Workaround for half-present new-interface on Snow Leopard, combined	149	#endif
	150
779.2.4 by Monty Taylor Updated some more build stuff.	151	#if defined(HAVE_LOCALE_H)
	152	#include <locale.h>
	153	#endif
	154
	155
	156
1 by brian clean slate	157	#if !defined(HAVE_VIDATTR)
1 by brian clean slate	158	#undef vidattr
206.3.1 by Patrick Galbraith Most everything working with client rename	159	#define vidattr(A) {} // Can't get this to work
1 by brian clean slate	160	#endif
1567.3.5 by Vijay Samuel Refactored client.	161	#include <boost/program_options.hpp>
1929.1.40 by Monty Taylor Replaced auto_ptr with scoped_ptr.	162	#include <boost/scoped_ptr.hpp>
1815.1.1 by Monty Taylor Embed a modified version of parse_config_file. There are several more bugs	163	#include "drizzled/program_options/config_file.h"
1 by brian clean slate	164
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	165	using namespace std;
1567.3.5 by Vijay Samuel Refactored client.	166	namespace po=boost::program_options;
1815.1.1 by Monty Taylor Embed a modified version of parse_config_file. There are several more bugs	167	namespace dpo=drizzled::program_options;
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	168
919.2.11 by Monty Taylor Removed C99 isnan() usage, which allows us to remove the util/math.{cc,h} workarounds. Yay for standards!	169	/* Don't try to make a nice table if the data is too big */
	170	const uint32_t MAX_COLUMN_LENGTH= 1024;
	171
	172	/* Buffer to hold 'version' and 'version_comment' */
	173	const int MAX_SERVER_VERSION_LENGTH= 128;
	174
1 by brian clean slate	175	#define PROMPT_CHAR '\\'
1 by brian clean slate	176
1441.3.1 by Vijay Samuel all required updations have been made	177	class Status
1 by brian clean slate	178	{
1441.3.1 by Vijay Samuel all required updations have been made	179	public:
	180
	181	Status(int in_exit_status,
	182	uint32_t in_query_start_line,
1891.2.1 by Monty Taylor Fixed things to make things compile with clang	183	char *in_file_name,
1441.3.1 by Vijay Samuel all required updations have been made	184	LineBuffer *in_line_buff,
1891.2.1 by Monty Taylor Fixed things to make things compile with clang	185	bool in_batch,
	186	bool in_add_to_history)
1441.3.1 by Vijay Samuel all required updations have been made	187	:
	188	exit_status(in_exit_status),
	189	query_start_line(in_query_start_line),
	190	file_name(in_file_name),
	191	line_buff(in_line_buff),
	192	batch(in_batch),
	193	add_to_history(in_add_to_history)
	194	{}
	195
1891.2.1 by Monty Taylor Fixed things to make things compile with clang	196	Status() :
	197	exit_status(0),
	198	query_start_line(0),
	199	file_name(NULL),
	200	line_buff(NULL),
	201	batch(false),
	202	add_to_history(false)
	203	{}
1441.3.1 by Vijay Samuel all required updations have been made	204
	205	int getExitStatus() const
	206	{
	207	return exit_status;
	208	}
	209
	210	uint32_t getQueryStartLine() const
	211	{
	212	return query_start_line;
	213	}
	214
	215	const char *getFileName() const
	216	{
	217	return file_name;
	218	}
	219
	220	LineBuffer *getLineBuff() const
	221	{
	222	return line_buff;
	223	}
	224
	225	bool getBatch() const
	226	{
	227	return batch;
	228	}
	229
	230	bool getAddToHistory() const
	231	{
	232	return add_to_history;
	233	}
	234
	235	void setExitStatus(int in_exit_status)
	236	{
	237	exit_status= in_exit_status;
	238	}
	239
	240	void setQueryStartLine(uint32_t in_query_start_line)
	241	{
	242	query_start_line= in_query_start_line;
	243	}
	244
	245	void setFileName(char *in_file_name)
	246	{
	247	file_name= in_file_name;
	248	}
	249
	250	void setLineBuff(int max_size, FILE *file=NULL)
	251	{
	252	line_buff= new(std::nothrow) LineBuffer(max_size, file);
	253	}
	254
	255	void setLineBuff(LineBuffer *in_line_buff)
	256	{
	257	line_buff= in_line_buff;
	258	}
	259
	260	void setBatch(bool in_batch)
	261	{
	262	batch= in_batch;
	263	}
	264
	265	void setAddToHistory(bool in_add_to_history)
	266	{
	267	add_to_history= in_add_to_history;
268	}
269
270	private:
1 by brian clean slate	271	int exit_status;
77.1.107 by Monty Taylor Fixed build warnings.	272	uint32_t query_start_line;
1 by brian clean slate	273	char *file_name;
1095.2.1 by Robert Klahn Replace typedef struct LINE_BUFFER with class LineBuffer, encapsulating current logic	274	LineBuffer *line_buff;
1 by brian clean slate	275	bool batch,add_to_history;
1441.3.1 by Vijay Samuel all required updations have been made	276	};
1 by brian clean slate	277
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	278	static map<string, string>::iterator completion_iter;
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	279	static map<string, string>::iterator completion_end;
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	280	static map<string, string> completion_map;
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	281	static string completion_string;
	282
1 by brian clean slate	283
	284	enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
	285	typedef enum enum_info_type INFO_TYPE;
	286
928.1.1 by Eric Day Started client changes.	287	static drizzle_st drizzle; /* The library handle */
928.1.1 by Eric Day Started client changes.	288	static drizzle_con_st con; /* The connection */
673.5.2 by Andrew Hutchings Code cleanups	289	static bool ignore_errors= false, quick= false,
1441.3.1 by Vijay Samuel all required updations have been made	290	connected= false, opt_raw_data= false, unbuffered= false,
	291	output_tables= false, opt_rehash= true, skip_updates= false,
	292	safe_updates= false, one_database= false,
1802.13.2 by Andrew Hutchings Remove compress option	293	opt_shutdown= false, opt_ping= false,
1441.3.1 by Vijay Samuel all required updations have been made	294	vertical= false, line_numbers= true, column_names= true,
	295	opt_nopager= true, opt_outfile= false, named_cmds= false,
1627.2.2 by Monty Taylor Moved password parsing code into get_password.cc.	296	opt_nobeep= false, opt_reconnect= true,
1567.3.15 by Monty Taylor Removed the last vestiges of my_sys from drizzle.cc.	297	opt_secure_auth= false,
1441.3.1 by Vijay Samuel all required updations have been made	298	default_pager_set= false, opt_sigint_ignore= false,
	299	auto_vertical_output= false,
	300	show_warnings= false, executing_query= false, interrupted_query= false,
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	301	use_drizzle_protocol= false, opt_local_infile;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	302	static uint32_t show_progress_size= 0;
143 by Brian Aker Bool cleanup.	303	static bool column_types_flag;
673.5.2 by Andrew Hutchings Code cleanups	304	static bool preserve_comments= false;
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	305	static uint32_t opt_max_input_line;
	306	static uint32_t opt_drizzle_port= 0;
1923.3.4 by Andrew Hutchings Revert -v fix	307	static int opt_silent, verbose= 0;
928.1.5 by Eric Day Merged trunk.	308	static drizzle_capabilities_t connect_flag= DRIZZLE_CAPABILITIES_NONE;
1 by brian clean slate	309	static char *histfile;
1 by brian clean slate	310	static char *histfile_tmp;
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	311	static string *glob_buffer;
	312	static string *processed_prompt= NULL;
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	313	static char *default_prompt= NULL;
673.5.2 by Andrew Hutchings Code cleanups	314	static char full_username= NULL,part_username= NULL;
1441.3.1 by Vijay Samuel all required updations have been made	315	static Status status;
164 by Brian Aker Commit cleanup of export types.	316	static uint32_t select_limit;
77.1.107 by Monty Taylor Fixed build warnings.	317	static uint32_t max_join_size;
288 by Brian Aker ulong cleanp in client apps	318	static uint32_t opt_connect_timeout= 0;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	319	std::string current_db,
	320	delimiter_str,
	321	current_host,
	322	current_prompt,
	323	current_user,
1923.3.4 by Andrew Hutchings Revert -v fix	324	opt_verbose,
1567.3.5 by Vijay Samuel Refactored client.	325	current_password,
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	326	opt_password,
	327	opt_protocol;
202.3.2 by Monty Taylor Added gettext calls in to my_getopt.c and drizzle.c	328	// TODO: Need to i18n these
673.5.1 by Andrew Hutchings Minor coding standards cleanup	329	static const char *day_names[]= {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
673.5.1 by Andrew Hutchings Minor coding standards cleanup	330	static const char *month_names[]= {"Jan","Feb","Mar","Apr","May","Jun","Jul",
1441.3.1 by Vijay Samuel all required updations have been made	331	"Aug","Sep","Oct","Nov","Dec"};
1567.3.15 by Monty Taylor Removed the last vestiges of my_sys from drizzle.cc.	332	/* @TODO: Remove this */
	333	#define FN_REFLEN 512
	334
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	335	static string default_pager("");
	336	static string pager("");
	337	static string outfile("");
1 by brian clean slate	338	static FILE PAGER, OUTFILE;
893 by Brian Aker First pass of stripping uint	339	static uint32_t prompt_counter;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	340	static char *delimiter= NULL;
893 by Brian Aker First pass of stripping uint	341	static uint32_t delimiter_length= 1;
1 by brian clean slate	342	unsigned short terminal_width= 80;
1 by brian clean slate	343
1877.1.1 by Andrew Hutchings Use size_t for command in drizzle.cc	344	int drizzleclient_real_query_for_lazy(const char *buf, size_t length,
928.1.3 by Eric Day More changes towards getting the client utilities converted.	345	drizzle_result_st *result,
	346	uint32_t *error_code);
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	347	int drizzleclient_store_result_for_lazy(drizzle_result_st *result);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	348
1 by brian clean slate	349
	350	void tee_fprintf(FILE file, const char fmt, ...);
	351	void tee_fputs(const char s, FILE file);
	352	void tee_puts(const char s, FILE file);
	353	void tee_putc(int c, FILE *file);
	354	static void tee_print_sized_data(const char *, unsigned int, unsigned int, bool);
	355	/* The names of functions that actually do the manipulation. */
1567.5.3 by Vijay Samuel Merge patch for sql_connect() and style issue.	356	static int process_options(void);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	357	static int com_quit(string str,const char),
1441.3.1 by Vijay Samuel all required updations have been made	358	com_go(string str,const char), com_ego(string str,const char),
	359	com_print(string str,const char),
	360	com_help(string str,const char), com_clear(string str,const char),
	361	com_connect(string str,const char), com_status(string str,const char),
	362	com_use(string str,const char), com_source(string str, const char),
1954 by Brian Aker This adds the command "shutdown" to the command line client. It does require	363	com_shutdown(string str,const char),
1441.3.1 by Vijay Samuel all required updations have been made	364	com_rehash(string str, const char), com_tee(string str, const char),
	365	com_notee(string str, const char),
	366	com_prompt(string str, const char), com_delimiter(string str, const char),
	367	com_warnings(string str, const char), com_nowarnings(string str, const char),
	368	com_nopager(string str, const char), com_pager(string str, const char);
1 by brian clean slate	369
1 by brian clean slate	370	static int read_and_execute(bool interactive);
2053.2.1 by Andrew Hutchings Fix hidden connect messages	371	static int sql_connect(const string &host, const string &database, const string &user, const string &password);
928.1.1 by Eric Day Started client changes.	372	static const char server_version_string(drizzle_con_st con);
893 by Brian Aker First pass of stripping uint	373	static int put_info(const char *str,INFO_TYPE info,uint32_t error,
77.3.7 by Monty Taylor Made mysql into a pure-C program.	374	const char *sql_state);
928.1.1 by Eric Day Started client changes.	375	static int put_error(drizzle_con_st con, drizzle_result_st res);
288 by Brian Aker ulong cleanp in client apps	376	static void safe_put_field(const char *pos,uint32_t length);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	377	static void init_pager(void);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	378	static void end_pager(void);
1 by brian clean slate	379	static void init_tee(const char *);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	380	static void end_tee(void);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	381	static const char* construct_prompt(void);
143 by Brian Aker Bool cleanup.	382	static char get_arg(char line, bool get_next_arg);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	383	static void init_username(void);
1 by brian clean slate	384	static void add_int_to_prompt(int toadd);
928.1.1 by Eric Day Started client changes.	385	static int get_result_width(drizzle_result_st *res);
928.1.1 by Eric Day Started client changes.	386	static int get_field_disp_length(drizzle_column_st * field);
266.6.1 by Andy Lester merging from main	387	static const char * strcont(register const char str, register const char set);
1 by brian clean slate	388
1441.3.1 by Vijay Samuel all required updations have been made	389	/* A class which contains information on the commands this program
	390	can understand. */
	391	class Commands
	392	{
	393	private:
202.1.25 by Monty Taylor Fixed change of mysql.com -> drizzle.com.	394	const char name; / User printable name of the function. */
	395	char cmd_char; /* msql command character */
1441.3.1 by Vijay Samuel all required updations have been made	396	public:
	397	Commands(const char *in_name,
	398	char in_cmd_char,
	399	int (in_func)(string str,const char *name),
	400	bool in_takes_params,
	401	const char *in_doc)
	402	:
	403	name(in_name),
	404	cmd_char(in_cmd_char),
	405	func(in_func),
	406	takes_params(in_takes_params),
	407	doc(in_doc)
	408	{}
	409
	410	Commands()
	411	:
	412	name(),
	413	cmd_char(),
	414	func(NULL),
	415	takes_params(false),
	416	doc()
	417	{}
	418
	419	int (func)(string str,const char );/ Function to call to do the job. */
	420
	421	const char *getName() const
	422	{
	423	return name;
	424	}
	425
	426	char getCmdChar() const
	427	{
	428	return cmd_char;
	429	}
	430
	431	bool getTakesParams() const
	432	{
	433	return takes_params;
	434	}
	435
	436	const char *getDoc() const
	437	{
	438	return doc;
	439	}
	440
	441	void setName(const char *in_name)
	442	{
	443	name= in_name;
	444	}
	445
	446	void setCmdChar(char in_cmd_char)
	447	{
	448	cmd_char= in_cmd_char;
	449	}
	450
	451	void setTakesParams(bool in_takes_params)
	452	{
	453	takes_params= in_takes_params;
	454	}
	455
	456	void setDoc(const char *in_doc)
	457	{
	458	doc= in_doc;
	459	}
460
461	private:
202.1.25 by Monty Taylor Fixed change of mysql.com -> drizzle.com.	462	bool takes_params; /* Max parameters for command */
	463	const char doc; / Documentation for this function. */
1441.3.1 by Vijay Samuel all required updations have been made	464	};
	465
	466
	467	static Commands commands[] = {
1441.3.3 by Vijay Samuel Changes made to the struct conversion	468	Commands( "?", '?', com_help, 0, N_("Synonym for `help'.") ),
	469	Commands( "clear", 'c', com_clear, 0, N_("Clear command.")),
	470	Commands( "connect",'r', com_connect,1,
	471	N_("Reconnect to the server. Optional arguments are db and host.")),
	472	Commands( "delimiter", 'd', com_delimiter, 1,
	473	N_("Set statement delimiter. NOTE: Takes the rest of the line as new delimiter.") ),
	474	Commands( "ego", 'G', com_ego, 0,
	475	N_("Send command to drizzle server, display result vertically.")),
	476	Commands( "exit", 'q', com_quit, 0, N_("Exit drizzle. Same as quit.")),
	477	Commands( "go", 'g', com_go, 0, N_("Send command to drizzle server.") ),
	478	Commands( "help", 'h', com_help, 0, N_("Display this help.") ),
	479	Commands( "nopager",'n', com_nopager,0, N_("Disable pager, print to stdout.") ),
	480	Commands( "notee", 't', com_notee, 0, N_("Don't write into outfile.") ),
	481	Commands( "pager", 'P', com_pager, 1,
	482	N_("Set PAGER [to_pager]. Print the query results via PAGER.") ),
	483	Commands( "print", 'p', com_print, 0, N_("Print current command.") ),
	484	Commands( "prompt", 'R', com_prompt, 1, N_("Change your drizzle prompt.")),
	485	Commands( "quit", 'q', com_quit, 0, N_("Quit drizzle.") ),
	486	Commands( "rehash", '#', com_rehash, 0, N_("Rebuild completion hash.") ),
	487	Commands( "source", '.', com_source, 1,
	488	N_("Execute an SQL script file. Takes a file name as an argument.")),
	489	Commands( "status", 's', com_status, 0, N_("Get status information from the server.")),
	490	Commands( "tee", 'T', com_tee, 1,
	491	N_("Set outfile [to_outfile]. Append everything into given outfile.") ),
	492	Commands( "use", 'u', com_use, 1,
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	493	N_("Use another schema. Takes schema name as argument.") ),
1954 by Brian Aker This adds the command "shutdown" to the command line client. It does require	494	Commands( "shutdown", 'u', com_shutdown, 1,
	495	N_("Shutdown the instance you are connected too.") ),
1441.3.3 by Vijay Samuel Changes made to the struct conversion	496	Commands( "warnings", 'W', com_warnings, 0,
	497	N_("Show warnings after every statement.") ),
	498	Commands( "nowarning", 'w', com_nowarnings, 0,
	499	N_("Don't show warnings after every statement.") ),
1 by brian clean slate	500	/* Get bash-like expansion for some commands */
1441.3.3 by Vijay Samuel Changes made to the struct conversion	501	Commands( "create table", 0, 0, 0, ""),
	502	Commands( "create database", 0, 0, 0, ""),
	503	Commands( "show databases", 0, 0, 0, ""),
	504	Commands( "show fields from", 0, 0, 0, ""),
	505	Commands( "show keys from", 0, 0, 0, ""),
	506	Commands( "show tables", 0, 0, 0, ""),
	507	Commands( "load data from", 0, 0, 0, ""),
	508	Commands( "alter table", 0, 0, 0, ""),
	509	Commands( "set option", 0, 0, 0, ""),
	510	Commands( "lock tables", 0, 0, 0, ""),
	511	Commands( "unlock tables", 0, 0, 0, ""),
1 by brian clean slate	512	/* generated 2006-12-28. Refresh occasionally from lexer. */
1441.3.3 by Vijay Samuel Changes made to the struct conversion	513	Commands( "ACTION", 0, 0, 0, ""),
	514	Commands( "ADD", 0, 0, 0, ""),
	515	Commands( "AFTER", 0, 0, 0, ""),
	516	Commands( "AGAINST", 0, 0, 0, ""),
	517	Commands( "AGGREGATE", 0, 0, 0, ""),
	518	Commands( "ALL", 0, 0, 0, ""),
	519	Commands( "ALGORITHM", 0, 0, 0, ""),
	520	Commands( "ALTER", 0, 0, 0, ""),
	521	Commands( "ANALYZE", 0, 0, 0, ""),
	522	Commands( "AND", 0, 0, 0, ""),
	523	Commands( "ANY", 0, 0, 0, ""),
	524	Commands( "AS", 0, 0, 0, ""),
	525	Commands( "ASC", 0, 0, 0, ""),
	526	Commands( "ASCII", 0, 0, 0, ""),
	527	Commands( "ASENSITIVE", 0, 0, 0, ""),
	528	Commands( "AUTO_INCREMENT", 0, 0, 0, ""),
	529	Commands( "AVG", 0, 0, 0, ""),
	530	Commands( "AVG_ROW_LENGTH", 0, 0, 0, ""),
	531	Commands( "BEFORE", 0, 0, 0, ""),
	532	Commands( "BEGIN", 0, 0, 0, ""),
	533	Commands( "BETWEEN", 0, 0, 0, ""),
	534	Commands( "BIGINT", 0, 0, 0, ""),
	535	Commands( "BINARY", 0, 0, 0, ""),
	536	Commands( "BIT", 0, 0, 0, ""),
	537	Commands( "BLOB", 0, 0, 0, ""),
	538	Commands( "BOOL", 0, 0, 0, ""),
	539	Commands( "BOOLEAN", 0, 0, 0, ""),
	540	Commands( "BOTH", 0, 0, 0, ""),
	541	Commands( "BTREE", 0, 0, 0, ""),
	542	Commands( "BY", 0, 0, 0, ""),
	543	Commands( "BYTE", 0, 0, 0, ""),
	544	Commands( "CACHE", 0, 0, 0, ""),
	545	Commands( "CALL", 0, 0, 0, ""),
	546	Commands( "CASCADE", 0, 0, 0, ""),
	547	Commands( "CASCADED", 0, 0, 0, ""),
	548	Commands( "CASE", 0, 0, 0, ""),
	549	Commands( "CHAIN", 0, 0, 0, ""),
	550	Commands( "CHANGE", 0, 0, 0, ""),
	551	Commands( "CHANGED", 0, 0, 0, ""),
	552	Commands( "CHAR", 0, 0, 0, ""),
	553	Commands( "CHARACTER", 0, 0, 0, ""),
	554	Commands( "CHECK", 0, 0, 0, ""),
	555	Commands( "CHECKSUM", 0, 0, 0, ""),
	556	Commands( "CLIENT", 0, 0, 0, ""),
	557	Commands( "CLOSE", 0, 0, 0, ""),
	558	Commands( "COLLATE", 0, 0, 0, ""),
	559	Commands( "COLLATION", 0, 0, 0, ""),
	560	Commands( "COLUMN", 0, 0, 0, ""),
	561	Commands( "COLUMNS", 0, 0, 0, ""),
	562	Commands( "COMMENT", 0, 0, 0, ""),
	563	Commands( "COMMIT", 0, 0, 0, ""),
	564	Commands( "COMMITTED", 0, 0, 0, ""),
	565	Commands( "COMPACT", 0, 0, 0, ""),
	566	Commands( "COMPRESSED", 0, 0, 0, ""),
	567	Commands( "CONCURRENT", 0, 0, 0, ""),
	568	Commands( "CONDITION", 0, 0, 0, ""),
	569	Commands( "CONNECTION", 0, 0, 0, ""),
	570	Commands( "CONSISTENT", 0, 0, 0, ""),
	571	Commands( "CONSTRAINT", 0, 0, 0, ""),
	572	Commands( "CONTAINS", 0, 0, 0, ""),
	573	Commands( "CONTINUE", 0, 0, 0, ""),
	574	Commands( "CONVERT", 0, 0, 0, ""),
	575	Commands( "CREATE", 0, 0, 0, ""),
	576	Commands( "CROSS", 0, 0, 0, ""),
577	Commands( "CUBE", 0, 0, 0, ""),
578	Commands( "CURRENT_DATE", 0, 0, 0, ""),
579	Commands( "CURRENT_TIMESTAMP", 0, 0, 0, ""),
580	Commands( "CURRENT_USER", 0, 0, 0, ""),
581	Commands( "CURSOR", 0, 0, 0, ""),
582	Commands( "DATA", 0, 0, 0, ""),
583	Commands( "DATABASE", 0, 0, 0, ""),
584	Commands( "DATABASES", 0, 0, 0, ""),
585	Commands( "DATE", 0, 0, 0, ""),
586	Commands( "DATETIME", 0, 0, 0, ""),
587	Commands( "DAY", 0, 0, 0, ""),
588	Commands( "DAY_HOUR", 0, 0, 0, ""),
589	Commands( "DAY_MICROSECOND", 0, 0, 0, ""),
590	Commands( "DAY_MINUTE", 0, 0, 0, ""),
591	Commands( "DAY_SECOND", 0, 0, 0, ""),
592	Commands( "DEALLOCATE", 0, 0, 0, ""),
593	Commands( "DEC", 0, 0, 0, ""),
594	Commands( "DECIMAL", 0, 0, 0, ""),
595	Commands( "DECLARE", 0, 0, 0, ""),
596	Commands( "DEFAULT", 0, 0, 0, ""),
597	Commands( "DEFINER", 0, 0, 0, ""),
598	Commands( "DELAYED", 0, 0, 0, ""),
599	Commands( "DELETE", 0, 0, 0, ""),
600	Commands( "DESC", 0, 0, 0, ""),
601	Commands( "DESCRIBE", 0, 0, 0, ""),
602	Commands( "DETERMINISTIC", 0, 0, 0, ""),
603	Commands( "DISABLE", 0, 0, 0, ""),
604	Commands( "DISCARD", 0, 0, 0, ""),
605	Commands( "DISTINCT", 0, 0, 0, ""),
606	Commands( "DISTINCTROW", 0, 0, 0, ""),
607	Commands( "DIV", 0, 0, 0, ""),
608	Commands( "DOUBLE", 0, 0, 0, ""),
609	Commands( "DROP", 0, 0, 0, ""),
610	Commands( "DUMPFILE", 0, 0, 0, ""),
611	Commands( "DUPLICATE", 0, 0, 0, ""),
612	Commands( "DYNAMIC", 0, 0, 0, ""),
613	Commands( "EACH", 0, 0, 0, ""),
614	Commands( "ELSE", 0, 0, 0, ""),
615	Commands( "ELSEIF", 0, 0, 0, ""),
616	Commands( "ENABLE", 0, 0, 0, ""),
617	Commands( "ENCLOSED", 0, 0, 0, ""),
618	Commands( "END", 0, 0, 0, ""),
619	Commands( "ENGINE", 0, 0, 0, ""),
620	Commands( "ENGINES", 0, 0, 0, ""),
621	Commands( "ENUM", 0, 0, 0, ""),
622	Commands( "ERRORS", 0, 0, 0, ""),
623	Commands( "ESCAPE", 0, 0, 0, ""),
624	Commands( "ESCAPED", 0, 0, 0, ""),
625	Commands( "EXISTS", 0, 0, 0, ""),
626	Commands( "EXIT", 0, 0, 0, ""),
627	Commands( "EXPLAIN", 0, 0, 0, ""),
628	Commands( "EXTENDED", 0, 0, 0, ""),
629	Commands( "FALSE", 0, 0, 0, ""),
630	Commands( "FAST", 0, 0, 0, ""),
631	Commands( "FETCH", 0, 0, 0, ""),
632	Commands( "FIELDS", 0, 0, 0, ""),
633	Commands( "FILE", 0, 0, 0, ""),
634	Commands( "FIRST", 0, 0, 0, ""),
635	Commands( "FIXED", 0, 0, 0, ""),
636	Commands( "FLOAT", 0, 0, 0, ""),
637	Commands( "FLOAT4", 0, 0, 0, ""),
638	Commands( "FLOAT8", 0, 0, 0, ""),
639	Commands( "FLUSH", 0, 0, 0, ""),
640	Commands( "FOR", 0, 0, 0, ""),
641	Commands( "FORCE", 0, 0, 0, ""),
642	Commands( "FOREIGN", 0, 0, 0, ""),
643	Commands( "FOUND", 0, 0, 0, ""),
644	Commands( "FRAC_SECOND", 0, 0, 0, ""),
645	Commands( "FROM", 0, 0, 0, ""),
646	Commands( "FULL", 0, 0, 0, ""),
647	Commands( "FUNCTION", 0, 0, 0, ""),
648	Commands( "GLOBAL", 0, 0, 0, ""),
649	Commands( "GRANT", 0, 0, 0, ""),
650	Commands( "GRANTS", 0, 0, 0, ""),
651	Commands( "GROUP", 0, 0, 0, ""),
652	Commands( "HANDLER", 0, 0, 0, ""),
653	Commands( "HASH", 0, 0, 0, ""),
654	Commands( "HAVING", 0, 0, 0, ""),
655	Commands( "HELP", 0, 0, 0, ""),
656	Commands( "HIGH_PRIORITY", 0, 0, 0, ""),
657	Commands( "HOSTS", 0, 0, 0, ""),
658	Commands( "HOUR", 0, 0, 0, ""),
659	Commands( "HOUR_MICROSECOND", 0, 0, 0, ""),
660	Commands( "HOUR_MINUTE", 0, 0, 0, ""),
661	Commands( "HOUR_SECOND", 0, 0, 0, ""),
662	Commands( "IDENTIFIED", 0, 0, 0, ""),
663	Commands( "IF", 0, 0, 0, ""),
664	Commands( "IGNORE", 0, 0, 0, ""),
665	Commands( "IMPORT", 0, 0, 0, ""),
666	Commands( "IN", 0, 0, 0, ""),
667	Commands( "INDEX", 0, 0, 0, ""),
668	Commands( "INDEXES", 0, 0, 0, ""),
669	Commands( "INFILE", 0, 0, 0, ""),
670	Commands( "INNER", 0, 0, 0, ""),
671	Commands( "INNOBASE", 0, 0, 0, ""),
672	Commands( "INNODB", 0, 0, 0, ""),
673	Commands( "INOUT", 0, 0, 0, ""),
674	Commands( "INSENSITIVE", 0, 0, 0, ""),
675	Commands( "INSERT", 0, 0, 0, ""),
676	Commands( "INSERT_METHOD", 0, 0, 0, ""),
677	Commands( "INT", 0, 0, 0, ""),
678	Commands( "INT1", 0, 0, 0, ""),
679	Commands( "INT2", 0, 0, 0, ""),
680	Commands( "INT3", 0, 0, 0, ""),
681	Commands( "INT4", 0, 0, 0, ""),
682	Commands( "INT8", 0, 0, 0, ""),
683	Commands( "INTEGER", 0, 0, 0, ""),
684	Commands( "INTERVAL", 0, 0, 0, ""),
685	Commands( "INTO", 0, 0, 0, ""),
686	Commands( "IO_THREAD", 0, 0, 0, ""),
687	Commands( "IS", 0, 0, 0, ""),
688	Commands( "ISOLATION", 0, 0, 0, ""),
689	Commands( "ISSUER", 0, 0, 0, ""),
690	Commands( "ITERATE", 0, 0, 0, ""),
691	Commands( "INVOKER", 0, 0, 0, ""),
692	Commands( "JOIN", 0, 0, 0, ""),
693	Commands( "KEY", 0, 0, 0, ""),
694	Commands( "KEYS", 0, 0, 0, ""),
695	Commands( "KILL", 0, 0, 0, ""),
696	Commands( "LANGUAGE", 0, 0, 0, ""),
697	Commands( "LAST", 0, 0, 0, ""),
698	Commands( "LEADING", 0, 0, 0, ""),
699	Commands( "LEAVE", 0, 0, 0, ""),
700	Commands( "LEAVES", 0, 0, 0, ""),
701	Commands( "LEFT", 0, 0, 0, ""),
702	Commands( "LEVEL", 0, 0, 0, ""),
703	Commands( "LIKE", 0, 0, 0, ""),
704	Commands( "LIMIT", 0, 0, 0, ""),
705	Commands( "LINES", 0, 0, 0, ""),
706	Commands( "LINESTRING", 0, 0, 0, ""),
707	Commands( "LOAD", 0, 0, 0, ""),
708	Commands( "LOCAL", 0, 0, 0, ""),
709	Commands( "LOCALTIMESTAMP", 0, 0, 0, ""),
710	Commands( "LOCK", 0, 0, 0, ""),
711	Commands( "LOCKS", 0, 0, 0, ""),
712	Commands( "LOGS", 0, 0, 0, ""),
713	Commands( "LONG", 0, 0, 0, ""),
714	Commands( "LOOP", 0, 0, 0, ""),
715	Commands( "MATCH", 0, 0, 0, ""),
716	Commands( "MAX_CONNECTIONS_PER_HOUR", 0, 0, 0, ""),
717	Commands( "MAX_QUERIES_PER_HOUR", 0, 0, 0, ""),
718	Commands( "MAX_ROWS", 0, 0, 0, ""),
719	Commands( "MAX_UPDATES_PER_HOUR", 0, 0, 0, ""),
720	Commands( "MAX_USER_CONNECTIONS", 0, 0, 0, ""),
721	Commands( "MEDIUM", 0, 0, 0, ""),
722	Commands( "MERGE", 0, 0, 0, ""),
723	Commands( "MICROSECOND", 0, 0, 0, ""),
724	Commands( "MIGRATE", 0, 0, 0, ""),
725	Commands( "MINUTE", 0, 0, 0, ""),
726	Commands( "MINUTE_MICROSECOND", 0, 0, 0, ""),
727	Commands( "MINUTE_SECOND", 0, 0, 0, ""),
728	Commands( "MIN_ROWS", 0, 0, 0, ""),
729	Commands( "MOD", 0, 0, 0, ""),
730	Commands( "MODE", 0, 0, 0, ""),
731	Commands( "MODIFIES", 0, 0, 0, ""),
732	Commands( "MODIFY", 0, 0, 0, ""),
733	Commands( "MONTH", 0, 0, 0, ""),
734	Commands( "MULTILINESTRING", 0, 0, 0, ""),
735	Commands( "MULTIPOINT", 0, 0, 0, ""),
736	Commands( "MULTIPOLYGON", 0, 0, 0, ""),
737	Commands( "MUTEX", 0, 0, 0, ""),
738	Commands( "NAME", 0, 0, 0, ""),
739	Commands( "NAMES", 0, 0, 0, ""),
740	Commands( "NATIONAL", 0, 0, 0, ""),
741	Commands( "NATURAL", 0, 0, 0, ""),
742	Commands( "NCHAR", 0, 0, 0, ""),
743	Commands( "NEW", 0, 0, 0, ""),
744	Commands( "NEXT", 0, 0, 0, ""),
745	Commands( "NO", 0, 0, 0, ""),
746	Commands( "NONE", 0, 0, 0, ""),
747	Commands( "NOT", 0, 0, 0, ""),
748	Commands( "NULL", 0, 0, 0, ""),
749	Commands( "NUMERIC", 0, 0, 0, ""),
750	Commands( "NVARCHAR", 0, 0, 0, ""),
751	Commands( "OFFSET", 0, 0, 0, ""),
752	Commands( "ON", 0, 0, 0, ""),
753	Commands( "ONE", 0, 0, 0, ""),
754	Commands( "ONE_SHOT", 0, 0, 0, ""),
755	Commands( "OPEN", 0, 0, 0, ""),
756	Commands( "OPTIMIZE", 0, 0, 0, ""),
757	Commands( "OPTION", 0, 0, 0, ""),
758	Commands( "OPTIONALLY", 0, 0, 0, ""),
759	Commands( "OR", 0, 0, 0, ""),
760	Commands( "ORDER", 0, 0, 0, ""),
761	Commands( "OUT", 0, 0, 0, ""),
762	Commands( "OUTER", 0, 0, 0, ""),
763	Commands( "OUTFILE", 0, 0, 0, ""),
764	Commands( "PACK_KEYS", 0, 0, 0, ""),
765	Commands( "PARTIAL", 0, 0, 0, ""),
766	Commands( "PASSWORD", 0, 0, 0, ""),
767	Commands( "PHASE", 0, 0, 0, ""),
768	Commands( "PRECISION", 0, 0, 0, ""),
769	Commands( "PREPARE", 0, 0, 0, ""),
770	Commands( "PREV", 0, 0, 0, ""),
771	Commands( "PRIMARY", 0, 0, 0, ""),
772	Commands( "PRIVILEGES", 0, 0, 0, ""),
773	Commands( "PROCEDURE", 0, 0, 0, ""),
774	Commands( "PROCESS", 0, 0, 0, ""),
775	Commands( "PROCESSLIST", 0, 0, 0, ""),
776	Commands( "PURGE", 0, 0, 0, ""),
777	Commands( "QUARTER", 0, 0, 0, ""),
778	Commands( "QUERY", 0, 0, 0, ""),
779	Commands( "QUICK", 0, 0, 0, ""),
780	Commands( "READ", 0, 0, 0, ""),
781	Commands( "READS", 0, 0, 0, ""),
782	Commands( "REAL", 0, 0, 0, ""),
783	Commands( "RECOVER", 0, 0, 0, ""),
784	Commands( "REDUNDANT", 0, 0, 0, ""),
785	Commands( "REFERENCES", 0, 0, 0, ""),
786	Commands( "REGEXP", 0, 0, 0, ""),
787	Commands( "RELEASE", 0, 0, 0, ""),
788	Commands( "RELOAD", 0, 0, 0, ""),
789	Commands( "RENAME", 0, 0, 0, ""),
790	Commands( "REPAIR", 0, 0, 0, ""),
791	Commands( "REPEATABLE", 0, 0, 0, ""),
792	Commands( "REPLACE", 0, 0, 0, ""),
793	Commands( "REPEAT", 0, 0, 0, ""),
794	Commands( "REQUIRE", 0, 0, 0, ""),
795	Commands( "RESET", 0, 0, 0, ""),
796	Commands( "RESTORE", 0, 0, 0, ""),
797	Commands( "RESTRICT", 0, 0, 0, ""),
798	Commands( "RESUME", 0, 0, 0, ""),
799	Commands( "RETURN", 0, 0, 0, ""),
800	Commands( "RETURNS", 0, 0, 0, ""),
801	Commands( "REVOKE", 0, 0, 0, ""),
802	Commands( "RIGHT", 0, 0, 0, ""),
803	Commands( "RLIKE", 0, 0, 0, ""),
804	Commands( "ROLLBACK", 0, 0, 0, ""),
805	Commands( "ROLLUP", 0, 0, 0, ""),
806	Commands( "ROUTINE", 0, 0, 0, ""),
807	Commands( "ROW", 0, 0, 0, ""),
808	Commands( "ROWS", 0, 0, 0, ""),
809	Commands( "ROW_FORMAT", 0, 0, 0, ""),
810	Commands( "RTREE", 0, 0, 0, ""),
811	Commands( "SAVEPOINT", 0, 0, 0, ""),
812	Commands( "SCHEMA", 0, 0, 0, ""),
813	Commands( "SCHEMAS", 0, 0, 0, ""),
814	Commands( "SECOND", 0, 0, 0, ""),
815	Commands( "SECOND_MICROSECOND", 0, 0, 0, ""),
816	Commands( "SECURITY", 0, 0, 0, ""),
817	Commands( "SELECT", 0, 0, 0, ""),
818	Commands( "SENSITIVE", 0, 0, 0, ""),
819	Commands( "SEPARATOR", 0, 0, 0, ""),
820	Commands( "SERIAL", 0, 0, 0, ""),
821	Commands( "SERIALIZABLE", 0, 0, 0, ""),
822	Commands( "SESSION", 0, 0, 0, ""),
823	Commands( "SET", 0, 0, 0, ""),
824	Commands( "SHARE", 0, 0, 0, ""),
825	Commands( "SHOW", 0, 0, 0, ""),
826	Commands( "SHUTDOWN", 0, 0, 0, ""),
827	Commands( "SIGNED", 0, 0, 0, ""),
828	Commands( "SIMPLE", 0, 0, 0, ""),
829	Commands( "SLAVE", 0, 0, 0, ""),
830	Commands( "SNAPSHOT", 0, 0, 0, ""),
831	Commands( "SOME", 0, 0, 0, ""),
832	Commands( "SONAME", 0, 0, 0, ""),
833	Commands( "SOUNDS", 0, 0, 0, ""),
834	Commands( "SPATIAL", 0, 0, 0, ""),
835	Commands( "SPECIFIC", 0, 0, 0, ""),
836	Commands( "SQL", 0, 0, 0, ""),
837	Commands( "SQLEXCEPTION", 0, 0, 0, ""),
838	Commands( "SQLSTATE", 0, 0, 0, ""),
839	Commands( "SQLWARNING", 0, 0, 0, ""),
840	Commands( "SQL_BIG_RESULT", 0, 0, 0, ""),
841	Commands( "SQL_BUFFER_RESULT", 0, 0, 0, ""),
842	Commands( "SQL_CACHE", 0, 0, 0, ""),
843	Commands( "SQL_CALC_FOUND_ROWS", 0, 0, 0, ""),
844	Commands( "SQL_NO_CACHE", 0, 0, 0, ""),
845	Commands( "SQL_SMALL_RESULT", 0, 0, 0, ""),
846	Commands( "SQL_THREAD", 0, 0, 0, ""),
847	Commands( "SQL_TSI_FRAC_SECOND", 0, 0, 0, ""),
848	Commands( "SQL_TSI_SECOND", 0, 0, 0, ""),
849	Commands( "SQL_TSI_MINUTE", 0, 0, 0, ""),
850	Commands( "SQL_TSI_HOUR", 0, 0, 0, ""),
851	Commands( "SQL_TSI_DAY", 0, 0, 0, ""),
852	Commands( "SQL_TSI_WEEK", 0, 0, 0, ""),
853	Commands( "SQL_TSI_MONTH", 0, 0, 0, ""),
854	Commands( "SQL_TSI_QUARTER", 0, 0, 0, ""),
855	Commands( "SQL_TSI_YEAR", 0, 0, 0, ""),
856	Commands( "SSL", 0, 0, 0, ""),
857	Commands( "START", 0, 0, 0, ""),
858	Commands( "STARTING", 0, 0, 0, ""),
859	Commands( "STATUS", 0, 0, 0, ""),
860	Commands( "STOP", 0, 0, 0, ""),
861	Commands( "STORAGE", 0, 0, 0, ""),
862	Commands( "STRAIGHT_JOIN", 0, 0, 0, ""),
863	Commands( "STRING", 0, 0, 0, ""),
864	Commands( "STRIPED", 0, 0, 0, ""),
865	Commands( "SUBJECT", 0, 0, 0, ""),
866	Commands( "SUPER", 0, 0, 0, ""),
867	Commands( "SUSPEND", 0, 0, 0, ""),
868	Commands( "TABLE", 0, 0, 0, ""),
869	Commands( "TABLES", 0, 0, 0, ""),
870	Commands( "TABLESPACE", 0, 0, 0, ""),
871	Commands( "TEMPORARY", 0, 0, 0, ""),
872	Commands( "TEMPTABLE", 0, 0, 0, ""),
873	Commands( "TERMINATED", 0, 0, 0, ""),
874	Commands( "TEXT", 0, 0, 0, ""),
875	Commands( "THEN", 0, 0, 0, ""),
876	Commands( "TIMESTAMP", 0, 0, 0, ""),
877	Commands( "TIMESTAMPADD", 0, 0, 0, ""),
878	Commands( "TIMESTAMPDIFF", 0, 0, 0, ""),
879	Commands( "TO", 0, 0, 0, ""),
880	Commands( "TRAILING", 0, 0, 0, ""),
881	Commands( "TRANSACTION", 0, 0, 0, ""),
882	Commands( "TRUE", 0, 0, 0, ""),
883	Commands( "TRUNCATE", 0, 0, 0, ""),
884	Commands( "TYPE", 0, 0, 0, ""),
885	Commands( "TYPES", 0, 0, 0, ""),
886	Commands( "UNCOMMITTED", 0, 0, 0, ""),
887	Commands( "UNDEFINED", 0, 0, 0, ""),
888	Commands( "UNDO", 0, 0, 0, ""),
889	Commands( "UNICODE", 0, 0, 0, ""),
890	Commands( "UNION", 0, 0, 0, ""),
891	Commands( "UNIQUE", 0, 0, 0, ""),
892	Commands( "UNKNOWN", 0, 0, 0, ""),
893	Commands( "UNLOCK", 0, 0, 0, ""),
894	Commands( "UNTIL", 0, 0, 0, ""),
895	Commands( "UPDATE", 0, 0, 0, ""),
896	Commands( "UPGRADE", 0, 0, 0, ""),
897	Commands( "USAGE", 0, 0, 0, ""),
898	Commands( "USE", 0, 0, 0, ""),
899	Commands( "USER", 0, 0, 0, ""),
900	Commands( "USER_RESOURCES", 0, 0, 0, ""),
901	Commands( "USING", 0, 0, 0, ""),
902	Commands( "UTC_DATE", 0, 0, 0, ""),
903	Commands( "UTC_TIMESTAMP", 0, 0, 0, ""),
904	Commands( "VALUE", 0, 0, 0, ""),
905	Commands( "VALUES", 0, 0, 0, ""),
906	Commands( "VARBINARY", 0, 0, 0, ""),
907	Commands( "VARCHAR", 0, 0, 0, ""),
908	Commands( "VARCHARACTER", 0, 0, 0, ""),
909	Commands( "VARIABLES", 0, 0, 0, ""),
910	Commands( "VARYING", 0, 0, 0, ""),
911	Commands( "WARNINGS", 0, 0, 0, ""),
912	Commands( "WEEK", 0, 0, 0, ""),
913	Commands( "WHEN", 0, 0, 0, ""),
914	Commands( "WHERE", 0, 0, 0, ""),
915	Commands( "WHILE", 0, 0, 0, ""),
916	Commands( "VIEW", 0, 0, 0, ""),
917	Commands( "WITH", 0, 0, 0, ""),
918	Commands( "WORK", 0, 0, 0, ""),
919	Commands( "WRITE", 0, 0, 0, ""),
920	Commands( "XOR", 0, 0, 0, ""),
921	Commands( "XA", 0, 0, 0, ""),
922	Commands( "YEAR", 0, 0, 0, ""),
923	Commands( "YEAR_MONTH", 0, 0, 0, ""),
924	Commands( "ZEROFILL", 0, 0, 0, ""),
925	Commands( "ABS", 0, 0, 0, ""),
926	Commands( "ACOS", 0, 0, 0, ""),
927	Commands( "ADDDATE", 0, 0, 0, ""),
928	Commands( "AREA", 0, 0, 0, ""),
929	Commands( "ASIN", 0, 0, 0, ""),
930	Commands( "ASBINARY", 0, 0, 0, ""),
931	Commands( "ASTEXT", 0, 0, 0, ""),
932	Commands( "ATAN", 0, 0, 0, ""),
933	Commands( "ATAN2", 0, 0, 0, ""),
934	Commands( "BENCHMARK", 0, 0, 0, ""),
935	Commands( "BIN", 0, 0, 0, ""),
936	Commands( "BIT_OR", 0, 0, 0, ""),
937	Commands( "BIT_AND", 0, 0, 0, ""),
938	Commands( "BIT_XOR", 0, 0, 0, ""),
939	Commands( "CAST", 0, 0, 0, ""),
940	Commands( "CEIL", 0, 0, 0, ""),
941	Commands( "CEILING", 0, 0, 0, ""),
942	Commands( "CENTROID", 0, 0, 0, ""),
943	Commands( "CHAR_LENGTH", 0, 0, 0, ""),
944	Commands( "CHARACTER_LENGTH", 0, 0, 0, ""),
945	Commands( "COALESCE", 0, 0, 0, ""),
946	Commands( "COERCIBILITY", 0, 0, 0, ""),
947	Commands( "COMPRESS", 0, 0, 0, ""),
948	Commands( "CONCAT", 0, 0, 0, ""),
949	Commands( "CONCAT_WS", 0, 0, 0, ""),
950	Commands( "CONNECTION_ID", 0, 0, 0, ""),
951	Commands( "CONV", 0, 0, 0, ""),
952	Commands( "CONVERT_TZ", 0, 0, 0, ""),
953	Commands( "COUNT", 0, 0, 0, ""),
954	Commands( "COS", 0, 0, 0, ""),
955	Commands( "COT", 0, 0, 0, ""),
956	Commands( "CRC32", 0, 0, 0, ""),
957	Commands( "CROSSES", 0, 0, 0, ""),
958	Commands( "CURDATE", 0, 0, 0, ""),
959	Commands( "DATE_ADD", 0, 0, 0, ""),
960	Commands( "DATEDIFF", 0, 0, 0, ""),
961	Commands( "DATE_FORMAT", 0, 0, 0, ""),
962	Commands( "DATE_SUB", 0, 0, 0, ""),
963	Commands( "DAYNAME", 0, 0, 0, ""),
964	Commands( "DAYOFMONTH", 0, 0, 0, ""),
965	Commands( "DAYOFWEEK", 0, 0, 0, ""),
966	Commands( "DAYOFYEAR", 0, 0, 0, ""),
967	Commands( "DECODE", 0, 0, 0, ""),
968	Commands( "DEGREES", 0, 0, 0, ""),
969	Commands( "DES_ENCRYPT", 0, 0, 0, ""),
970	Commands( "DES_DECRYPT", 0, 0, 0, ""),
971	Commands( "DIMENSION", 0, 0, 0, ""),
972	Commands( "DISJOINT", 0, 0, 0, ""),
973	Commands( "ELT", 0, 0, 0, ""),
974	Commands( "ENCODE", 0, 0, 0, ""),
975	Commands( "ENCRYPT", 0, 0, 0, ""),
976	Commands( "ENDPOINT", 0, 0, 0, ""),
977	Commands( "ENVELOPE", 0, 0, 0, ""),
978	Commands( "EQUALS", 0, 0, 0, ""),
979	Commands( "EXTERIORRING", 0, 0, 0, ""),
980	Commands( "EXTRACT", 0, 0, 0, ""),
981	Commands( "EXP", 0, 0, 0, ""),
982	Commands( "EXPORT_SET", 0, 0, 0, ""),
983	Commands( "FIELD", 0, 0, 0, ""),
984	Commands( "FIND_IN_SET", 0, 0, 0, ""),
985	Commands( "FLOOR", 0, 0, 0, ""),
986	Commands( "FORMAT", 0, 0, 0, ""),
987	Commands( "FOUND_ROWS", 0, 0, 0, ""),
988	Commands( "FROM_DAYS", 0, 0, 0, ""),
989	Commands( "FROM_UNIXTIME", 0, 0, 0, ""),
990	Commands( "GET_LOCK", 0, 0, 0, ""),
991	Commands( "GLENGTH", 0, 0, 0, ""),
992	Commands( "GREATEST", 0, 0, 0, ""),
993	Commands( "GROUP_CONCAT", 0, 0, 0, ""),
994	Commands( "GROUP_UNIQUE_USERS", 0, 0, 0, ""),
995	Commands( "HEX", 0, 0, 0, ""),
996	Commands( "IFNULL", 0, 0, 0, ""),
997	Commands( "INSTR", 0, 0, 0, ""),
998	Commands( "INTERIORRINGN", 0, 0, 0, ""),
999	Commands( "INTERSECTS", 0, 0, 0, ""),
1000	Commands( "ISCLOSED", 0, 0, 0, ""),
1001	Commands( "ISEMPTY", 0, 0, 0, ""),
1002	Commands( "ISNULL", 0, 0, 0, ""),
1003	Commands( "IS_FREE_LOCK", 0, 0, 0, ""),
1004	Commands( "IS_USED_LOCK", 0, 0, 0, ""),
1005	Commands( "LAST_INSERT_ID", 0, 0, 0, ""),
1006	Commands( "ISSIMPLE", 0, 0, 0, ""),
1007	Commands( "LAST_DAY", 0, 0, 0, ""),
1008	Commands( "LCASE", 0, 0, 0, ""),
1009	Commands( "LEAST", 0, 0, 0, ""),
1010	Commands( "LENGTH", 0, 0, 0, ""),
1011	Commands( "LN", 0, 0, 0, ""),
1012	Commands( "LOAD_FILE", 0, 0, 0, ""),
1013	Commands( "LOCATE", 0, 0, 0, ""),
1014	Commands( "LOG", 0, 0, 0, ""),
1015	Commands( "LOG2", 0, 0, 0, ""),
1016	Commands( "LOG10", 0, 0, 0, ""),
1017	Commands( "LOWER", 0, 0, 0, ""),
1018	Commands( "LPAD", 0, 0, 0, ""),
1019	Commands( "LTRIM", 0, 0, 0, ""),
1020	Commands( "MAKE_SET", 0, 0, 0, ""),
1021	Commands( "MAKEDATE", 0, 0, 0, ""),
1022	Commands( "MASTER_POS_WAIT", 0, 0, 0, ""),
1023	Commands( "MAX", 0, 0, 0, ""),
1024	Commands( "MBRCONTAINS", 0, 0, 0, ""),
1025	Commands( "MBRDISJOINT", 0, 0, 0, ""),
1026	Commands( "MBREQUAL", 0, 0, 0, ""),
1027	Commands( "MBRINTERSECTS", 0, 0, 0, ""),
1028	Commands( "MBROVERLAPS", 0, 0, 0, ""),
1029	Commands( "MBRTOUCHES", 0, 0, 0, ""),
1030	Commands( "MBRWITHIN", 0, 0, 0, ""),
1031	Commands( "MD5", 0, 0, 0, ""),
1032	Commands( "MID", 0, 0, 0, ""),
1033	Commands( "MIN", 0, 0, 0, ""),
1034	Commands( "MONTHNAME", 0, 0, 0, ""),
1035	Commands( "NAME_CONST", 0, 0, 0, ""),
1036	Commands( "NOW", 0, 0, 0, ""),
1037	Commands( "NULLIF", 0, 0, 0, ""),
1038	Commands( "NUMPOINTS", 0, 0, 0, ""),
1039	Commands( "OCTET_LENGTH", 0, 0, 0, ""),
1040	Commands( "OCT", 0, 0, 0, ""),
1041	Commands( "ORD", 0, 0, 0, ""),
1042	Commands( "OVERLAPS", 0, 0, 0, ""),
1043	Commands( "PERIOD_ADD", 0, 0, 0, ""),
1044	Commands( "PERIOD_DIFF", 0, 0, 0, ""),
1045	Commands( "PI", 0, 0, 0, ""),
1046	Commands( "POINTN", 0, 0, 0, ""),
1047	Commands( "POSITION", 0, 0, 0, ""),
1048	Commands( "POW", 0, 0, 0, ""),
1049	Commands( "POWER", 0, 0, 0, ""),
1050	Commands( "QUOTE", 0, 0, 0, ""),
1051	Commands( "RADIANS", 0, 0, 0, ""),
1052	Commands( "RAND", 0, 0, 0, ""),
1053	Commands( "RELEASE_LOCK", 0, 0, 0, ""),
1054	Commands( "REVERSE", 0, 0, 0, ""),
1055	Commands( "ROUND", 0, 0, 0, ""),
1056	Commands( "ROW_COUNT", 0, 0, 0, ""),
1057	Commands( "RPAD", 0, 0, 0, ""),
1058	Commands( "RTRIM", 0, 0, 0, ""),
1059	Commands( "SESSION_USER", 0, 0, 0, ""),
1060	Commands( "SUBDATE", 0, 0, 0, ""),
1061	Commands( "SIGN", 0, 0, 0, ""),
1062	Commands( "SIN", 0, 0, 0, ""),
1063	Commands( "SHA", 0, 0, 0, ""),
1064	Commands( "SHA1", 0, 0, 0, ""),
1065	Commands( "SLEEP", 0, 0, 0, ""),
1066	Commands( "SOUNDEX", 0, 0, 0, ""),
1067	Commands( "SPACE", 0, 0, 0, ""),
1068	Commands( "SQRT", 0, 0, 0, ""),
1069	Commands( "SRID", 0, 0, 0, ""),
1070	Commands( "STARTPOINT", 0, 0, 0, ""),
1071	Commands( "STD", 0, 0, 0, ""),
1072	Commands( "STDDEV", 0, 0, 0, ""),
1073	Commands( "STDDEV_POP", 0, 0, 0, ""),
1074	Commands( "STDDEV_SAMP", 0, 0, 0, ""),
1075	Commands( "STR_TO_DATE", 0, 0, 0, ""),
1076	Commands( "STRCMP", 0, 0, 0, ""),
1077	Commands( "SUBSTR", 0, 0, 0, ""),
1078	Commands( "SUBSTRING", 0, 0, 0, ""),
1079	Commands( "SUBSTRING_INDEX", 0, 0, 0, ""),
1080	Commands( "SUM", 0, 0, 0, ""),
1081	Commands( "SYSDATE", 0, 0, 0, ""),
1082	Commands( "SYSTEM_USER", 0, 0, 0, ""),
1083	Commands( "TAN", 0, 0, 0, ""),
1084	Commands( "TIME_FORMAT", 0, 0, 0, ""),
1085	Commands( "TO_DAYS", 0, 0, 0, ""),
1086	Commands( "TOUCHES", 0, 0, 0, ""),
1087	Commands( "TRIM", 0, 0, 0, ""),
1088	Commands( "UCASE", 0, 0, 0, ""),
1089	Commands( "UNCOMPRESS", 0, 0, 0, ""),
1090	Commands( "UNCOMPRESSED_LENGTH", 0, 0, 0, ""),
1091	Commands( "UNHEX", 0, 0, 0, ""),
1092	Commands( "UNIQUE_USERS", 0, 0, 0, ""),
1093	Commands( "UNIX_TIMESTAMP", 0, 0, 0, ""),
1094	Commands( "UPPER", 0, 0, 0, ""),
1095	Commands( "UUID", 0, 0, 0, ""),
1096	Commands( "VARIANCE", 0, 0, 0, ""),
1097	Commands( "VAR_POP", 0, 0, 0, ""),
1098	Commands( "VAR_SAMP", 0, 0, 0, ""),
1099	Commands( "VERSION", 0, 0, 0, ""),
1100	Commands( "WEEKDAY", 0, 0, 0, ""),
1101	Commands( "WEEKOFYEAR", 0, 0, 0, ""),
1102	Commands( "WITHIN", 0, 0, 0, ""),
1103	Commands( "X", 0, 0, 0, ""),
1104	Commands( "Y", 0, 0, 0, ""),
1105	Commands( "YEARWEEK", 0, 0, 0, ""),
1 by brian clean slate	1106	/* end sentinel */
1441.3.3 by Vijay Samuel Changes made to the struct conversion	1107	Commands((char *)NULL, 0, 0, 0, "")
1 by brian clean slate	1108	};
	1109
	1110
77.3.18 by Monty Taylor Merged in codestyle.	1111	int history_length;
1 by brian clean slate	1112	static int not_in_history(const char *line);
1567.5.2 by Vijay Samuel Merge OSX fix for client drizzle.	1113	static void initialize_readline (char *name);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	1114	static void fix_history(string *final_command);
1 by brian clean slate	1115
1441.3.1 by Vijay Samuel all required updations have been made	1116	static Commands find_command(const char name,char cmd_name);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	1117	static bool add_line(string buffer,char line,char *in_string,
1 by brian clean slate	1118	bool *ml_comment);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	1119	static void remove_cntrl(string *buffer);
928.1.1 by Eric Day Started client changes.	1120	static void print_table_data(drizzle_result_st *result);
	1121	static void print_tab_data(drizzle_result_st *result);
	1122	static void print_table_data_vertically(drizzle_result_st *result);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	1123	static void print_warnings(uint32_t error_code);
288 by Brian Aker ulong cleanp in client apps	1124	static uint32_t start_timer(void);
	1125	static void end_timer(uint32_t start_time,char *buff);
	1126	static void drizzle_end_timer(uint32_t start_time,char *buff);
1 by brian clean slate	1127	static void nice_time(double sec,char *buff,bool part_second);
779.2.11 by Monty Taylor General build cleanup - removed cruft, removed depreated checks.	1128	extern "C" void drizzle_end(int sig);
	1129	extern "C" void handle_sigint(int sig);
1 by brian clean slate	1130	#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
779.2.11 by Monty Taylor General build cleanup - removed cruft, removed depreated checks.	1131	static void window_resize(int sig);
1 by brian clean slate	1132	#endif
1 by brian clean slate	1133
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1134	/**
	1135	Shutdown the server that we are currently connected to.
	1136
	1137	@retval
1441.3.1 by Vijay Samuel all required updations have been made	1138	true success
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1139	@retval
1441.3.1 by Vijay Samuel all required updations have been made	1140	false failure
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1141	*/
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1142	static bool server_shutdown(void)
	1143	{
	1144	drizzle_result_st result;
	1145	drizzle_return_t ret;
	1146
	1147	if (verbose)
	1148	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1149	printf(_("shutting down drizzled"));
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1150	if (opt_drizzle_port > 0)
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1151	printf(_(" on port %d"), opt_drizzle_port);
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1152	printf("... ");
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1153	}
	1154
	1155	if (drizzle_shutdown(&con, &result, DRIZZLE_SHUTDOWN_DEFAULT,
	1156	&ret) == NULL \|\| ret != DRIZZLE_RETURN_OK)
	1157	{
	1158	if (ret == DRIZZLE_RETURN_ERROR_CODE)
	1159	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1160	fprintf(stderr, _("shutdown failed; error: '%s'"),
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1161	drizzle_result_error(&result));
	1162	drizzle_result_free(&result);
	1163	}
	1164	else
	1165	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1166	fprintf(stderr, _("shutdown failed; error: '%s'"),
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1167	drizzle_con_error(&con));
	1168	}
	1169	return false;
	1170	}
	1171
	1172	drizzle_result_free(&result);
	1173
	1174	if (verbose)
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1175	printf(_("done\n"));
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1176
	1177	return true;
	1178	}
	1179
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1180	/**
	1181	Ping the server that we are currently connected to.
	1182
	1183	@retval
1441.3.1 by Vijay Samuel all required updations have been made	1184	true success
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1185	@retval
1441.3.1 by Vijay Samuel all required updations have been made	1186	false failure
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1187	*/
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1188	static bool server_ping(void)
	1189	{
	1190	drizzle_result_st result;
	1191	drizzle_return_t ret;
	1192
	1193	if (drizzle_ping(&con, &result, &ret) != NULL && ret == DRIZZLE_RETURN_OK)
	1194	{
	1195	if (opt_silent < 2)
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1196	printf(_("drizzled is alive\n"));
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1197	}
	1198	else
	1199	{
	1200	if (ret == DRIZZLE_RETURN_ERROR_CODE)
	1201	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1202	fprintf(stderr, _("ping failed; error: '%s'"),
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1203	drizzle_result_error(&result));
	1204	drizzle_result_free(&result);
	1205	}
	1206	else
	1207	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1208	fprintf(stderr, _("drizzled won't answer to ping, error: '%s'"),
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1209	drizzle_con_error(&con));
	1210	}
	1211	return false;
	1212	}
	1213	drizzle_result_free(&result);
	1214	return true;
	1215	}
	1216
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1217	/**
	1218	Execute command(s) specified by the user.
	1219
	1220	@param error error status of command execution.
1441.3.1 by Vijay Samuel all required updations have been made	1221	If an error had occurred, this variable will be set
	1222	to 1 whereas on success, it shall be set to 0. This
	1223	value will be supplied to the exit() function used
	1224	by the caller.
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1225
	1226	@retval
1441.3.1 by Vijay Samuel all required updations have been made	1227	false no commands were executed
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1228	@retval
1441.3.1 by Vijay Samuel all required updations have been made	1229	true at least one command was executed
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1230	*/
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1231	static bool execute_commands(int *error)
	1232	{
	1233	bool executed= false;
	1234	*error= 0;
	1235
	1236	if (opt_ping)
	1237	{
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1238	if (server_ping() == false)
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1239	*error= 1;
	1240	executed= true;
	1241	}
	1242
	1243	if (opt_shutdown)
	1244	{
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1245	if (server_shutdown() == false)
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1246	*error= 1;
	1247	executed= true;
	1248	}
	1249	return executed;
	1250	}
	1251
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1252	static void check_timeout_value(uint32_t in_connect_timeout)
	1253	{
	1254	opt_connect_timeout= 0;
1567.5.3 by Vijay Samuel Merge patch for sql_connect() and style issue.	1255	if (in_connect_timeout > 3600*12)
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1256	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1257	cout << _("Error: Invalid Value for connect_timeout");
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1258	exit(-1);
	1259	}
	1260	opt_connect_timeout= in_connect_timeout;
	1261	}
	1262
	1263	static void check_max_input_line(uint32_t in_max_input_line)
	1264	{
	1265	opt_max_input_line= 0;
1700.1.1 by Vijay Samuel Merge fix for block_size corrections in client applications.	1266	if (in_max_input_line < 4096 \|\| in_max_input_line > (int64_t)21024L1024L*1024L)
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1267	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1268	cout << _("Error: Invalid Value for max_input_line");
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1269	exit(-1);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1270	}
1700.1.1 by Vijay Samuel Merge fix for block_size corrections in client applications.	1271	opt_max_input_line= in_max_input_line - (in_max_input_line % 1024);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1272	}
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1273
1 by brian clean slate	1274	int main(int argc,char *argv[])
1 by brian clean slate	1275	{
1567.3.5 by Vijay Samuel Refactored client.	1276	try
1567.3.5 by Vijay Samuel Refactored client.	1277	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1278
236.1.60 by Monty Taylor Another stab at protecting NLS stuff.	1279	#if defined(ENABLE_NLS)
	1280	# if defined(HAVE_LOCALE_H)
202.3.2 by Monty Taylor Added gettext calls in to my_getopt.c and drizzle.c	1281	setlocale(LC_ALL, "");
236.1.60 by Monty Taylor Another stab at protecting NLS stuff.	1282	# endif
2068.4.1 by Andrew Hutchings Fix intl domain	1283	bindtextdomain("drizzle7", LOCALEDIR);
2068.4.1 by Andrew Hutchings Fix intl domain	1284	textdomain("drizzle7");
236.1.60 by Monty Taylor Another stab at protecting NLS stuff.	1285	#endif
1567.3.8 by Vijay Samuel Refactor drizzle client.	1286
2068.4.1 by Andrew Hutchings Fix intl domain	1287	po::options_description commandline_options(_("Options used only in command line"));
1567.3.8 by Vijay Samuel Refactor drizzle client.	1288	commandline_options.add_options()
2068.4.1 by Andrew Hutchings Fix intl domain	1289	("help,?",_("Displays this help and exit."))
2068.4.1 by Andrew Hutchings Fix intl domain	1290	("batch,B",_("Don't use history file. Disable interactive behavior. (Enables --silent)"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1291	("column-type-info", po::value<bool>(&column_types_flag)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1292	_("Display column type information."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1293	("comments,c", po::value<bool>(&preserve_comments)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1294	_("Preserve comments. Send comments to the server. The default is --skip-comments (discard comments), enable with --comments"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1295	("vertical,E", po::value<bool>(&vertical)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1296	_("Print the output of a query (rows) vertically."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1297	("force,f", po::value<bool>(&ignore_errors)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1298	_("Continue even if we get an sql error."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1299	("named-commands,G", po::value<bool>(&named_cmds)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1300	_("Enable named commands. Named commands mean this program's internal commands; see drizzle> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1301	("no-beep,b", po::value<bool>(&opt_nobeep)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1302	_("Turn off beep on error."))
	1303	("disable-line-numbers", _("Do not write line numbers for errors."))
	1304	("disable-column-names", _("Do not write column names in results."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1305	("skip-column-names,N",
2068.4.1 by Andrew Hutchings Fix intl domain	1306	_("Don't write column names in results. WARNING: -N is deprecated, use long version of this options instead."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1307	("set-variable,O", po::value<string>(),
2068.4.1 by Andrew Hutchings Fix intl domain	1308	_("Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1309	("table,t", po::value<bool>(&output_tables)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1310	_("Output in table format."))
1757.5.1 by Andrew Hutchings Rework the boolean options so that true-by-default options change to --disable-option.	1311	("safe-updates,U", po::value<bool>(&safe_updates)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1312	_("Only allow UPDATE and DELETE that uses keys."))
1757.5.1 by Andrew Hutchings Rework the boolean options so that true-by-default options change to --disable-option.	1313	("i-am-a-dummy,U", po::value<bool>(&safe_updates)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1314	_("Synonym for option --safe-updates, -U."))
1923.3.4 by Andrew Hutchings Revert -v fix	1315	("verbose,v", po::value<string>(&opt_verbose)->default_value(""),
2068.4.1 by Andrew Hutchings Fix intl domain	1316	_("-v vvv implies that verbose= 3, Used to specify verbose"))
2068.4.1 by Andrew Hutchings Fix intl domain	1317	("version,V", _("Output version information and exit."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1318	("secure-auth", po::value<bool>(&opt_secure_auth)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1319	_("Refuse client connecting to server if it uses old (pre-4.1.1) protocol"))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1320	("show-warnings", po::value<bool>(&show_warnings)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1321	_("Show warnings after every statement."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1322	("show-progress-size", po::value<uint32_t>(&show_progress_size)->default_value(0),
2068.4.1 by Andrew Hutchings Fix intl domain	1323	_("Number of lines before each import progress report."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1324	("ping", po::value<bool>(&opt_ping)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1325	_("Ping the server to check if it's alive."))
1567.3.10 by Vijay Samuel Client refactored completely using boost::program_options.	1326	("no-defaults", po::value<bool>()->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1327	_("Configuration file defaults are not used if no-defaults is set"))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1328	;
1567.3.8 by Vijay Samuel Refactor drizzle client.	1329
2068.4.1 by Andrew Hutchings Fix intl domain	1330	po::options_description drizzle_options(_("Options specific to the drizzle client"));
1567.3.8 by Vijay Samuel Refactor drizzle client.	1331	drizzle_options.add_options()
1802.13.1 by Andrew Hutchings Fix -A option in drizzle client	1332	("disable-auto-rehash,A",
2068.4.1 by Andrew Hutchings Fix intl domain	1333	_("Disable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1334	("auto-vertical-output", po::value<bool>(&auto_vertical_output)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1335	_("Automatically switch to vertical output mode if the result is wider than the terminal width."))
1567.3.31 by Monty Taylor The default value for database should not be "test".	1336	("database,D", po::value<string>(&current_db)->default_value(""),
2068.4.1 by Andrew Hutchings Fix intl domain	1337	_("Database to use."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1338	("default-character-set",po::value<string>(),
2068.4.1 by Andrew Hutchings Fix intl domain	1339	_("(not used)"))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1340	("delimiter", po::value<string>(&delimiter_str)->default_value(";"),
2068.4.1 by Andrew Hutchings Fix intl domain	1341	_("Delimiter to be used."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1342	("execute,e", po::value<string>(),
2068.4.1 by Andrew Hutchings Fix intl domain	1343	_("Execute command and quit. (Disables --force and history file)"))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1344	("local-infile", po::value<bool>(&opt_local_infile)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1345	_("Enable LOAD DATA LOCAL INFILE."))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1346	("unbuffered,n", po::value<bool>(&unbuffered)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1347	_("Flush buffer after each query."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1348	("sigint-ignore", po::value<bool>(&opt_sigint_ignore)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1349	_("Ignore SIGINT (CTRL-C)"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1350	("one-database,o", po::value<bool>(&one_database)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1351	_("Only update the default database. This is useful for skipping updates to other database in the update log."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1352	("pager", po::value<string>(),
2068.4.1 by Andrew Hutchings Fix intl domain	1353	_("Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode. Disable with --disable-pager. This option is disabled by default."))
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1354	("disable-pager", po::value<bool>(&opt_nopager)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1355	_("Disable pager and print to stdout. See interactive help (\\h) also."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1356	("prompt", po::value<string>(&current_prompt)->default_value(""),
2068.4.1 by Andrew Hutchings Fix intl domain	1357	_("Set the drizzle prompt to this value."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1358	("quick,q", po::value<bool>(&quick)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1359	_("Don't cache result, print it row by row. This may slow down the server if the output is suspended. Doesn't use history file."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1360	("raw,r", po::value<bool>(&opt_raw_data)->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1361	_("Write fields without conversion. Used with --batch."))
2068.4.1 by Andrew Hutchings Fix intl domain	1362	("disable-reconnect", _("Do not reconnect if the connection is lost."))
1810.3.1 by Andrew Hutchings Don't do completion hash rebuild on --shutdown	1363	("shutdown", po::value<bool>()->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1364	_("Shutdown the server"))
2068.4.1 by Andrew Hutchings Fix intl domain	1365	("silent,s", _("Be more silent. Print results with a tab as separator, each row on new line."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1366	("tee", po::value<string>(),
2068.4.1 by Andrew Hutchings Fix intl domain	1367	_("Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default."))
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1368	("disable-tee", po::value<bool>()->default_value(false)->zero_tokens(),
2068.4.1 by Andrew Hutchings Fix intl domain	1369	_("Disable outfile. See interactive help (\\h) also."))
1921.2.1 by Andrew Hutchings Fix some drizzle client options that were still using '_' instead of '-'	1370	("connect-timeout", po::value<uint32_t>(&opt_connect_timeout)->default_value(0)->notifier(&check_timeout_value),
2068.4.1 by Andrew Hutchings Fix intl domain	1371	_("Number of seconds before connection timeout."))
1921.2.1 by Andrew Hutchings Fix some drizzle client options that were still using '_' instead of '-'	1372	("max-input-line", po::value<uint32_t>(&opt_max_input_line)->default_value(161024L1024L)->notifier(&check_max_input_line),
2068.4.1 by Andrew Hutchings Fix intl domain	1373	_("Max length of input line"))
1921.2.1 by Andrew Hutchings Fix some drizzle client options that were still using '_' instead of '-'	1374	("select-limit", po::value<uint32_t>(&select_limit)->default_value(1000L),
2068.4.1 by Andrew Hutchings Fix intl domain	1375	_("Automatic limit for SELECT when using --safe-updates"))
1921.2.1 by Andrew Hutchings Fix some drizzle client options that were still using '_' instead of '-'	1376	("max-join-size", po::value<uint32_t>(&max_join_size)->default_value(1000000L),
2068.4.1 by Andrew Hutchings Fix intl domain	1377	_("Automatic limit for rows in a join when using --safe-updates"))
1567.3.8 by Vijay Samuel Refactor drizzle client.	1378	;
1567.3.8 by Vijay Samuel Refactor drizzle client.	1379
2068.4.1 by Andrew Hutchings Fix intl domain	1380	po::options_description client_options(_("Options specific to the client"));
1567.3.8 by Vijay Samuel Refactor drizzle client.	1381	client_options.add_options()
1567.3.8 by Vijay Samuel Refactor drizzle client.	1382	("host,h", po::value<string>(&current_host)->default_value("localhost"),
2068.4.1 by Andrew Hutchings Fix intl domain	1383	_("Connect to host"))
1567.6.1 by Monty Taylor Replaced the snowman sentinel with a series of nulls. As it is physically	1384	("password,P", po::value<string>(&current_password)->default_value(PASSWORD_SENTINEL),
2068.4.1 by Andrew Hutchings Fix intl domain	1385	_("Password to use when connecting to server. If password is not given it's asked from the tty."))
1567.3.30 by Monty Taylor Remove special behavior of 0.	1386	("port,p", po::value<uint32_t>()->default_value(0),
2068.4.1 by Andrew Hutchings Fix intl domain	1387	_("Port number to use for connection or 0 for default to, in order of preference, drizzle.cnf, $DRIZZLE_TCP_PORT, built-in default"))
1960.2.8 by Andrew Hutchings Modify dtr to cope with drizzleadmin and create test case	1388	#ifdef DRIZZLE_ADMIN_TOOL
	1389	("user,u", po::value<string>(&current_user)->default_value("root"),
	1390	#else
1567.3.8 by Vijay Samuel Refactor drizzle client.	1391	("user,u", po::value<string>(&current_user)->default_value(""),
1960.2.8 by Andrew Hutchings Modify dtr to cope with drizzleadmin and create test case	1392	#endif
2068.4.1 by Andrew Hutchings Fix intl domain	1393	_("User for login if not current user."))
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	1394	("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),
2068.4.1 by Andrew Hutchings Fix intl domain	1395	_("The protocol of connection (mysql or drizzle)."))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1396	;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1397
2068.4.1 by Andrew Hutchings Fix intl domain	1398	po::options_description long_options(_("Allowed Options"));
1567.3.8 by Vijay Samuel Refactor drizzle client.	1399	long_options.add(commandline_options).add(drizzle_options).add(client_options);
	1400
	1401	std::string system_config_dir_drizzle(SYSCONFDIR);
	1402	system_config_dir_drizzle.append("/drizzle/drizzle.cnf");
	1403
	1404	std::string system_config_dir_client(SYSCONFDIR);
	1405	system_config_dir_client.append("/drizzle/client.cnf");
202.3.2 by Monty Taylor Added gettext calls in to my_getopt.c and drizzle.c	1406
1671.2.1 by Vijay Samuel Merge new user config file processing system.	1407	std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
1921.3.1 by Andrew Hutchings Using '~' to represent home is a shell standard, POSIX functions do not understand it. So for home config file loading substitute it for env variable $HOME if possible (also a POSIX standard)	1408
	1409	if (user_config_dir.compare(0, 2, "~/") == 0)
	1410	{
	1411	char *homedir;
	1412	homedir= getenv("HOME");
	1413	if (homedir != NULL)
	1414	user_config_dir.replace(0, 1, homedir);
	1415	}
	1416
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1417	po::variables_map vm;
1567.3.9 by Vijay Samuel Client refactored.	1418
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	1419	po::positional_options_description p;
1608.5.1 by Vijay Samuel Merge refactor drizzletest	1420	p.add("database", 1);
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	1421
1793.3.1 by Andrew Hutchings Disable boost:po allow_guessing which was making some wrong assumptions	1422	// Disable allow_guessing
	1423	int style = po::command_line_style::default_style & ~po::command_line_style::allow_guessing;
	1424
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	1425	po::store(po::command_line_parser(argc, argv).options(long_options).
1793.3.1 by Andrew Hutchings Disable boost:po allow_guessing which was making some wrong assumptions	1426	style(style).positional(p).extra_parser(parse_password_arg).run(),
	1427	vm);
1567.3.8 by Vijay Samuel Refactor drizzle client.	1428
1567.5.3 by Vijay Samuel Merge patch for sql_connect() and style issue.	1429	if (! vm["no-defaults"].as<bool>())
1567.3.10 by Vijay Samuel Client refactored completely using boost::program_options.	1430	{
1671.2.1 by Vijay Samuel Merge new user config file processing system.	1431	std::string user_config_dir_drizzle(user_config_dir);
	1432	user_config_dir_drizzle.append("/drizzle/drizzle.cnf");
	1433
	1434	std::string user_config_dir_client(user_config_dir);
	1435	user_config_dir_client.append("/drizzle/client.cnf");
	1436
	1437	ifstream user_drizzle_ifs(user_config_dir_drizzle.c_str());
1815.1.1 by Monty Taylor Embed a modified version of parse_config_file. There are several more bugs	1438	po::store(dpo::parse_config_file(user_drizzle_ifs, drizzle_options), vm);
1671.2.1 by Vijay Samuel Merge new user config file processing system.	1439
	1440	ifstream user_client_ifs(user_config_dir_client.c_str());
1815.1.1 by Monty Taylor Embed a modified version of parse_config_file. There are several more bugs	1441	po::store(dpo::parse_config_file(user_client_ifs, client_options), vm);
1671.2.1 by Vijay Samuel Merge new user config file processing system.	1442
1567.3.11 by Vijay Samuel Client completely refactored using boost::program_options.	1443	ifstream system_drizzle_ifs(system_config_dir_drizzle.c_str());
1815.1.1 by Monty Taylor Embed a modified version of parse_config_file. There are several more bugs	1444	store(dpo::parse_config_file(system_drizzle_ifs, drizzle_options), vm);
1567.3.8 by Vijay Samuel Refactor drizzle client.	1445
1567.3.11 by Vijay Samuel Client completely refactored using boost::program_options.	1446	ifstream system_client_ifs(system_config_dir_client.c_str());
1815.1.1 by Monty Taylor Embed a modified version of parse_config_file. There are several more bugs	1447	po::store(dpo::parse_config_file(system_client_ifs, client_options), vm);
1567.3.10 by Vijay Samuel Client refactored completely using boost::program_options.	1448	}
1567.3.8 by Vijay Samuel Refactor drizzle client.	1449
1567.3.5 by Vijay Samuel Refactored client.	1450	po::notify(vm);
1567.3.8 by Vijay Samuel Refactor drizzle client.	1451
1960.2.7 by Andrew Hutchings Drop the drizzleadmin client and use ifdef instead	1452	#ifdef DRIZZLE_ADMIN_TOOL
	1453	default_prompt= strdup(getenv("DRIZZLE_PS1") ?
	1454	getenv("DRIZZLE_PS1") :
	1455	"drizzleadmin> ");
	1456	#else
1567.5.1 by Vijay Samuel Client drizzle final version with all changes.	1457	default_prompt= strdup(getenv("DRIZZLE_PS1") ?
	1458	getenv("DRIZZLE_PS1") :
	1459	"drizzle> ");
1960.2.7 by Andrew Hutchings Drop the drizzleadmin client and use ifdef instead	1460	#endif
656.1.51 by Monty Taylor Fixed strdup return checking in client/	1461	if (default_prompt == NULL)
	1462	{
	1463	fprintf(stderr, _("Memory allocation error while constructing initial "
	1464	"prompt. Aborting.\n"));
	1465	exit(ENOMEM);
	1466	}
656.1.20 by Monty Taylor Removed my_strdup, my_malloc, my_realloc from client/	1467	current_prompt= strdup(default_prompt);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1468	if (current_prompt.empty())
656.1.51 by Monty Taylor Fixed strdup return checking in client/	1469	{
	1470	fprintf(stderr, _("Memory allocation error while constructing initial "
	1471	"prompt. Aborting.\n"));
	1472	exit(ENOMEM);
	1473	}
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	1474	processed_prompt= new string();
287.3.22 by Monty Taylor Fixed typo.	1475	processed_prompt->reserve(32);
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	1476
1 by brian clean slate	1477	prompt_counter=0;
1 by brian clean slate	1478
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1479	outfile.clear(); // no (default) outfile
	1480	pager.assign("stdout"); // the default, if --pager wasn't given
1 by brian clean slate	1481	{
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1482	const char *tmp= getenv("PAGER");
1 by brian clean slate	1483	if (tmp && strlen(tmp))
	1484	{
	1485	default_pager_set= 1;
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1486	default_pager.assign(tmp);
1 by brian clean slate	1487	}
1 by brian clean slate	1488	}
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1489	if (! isatty(0) \|\| ! isatty(1))
1 by brian clean slate	1490	{
1441.3.1 by Vijay Samuel all required updations have been made	1491	status.setBatch(1); opt_silent=1;
1 by brian clean slate	1492	}
1 by brian clean slate	1493	else
1441.3.1 by Vijay Samuel all required updations have been made	1494	status.setAddToHistory(1);
	1495	status.setExitStatus(1);
1 by brian clean slate	1496
1 by brian clean slate	1497	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	1498	/*
	1499	The file descriptor-layer may be out-of-sync with the file-number layer,
	1500	so we make sure that "stdout" is really open. If its file is closed then
	1501	explicitly close the FD layer.
1 by brian clean slate	1502	*/
	1503	int stdout_fileno_copy;
	1504	stdout_fileno_copy= dup(fileno(stdout)); /* Okay if fileno fails. */
	1505	if (stdout_fileno_copy == -1)
	1506	fclose(stdout);
	1507	else
	1508	close(stdout_fileno_copy); /* Clean up dup(). */
	1509	}
	1510
1757.5.1 by Andrew Hutchings Rework the boolean options so that true-by-default options change to --disable-option.	1511	/* Inverted Booleans */
	1512
	1513	line_numbers= (vm.count("disable-line-numbers")) ? false : true;
	1514	column_names= (vm.count("disable-column-names")) ? false : true;
	1515	opt_rehash= (vm.count("disable-auto-rehash")) ? false : true;
	1516	opt_reconnect= (vm.count("disable-reconnect")) ? false : true;
	1517
1810.3.1 by Andrew Hutchings Don't do completion hash rebuild on --shutdown	1518	/* Don't rehash with --shutdown */
	1519	if (vm.count("shutdown"))
	1520	{
	1521	opt_rehash= false;
	1522	opt_shutdown= true;
	1523	}
	1524
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1525	if (vm.count("delimiter"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1526	{
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1527	/* Check that delimiter does not contain a backslash */
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1528	if (! strstr(delimiter_str.c_str(), "\\"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1529	{
	1530	delimiter= (char *)delimiter_str.c_str();
	1531	}
	1532	else
	1533	{
	1534	put_info(_("DELIMITER cannot contain a backslash character"),
	1535	INFO_ERROR,0,0);
1567.3.4 by Vijay Samuel Refactored drizzle client.	1536	exit(-1);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1537	}
	1538
	1539	delimiter_length= (uint32_t)strlen(delimiter);
	1540	}
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1541	if (vm.count("tee"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1542	{
	1543	if (vm["tee"].as<string>().empty())
	1544	{
	1545	if (opt_outfile)
	1546	end_tee();
	1547	}
	1548	else
	1549	init_tee(vm["tee"].as<string>().c_str());
	1550	}
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1551	if (vm["disable-tee"].as<bool>() == true)
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1552	{
	1553	if (opt_outfile)
	1554	end_tee();
	1555	}
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1556	if (vm.count("pager"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1557	{
	1558	if (vm["pager"].as<string>().empty())
	1559	opt_nopager= 1;
	1560	else
	1561	{
	1562	opt_nopager= 0;
	1563	if (vm[pager].as<string>().length())
	1564	{
	1565	default_pager_set= 1;
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1566	pager.assign(vm["pager"].as<string>());
	1567	default_pager.assign(pager);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1568	}
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1569	else if (default_pager_set)
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1570	pager.assign(default_pager);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1571	else
	1572	opt_nopager= 1;
	1573	}
	1574	}
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1575	if (vm.count("disable-pager"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1576	{
	1577	opt_nopager= 1;
	1578	}
	1579
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1580	if (vm.count("no-auto-rehash"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1581	opt_rehash= 0;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1582
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1583	if (vm.count("skip-column-names"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1584	column_names= 0;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1585
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1586	if (vm.count("execute"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1587	{
	1588	status.setBatch(1);
	1589	status.setAddToHistory(1);
	1590	if (status.getLineBuff() == NULL)
	1591	status.setLineBuff(opt_max_input_line,NULL);
	1592	if (status.getLineBuff() == NULL)
	1593	{
	1594	exit(1);
	1595	}
	1596	status.getLineBuff()->addString(vm["execute"].as<string>().c_str());
	1597	}
	1598
	1599	if (one_database)
	1600	skip_updates= true;
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	1601
	1602	if (vm.count("protocol"))
	1603	{
	1604	std::transform(opt_protocol.begin(), opt_protocol.end(),
	1605	opt_protocol.begin(), ::tolower);
	1606
	1607	if (not opt_protocol.compare("mysql"))
	1608	use_drizzle_protocol=false;
	1609	else if (not opt_protocol.compare("drizzle"))
	1610	use_drizzle_protocol=true;
	1611	else
	1612	{
	1613	cout << _("Error: Unknown protocol") << " '" << opt_protocol << "'" << endl;
	1614	exit(-1);
	1615	}
	1616	}
	1617
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1618	if (vm.count("port"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1619	{
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1620	opt_drizzle_port= vm["port"].as<uint32_t>();
	1621
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1622	/* If the port number is > 65535 it is not a valid port
	1623	This also helps with potential data loss casting unsigned long to a
	1624	uint32_t. */
1567.3.30 by Monty Taylor Remove special behavior of 0.	1625	if (opt_drizzle_port > 65535)
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1626	{
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1627	printf(_("Error: Value of %" PRIu32 " supplied for port is not valid.\n"), opt_drizzle_port);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1628	exit(-1);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1629	}
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1630	}
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1631
1567.4.2 by Jay Pipes Some style fixes and removal of deprecated stuff...	1632	if (vm.count("password"))
	1633	{
1567.3.3 by Vijay Samuel Client refactored.	1634	if (!opt_password.empty())
1567.3.3 by Vijay Samuel Client refactored.	1635	opt_password.erase();
1567.6.1 by Monty Taylor Replaced the snowman sentinel with a series of nulls. As it is physically	1636	if (current_password == PASSWORD_SENTINEL)
	1637	{
1567.3.5 by Vijay Samuel Refactored client.	1638	opt_password= "";
1567.6.1 by Monty Taylor Replaced the snowman sentinel with a series of nulls. As it is physically	1639	}
1567.3.5 by Vijay Samuel Refactored client.	1640	else
1567.6.1 by Monty Taylor Replaced the snowman sentinel with a series of nulls. As it is physically	1641	{
1567.3.5 by Vijay Samuel Refactored client.	1642	opt_password= current_password;
1567.6.1 by Monty Taylor Replaced the snowman sentinel with a series of nulls. As it is physically	1643	tty_password= false;
	1644	}
1567.3.3 by Vijay Samuel Client refactored.	1645	}
	1646	else
	1647	{
1567.6.1 by Monty Taylor Replaced the snowman sentinel with a series of nulls. As it is physically	1648	tty_password= true;
1567.3.3 by Vijay Samuel Client refactored.	1649	}
1567.3.3 by Vijay Samuel Client refactored.	1650
1923.3.4 by Andrew Hutchings Revert -v fix	1651
	1652	if (!opt_verbose.empty())
	1653	{
	1654	verbose= opt_verbose.length();
	1655	}
	1656
1567.5.3 by Vijay Samuel Merge patch for sql_connect() and style issue.	1657	if (vm.count("batch"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1658	{
	1659	status.setBatch(1);
	1660	status.setAddToHistory(0);
1567.3.15 by Monty Taylor Removed the last vestiges of my_sys from drizzle.cc.	1661	if (opt_silent < 1)
	1662	{
	1663	opt_silent= 1;
	1664	}
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1665	}
1567.5.3 by Vijay Samuel Merge patch for sql_connect() and style issue.	1666	if (vm.count("silent"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1667	{
2053.2.3 by Andrew Hutchings Make --silent work again	1668	opt_silent= 2;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1669	}
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1670
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1671	if (vm.count("help") \|\| vm.count("version"))
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1672	{
1729.3.2 by LinuxJedi Further cleanups based on Monty's comments (also revert a couple of things)	1673	printf(_("Drizzle client %s build %s, for %s-%s (%s) using readline %s\n"),
	1674	drizzle_version(), VERSION,
	1675	HOST_VENDOR, HOST_OS, HOST_CPU,
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	1676	rl_library_version);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1677	if (vm.count("version"))
	1678	exit(0);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1679	printf(_("Copyright (C) 2008 Sun Microsystems\n"
	1680	"This software comes with ABSOLUTELY NO WARRANTY. "
	1681	"This is free software,\n"
	1682	"and you are welcome to modify and redistribute it "
	1683	"under the GPL license\n"));
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	1684	printf(_("Usage: drizzle [OPTIONS] [schema]\n"));
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1685	cout << long_options;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1686	exit(0);
	1687	}
	1688
	1689
1567.5.3 by Vijay Samuel Merge patch for sql_connect() and style issue.	1690	if (process_options())
1 by brian clean slate	1691	{
	1692	exit(1);
	1693	}
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1694
212.6.10 by Mats Kindahl Removing redundant use of casts in client/ for memcmp(), memcpy(), memset(), and memmove().	1695	memset(&drizzle, 0, sizeof(drizzle));
2053.2.1 by Andrew Hutchings Fix hidden connect messages	1696	if (sql_connect(current_host, current_db, current_user, opt_password))
1 by brian clean slate	1697	{
206.3.1 by Patrick Galbraith Most everything working with client rename	1698	quick= 1; // Avoid history
1441.3.1 by Vijay Samuel all required updations have been made	1699	status.setExitStatus(1);
206.3.1 by Patrick Galbraith Most everything working with client rename	1700	drizzle_end(-1);
1 by brian clean slate	1701	}
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1702
	1703	int command_error;
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1704	if (execute_commands(&command_error) != false)
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1705	{
	1706	/* we've executed a command so exit before we go into readline mode */
	1707	exit(command_error);
	1708	}
	1709
1441.3.1 by Vijay Samuel all required updations have been made	1710	if (status.getBatch() && !status.getLineBuff())
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1711	{
1441.3.1 by Vijay Samuel all required updations have been made	1712	status.setLineBuff(opt_max_input_line, stdin);
	1713	if (status.getLineBuff() == NULL)
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1714	{
	1715	exit(1);
	1716	}
973.1.1 by Toru Maesaka Added server shutdown and ping functionalities to the drizzle client app	1717	}
973.1.2 by Toru Maesaka Cosmetic fixes pointed out by Jay and added comments for doxygen	1718
1441.3.1 by Vijay Samuel all required updations have been made	1719	if (!status.getBatch())
206.3.1 by Patrick Galbraith Most everything working with client rename	1720	ignore_errors=1; // Don't abort monitor
1 by brian clean slate	1721
	1722	if (opt_sigint_ignore)
	1723	signal(SIGINT, SIG_IGN);
	1724	else
	1725	signal(SIGINT, handle_sigint); // Catch SIGINT to clean up
206.3.1 by Patrick Galbraith Most everything working with client rename	1726	signal(SIGQUIT, drizzle_end); // Catch SIGQUIT to clean up
1 by brian clean slate	1727
	1728	#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
	1729	/* Readline will call this if it installs a handler */
	1730	signal(SIGWINCH, window_resize);
	1731	/* call the SIGWINCH handler to get the default term width */
	1732	window_resize(0);
	1733	#endif
1720.3.2 by LinuxJedi Fix bug #617510:	1734	std::vector<char> output_buff;
	1735	output_buff.resize(512);
	1736
	1737	snprintf(&output_buff[0], output_buff.size(),
	1738	_("Welcome to the Drizzle client.. Commands end with %s or \\g."),
	1739	delimiter);
	1740
	1741	put_info(&output_buff[0], INFO_INFO, 0, 0);
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	1742
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	1743	glob_buffer= new string();
287.3.19 by Monty Taylor Added string.reserve() calls.	1744	glob_buffer->reserve(512);
660.1.3 by Eric Herman removed trailing whitespace with simple script:	1745
1707.1.22 by Brian Aker Small cleanup in mysql.cc	1746	snprintf(&output_buff[0], output_buff.size(),
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	1747	_("Your Drizzle connection id is %u\nConnection protocol: %s\nServer version: %s\n"),
1441.3.1 by Vijay Samuel all required updations have been made	1748	drizzle_con_thread_id(&con),
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	1749	opt_protocol.c_str(),
1441.3.1 by Vijay Samuel all required updations have been made	1750	server_version_string(&con));
1707.1.22 by Brian Aker Small cleanup in mysql.cc	1751	put_info(&output_buff[0], INFO_INFO, 0, 0);
1 by brian clean slate	1752
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	1753
1567.5.2 by Vijay Samuel Merge OSX fix for client drizzle.	1754	initialize_readline((char *)current_prompt.c_str());
1441.3.1 by Vijay Samuel all required updations have been made	1755	if (!status.getBatch() && !quick)
1 by brian clean slate	1756	{
206.3.1 by Patrick Galbraith Most everything working with client rename	1757	/* read-history from file, default ~/.drizzle_history*/
266.2.3 by Jim Winstead Use DRIZZLE_* environment variables instead of MYSQL_*	1758	if (getenv("DRIZZLE_HISTFILE"))
	1759	histfile= strdup(getenv("DRIZZLE_HISTFILE"));
1 by brian clean slate	1760	else if (getenv("HOME"))
1 by brian clean slate	1761	{
1441.3.1 by Vijay Samuel all required updations have been made	1762	histfile=(char*) malloc(strlen(getenv("HOME")) + strlen("/.drizzle_history") + 2);
1 by brian clean slate	1763	if (histfile)
1441.3.1 by Vijay Samuel all required updations have been made	1764	sprintf(histfile,"%s/.drizzle_history",getenv("HOME"));
1 by brian clean slate	1765	char link_name[FN_REFLEN];
1060.2.1 by Eric Lambert -replace calls to my_readlink with readlink	1766	ssize_t sym_link_size= readlink(histfile,link_name,FN_REFLEN-1);
	1767	if (sym_link_size >= 0)
1 by brian clean slate	1768	{
1060.2.1 by Eric Lambert -replace calls to my_readlink with readlink	1769	link_name[sym_link_size]= '\0';
	1770	if (strncmp(link_name, "/dev/null", 10) == 0)
	1771	{
	1772	/* The .drizzle_history file is a symlink to /dev/null, don't use it */
	1773	free(histfile);
	1774	histfile= 0;
	1775	}
1 by brian clean slate	1776	}
	1777	}
	1778	if (histfile)
	1779	{
	1780	if (verbose)
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	1781	tee_fprintf(stdout, _("Reading history-file %s\n"),histfile);
1 by brian clean slate	1782	read_history(histfile);
1441.3.1 by Vijay Samuel all required updations have been made	1783	if (!(histfile_tmp= (char*) malloc((uint32_t) strlen(histfile) + 5)))
1 by brian clean slate	1784	{
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	1785	fprintf(stderr, _("Couldn't allocate memory for temp histfile!\n"));
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	1786	exit(1);
1 by brian clean slate	1787	}
1441.3.1 by Vijay Samuel all required updations have been made	1788	sprintf(histfile_tmp, "%s.TMP", histfile);
1 by brian clean slate	1789	}
1 by brian clean slate	1790	}
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	1791
1126.4.1 by Monty Taylor Fixed a buffer overrun that was causing some translated message output to suck.	1792	put_info(_("Type 'help;' or '\\h' for help. "
	1793	"Type '\\c' to clear the buffer.\n"),INFO_INFO,0,0);
1441.3.1 by Vijay Samuel all required updations have been made	1794	status.setExitStatus(read_and_execute(!status.getBatch()));
1 by brian clean slate	1795	if (opt_outfile)
1 by brian clean slate	1796	end_tee();
206.3.1 by Patrick Galbraith Most everything working with client rename	1797	drizzle_end(0);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1798	}
319 by Brian Aker Fix (yuck!) for OSX/Google bug.	1799
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1800	catch(exception &err)
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1801	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	1802	cerr << _("Error:") << err.what() << endl;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1803	}
206.3.1 by Patrick Galbraith Most everything working with client rename	1804	return(0); // Keep compiler happy
1 by brian clean slate	1805	}
1 by brian clean slate	1806
779.2.11 by Monty Taylor General build cleanup - removed cruft, removed depreated checks.	1807	void drizzle_end(int sig)
1 by brian clean slate	1808	{
928.1.1 by Eric Day Started client changes.	1809	drizzle_con_free(&con);
928.1.1 by Eric Day Started client changes.	1810	drizzle_free(&drizzle);
1441.3.1 by Vijay Samuel all required updations have been made	1811	if (!status.getBatch() && !quick && histfile)
1 by brian clean slate	1812	{
	1813	/* write-history */
	1814	if (verbose)
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	1815	tee_fprintf(stdout, _("Writing history-file %s\n"),histfile);
1 by brian clean slate	1816	if (!write_history(histfile_tmp))
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	1817	rename(histfile_tmp, histfile);
1 by brian clean slate	1818	}
1441.3.1 by Vijay Samuel all required updations have been made	1819	delete status.getLineBuff();
	1820	status.setLineBuff(0);
1 by brian clean slate	1821
1 by brian clean slate	1822	if (sig >= 0)
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	1823	put_info(sig ? _("Aborted") : _("Bye"), INFO_RESULT,0,0);
1883.3.1 by Andrew Hutchings Cleanup drizzledump and drizzle for cppcheck	1824	delete glob_buffer;
	1825	delete processed_prompt;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1826	opt_password.erase();
477 by Monty Taylor Removed my_free(). It turns out that it had been def'd to ignore the flags passed to it in the second arg anyway. Gotta love that.	1827	free(histfile);
	1828	free(histfile_tmp);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1829	current_db.erase();
	1830	current_host.erase();
	1831	current_user.erase();
477 by Monty Taylor Removed my_free(). It turns out that it had been def'd to ignore the flags passed to it in the second arg anyway. Gotta love that.	1832	free(full_username);
	1833	free(part_username);
	1834	free(default_prompt);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1835	current_prompt.erase();
1441.3.1 by Vijay Samuel all required updations have been made	1836	exit(status.getExitStatus());
1 by brian clean slate	1837	}
	1838
	1839
	1840	/*
	1841	This function handles sigint calls
	1842	If query is in process, kill query
	1843	no query in process, terminate like previous behavior
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	1844	*/
520.4.43 by mordred A set of Solaris fixes.	1845	extern "C"
779.2.11 by Monty Taylor General build cleanup - removed cruft, removed depreated checks.	1846	void handle_sigint(int sig)
1 by brian clean slate	1847	{
1 by brian clean slate	1848	char kill_buffer[40];
1929.1.40 by Monty Taylor Replaced auto_ptr with scoped_ptr.	1849	boost::scoped_ptr<drizzle_con_st> kill_drizzle(new drizzle_con_st);
928.1.1 by Eric Day Started client changes.	1850	drizzle_result_st res;
928.1.1 by Eric Day Started client changes.	1851	drizzle_return_t ret;
1 by brian clean slate	1852
1 by brian clean slate	1853	/* terminate if no query being executed, or we already tried interrupting */
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	1854	if (!executing_query \|\| interrupted_query) {
1 by brian clean slate	1855	goto err;
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	1856	}
1 by brian clean slate	1857
1929.1.13 by Stewart Smith fix large stack usage in handle_sigint in drizzle client	1858	if (drizzle_con_add_tcp(&drizzle, kill_drizzle.get(), current_host.c_str(),
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	1859	opt_drizzle_port, current_user.c_str(), opt_password.c_str(), NULL,
	1860	use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL) == NULL)
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	1861	{
1 by brian clean slate	1862	goto err;
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	1863	}
1 by brian clean slate	1864
1 by brian clean slate	1865	/* kill_buffer is always big enough because max length of %lu is 15 */
1441.3.1 by Vijay Samuel all required updations have been made	1866	sprintf(kill_buffer, "KILL /!50000 QUERY / %u",
	1867	drizzle_con_thread_id(&con));
928.1.1 by Eric Day Started client changes.	1868
1929.1.13 by Stewart Smith fix large stack usage in handle_sigint in drizzle client	1869	if (drizzle_query_str(kill_drizzle.get(), &res, kill_buffer, &ret) != NULL)
928.1.1 by Eric Day Started client changes.	1870	drizzle_result_free(&res);
928.1.1 by Eric Day Started client changes.	1871
1929.1.13 by Stewart Smith fix large stack usage in handle_sigint in drizzle client	1872	drizzle_con_free(kill_drizzle.get());
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	1873	tee_fprintf(stdout, _("Query aborted by Ctrl+C\n"));
1 by brian clean slate	1874
	1875	interrupted_query= 1;
	1876
	1877	return;
	1878
	1879	err:
206.3.1 by Patrick Galbraith Most everything working with client rename	1880	drizzle_end(sig);
1 by brian clean slate	1881	}
	1882
	1883
	1884	#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
779.2.11 by Monty Taylor General build cleanup - removed cruft, removed depreated checks.	1885	void window_resize(int)
1 by brian clean slate	1886	{
	1887	struct winsize window_size;
	1888
	1889	if (ioctl(fileno(stdin), TIOCGWINSZ, &window_size) == 0)
	1890	terminal_width= window_size.ws_col;
	1891	}
	1892	#endif
	1893
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1894
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1895
1567.5.3 by Vijay Samuel Merge patch for sql_connect() and style issue.	1896	static int process_options(void)
1 by brian clean slate	1897	{
1 by brian clean slate	1898	char tmp, pagpoint;
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1899
1 by brian clean slate	1900
266.2.3 by Jim Winstead Use DRIZZLE_* environment variables instead of MYSQL_*	1901	tmp= (char *) getenv("DRIZZLE_HOST");
1 by brian clean slate	1902	if (tmp)
1593.1.4 by Vijay Samuel Merge Fixes for client drizzle.	1903	current_host.assign(tmp);
1 by brian clean slate	1904
	1905	pagpoint= getenv("PAGER");
	1906	if (!((char*) (pagpoint)))
	1907	{
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1908	pager.assign("stdout");
1 by brian clean slate	1909	opt_nopager= 1;
	1910	}
	1911	else
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1912	{
	1913	pager.assign(pagpoint);
	1914	}
	1915	default_pager.assign(pager);
1 by brian clean slate	1916
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	1917	//
1 by brian clean slate	1918
1441.3.1 by Vijay Samuel all required updations have been made	1919	if (status.getBatch()) /* disable pager and outfile in this case */
1 by brian clean slate	1920	{
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	1921	default_pager.assign("stdout");
	1922	pager.assign("stdout");
1 by brian clean slate	1923	opt_nopager= 1;
	1924	default_pager_set= 0;
	1925	opt_outfile= 0;
	1926	opt_reconnect= 0;
928.1.1 by Eric Day Started client changes.	1927	connect_flag= DRIZZLE_CAPABILITIES_NONE; /* Not in interactive mode */
1 by brian clean slate	1928	}
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	1929
1 by brian clean slate	1930	if (tty_password)
928.1.1 by Eric Day Started client changes.	1931	opt_password= client_get_tty_password(NULL);
1 by brian clean slate	1932	return(0);
	1933	}
	1934
	1935	static int read_and_execute(bool interactive)
	1936	{
77.3.7 by Monty Taylor Made mysql into a pure-C program.	1937	char *line;
77.3.7 by Monty Taylor Made mysql into a pure-C program.	1938	char in_string=0;
288 by Brian Aker ulong cleanp in client apps	1939	uint32_t line_number=0;
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	1940	bool ml_comment= 0;
1441.3.1 by Vijay Samuel all required updations have been made	1941	Commands *com;
	1942	status.setExitStatus(1);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	1943
1 by brian clean slate	1944	for (;;)
	1945	{
	1946	if (!interactive)
	1947	{
1441.3.1 by Vijay Samuel all required updations have been made	1948	if (status.getLineBuff())
	1949	line= status.getLineBuff()->readline();
1095.2.1 by Robert Klahn Replace typedef struct LINE_BUFFER with class LineBuffer, encapsulating current logic	1950	else
1095.2.4 by Robert Klahn changes from code review feedback	1951	line= 0;
1095.2.2 by Robert Klahn convert logic to use std::stringstream for buffer	1952
1095.2.4 by Robert Klahn changes from code review feedback	1953	line_number++;
1095.2.4 by Robert Klahn changes from code review feedback	1954	if (show_progress_size > 0)
670.1.4 by Monty Taylor Imported patch from LinuxJedi to add import status messages.	1955	{
1095.2.4 by Robert Klahn changes from code review feedback	1956	if ((line_number % show_progress_size) == 0)
1095.2.4 by Robert Klahn changes from code review feedback	1957	fprintf(stderr, _("Processing line: %"PRIu32"\n"), line_number);
670.1.4 by Monty Taylor Imported patch from LinuxJedi to add import status messages.	1958	}
1095.2.4 by Robert Klahn changes from code review feedback	1959	if (!glob_buffer->empty())
1441.3.1 by Vijay Samuel all required updations have been made	1960	status.setQueryStartLine(line_number);
1 by brian clean slate	1961	}
	1962	else
	1963	{
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	1964	string prompt(ml_comment
	1965	? " /*> "
	1966	: glob_buffer->empty()
	1967	? construct_prompt()
	1968	: not in_string
	1969	? " -> "
	1970	: in_string == '\''
	1971	? " '> "
	1972	: in_string == '`'
	1973	? " `> "
	1974	: " \"> ");
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	1975	if (opt_outfile && glob_buffer->empty())
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	1976	fflush(OUTFILE);
1 by brian clean slate	1977
1 by brian clean slate	1978	if (opt_outfile)
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	1979	fputs(prompt.c_str(), OUTFILE);
	1980	line= readline(prompt.c_str());
1 by brian clean slate	1981	/*
	1982	When Ctrl+d or Ctrl+z is pressed, the line may be NULL on some OS
	1983	which may cause coredump.
	1984	*/
	1985	if (opt_outfile && line)
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	1986	fprintf(OUTFILE, "%s\n", line);
1 by brian clean slate	1987	}
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	1988	// End of file
	1989	if (!line)
1 by brian clean slate	1990	{
1441.3.1 by Vijay Samuel all required updations have been made	1991	status.setExitStatus(0);
1 by brian clean slate	1992	break;
	1993	}
	1994
	1995	/*
206.3.1 by Patrick Galbraith Most everything working with client rename	1996	Check if line is a drizzle command line
1 by brian clean slate	1997	(We want to allow help, print and clear anywhere at line start
1 by brian clean slate	1998	*/
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	1999	if ((named_cmds \|\| (glob_buffer->empty()))
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2000	&& !ml_comment && !in_string && (com=find_command(line,0)))
1 by brian clean slate	2001	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2002	if ((*com->func)(glob_buffer,line) > 0)
	2003	break;
	2004	// If buffer was emptied
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2005	if (glob_buffer->empty())
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2006	in_string=0;
1441.3.1 by Vijay Samuel all required updations have been made	2007	if (interactive && status.getAddToHistory() && not_in_history(line))
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2008	add_history(line);
1 by brian clean slate	2009	continue;
1 by brian clean slate	2010	}
77.3.4 by Monty Taylor Removed debugging. Fixed multi-line processing error.	2011	if (add_line(glob_buffer,line,&in_string,&ml_comment))
1 by brian clean slate	2012	break;
	2013	}
	2014	/* if in batch mode, send last query even if it doesn't end with \g or go */
	2015
1441.3.1 by Vijay Samuel all required updations have been made	2016	if (!interactive && !status.getExitStatus())
1 by brian clean slate	2017	{
1 by brian clean slate	2018	remove_cntrl(glob_buffer);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2019	if (!glob_buffer->empty())
1 by brian clean slate	2020	{
1441.3.1 by Vijay Samuel all required updations have been made	2021	status.setExitStatus(1);
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2022	if (com_go(glob_buffer,line) <= 0)
1441.3.1 by Vijay Samuel all required updations have been made	2023	status.setExitStatus(0);
1 by brian clean slate	2024	}
	2025	}
	2026
1441.3.1 by Vijay Samuel all required updations have been made	2027	return status.getExitStatus();
1 by brian clean slate	2028	}
	2029
	2030
1441.3.1 by Vijay Samuel all required updations have been made	2031	static Commands find_command(const char name,char cmd_char)
1 by brian clean slate	2032	{
893 by Brian Aker First pass of stripping uint	2033	uint32_t len;
266.1.19 by Monty Taylor Fixed const thing.	2034	const char *end;
1 by brian clean slate	2035
	2036	if (!name)
	2037	{
	2038	len=0;
	2039	end=0;
	2040	}
	2041	else
	2042	{
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2043	while (isspace(*name))
1 by brian clean slate	2044	name++;
	2045	/*
	2046	If there is an \\g in the row or if the row has a delimiter but
	2047	this is not a delimiter command, let add_line() take care of
	2048	parsing the row and calling find_command()
	2049	*/
	2050	if (strstr(name, "\\g") \|\| (strstr(name, delimiter) &&
	2051	!(strlen(name) >= 9 &&
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2052	!strcmp(name, "delimiter"))))
1441.3.3 by Vijay Samuel Changes made to the struct conversion	2053	return(NULL);
1 by brian clean slate	2054	if ((end=strcont(name," \t")))
1 by brian clean slate	2055	{
895 by Brian Aker Completion (?) of uint conversion.	2056	len=(uint32_t) (end - name);
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2057	while (isspace(*end))
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2058	end++;
1 by brian clean slate	2059	if (!*end)
206.3.1 by Patrick Galbraith Most everything working with client rename	2060	end=0; // no arguments to function
1 by brian clean slate	2061	}
1 by brian clean slate	2062	else
895 by Brian Aker Completion (?) of uint conversion.	2063	len=(uint32_t) strlen(name);
1 by brian clean slate	2064	}
1 by brian clean slate	2065
1441.3.1 by Vijay Samuel all required updations have been made	2066	for (uint32_t i= 0; commands[i].getName(); i++)
1 by brian clean slate	2067	{
1 by brian clean slate	2068	if (commands[i].func &&
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2069	((name && !strncmp(name, commands[i].getName(), len)
	2070	&& !commands[i].getName()[len] && (!end \|\| (end && commands[i].getTakesParams()))) \|\| (!name && commands[i].getCmdChar() == cmd_char)))
1 by brian clean slate	2071	{
142.1.2 by Patrick All DBUG_x removed from client/	2072	return(&commands[i]);
1 by brian clean slate	2073	}
1 by brian clean slate	2074	}
1441.3.3 by Vijay Samuel Changes made to the struct conversion	2075	return(NULL);
1 by brian clean slate	2076	}
	2077
	2078
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2079	static bool add_line(string buffer, char line, char *in_string,
1441.3.1 by Vijay Samuel all required updations have been made	2080	bool *ml_comment)
1 by brian clean slate	2081	{
481 by Brian Aker Remove all of uchar.	2082	unsigned char inchar;
1126.4.1 by Monty Taylor Fixed a buffer overrun that was causing some translated message output to suck.	2083	char pos, out;
1441.3.1 by Vijay Samuel all required updations have been made	2084	Commands *com;
1 by brian clean slate	2085	bool need_space= 0;
1 by brian clean slate	2086	bool ss_comment= 0;
142.1.2 by Patrick All DBUG_x removed from client/	2087
1 by brian clean slate	2088
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2089	if (!line[0] && (buffer->empty()))
142.1.2 by Patrick All DBUG_x removed from client/	2090	return(0);
1441.3.1 by Vijay Samuel all required updations have been made	2091	if (status.getAddToHistory() && line[0] && not_in_history(line))
1 by brian clean slate	2092	add_history(line);
895 by Brian Aker Completion (?) of uint conversion.	2093	char *end_of_line=line+(uint32_t) strlen(line);
1 by brian clean slate	2094
481 by Brian Aker Remove all of uchar.	2095	for (pos=out=line ; (inchar= (unsigned char) *pos) ; pos++)
1 by brian clean slate	2096	{
	2097	if (!preserve_comments)
	2098	{
	2099	// Skip spaces at the beggining of a statement
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2100	if (isspace(inchar) && (out == line) &&
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2101	(buffer->empty()))
1 by brian clean slate	2102	continue;
1 by brian clean slate	2103	}
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2104
1 by brian clean slate	2105	// Accept multi-byte characters as-is
1567.3.20 by Monty Taylor Removed UTF-8 lib that we don't use.	2106	if (not drizzled::utf8::is_single(*pos))
1 by brian clean slate	2107	{
1567.3.16 by Monty Taylor Added in proper check for mb quality before skipping based on mb length.	2108	int length;
1567.3.20 by Monty Taylor Removed UTF-8 lib that we don't use.	2109	if ((length= drizzled::utf8::sequence_length(*pos)))
1 by brian clean slate	2110	{
1567.3.16 by Monty Taylor Added in proper check for mb quality before skipping based on mb length.	2111	if (!*ml_comment \|\| preserve_comments)
	2112	{
	2113	while (length--)
	2114	out++ = pos++;
	2115	pos--;
	2116	}
	2117	else
	2118	pos+= length - 1;
	2119	continue;
1 by brian clean slate	2120	}
1 by brian clean slate	2121	}
1085.3.3 by Monty Taylor Got rid of #ifdef have utf8 stuff.	2122	if (!*ml_comment && inchar == '\\' &&
1085.3.3 by Monty Taylor Got rid of #ifdef have utf8 stuff.	2123	!(*in_string && (drizzle_con_status(&con) & DRIZZLE_CON_STATUS_NO_BACKSLASH_ESCAPES)))
1 by brian clean slate	2124	{
	2125	// Found possbile one character command like \c
	2126
481 by Brian Aker Remove all of uchar.	2127	if (!(inchar = (unsigned char) *++pos))
206.3.1 by Patrick Galbraith Most everything working with client rename	2128	break; // readline adds one '\'
	2129	if (*in_string \|\| inchar == 'N') // \N is short for NULL
	2130	{ // Don't allow commands in string
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2131	*out++='\\';
	2132	*out++= (char) inchar;
	2133	continue;
1 by brian clean slate	2134	}
461 by Monty Taylor Removed NullS. bu-bye.	2135	if ((com=find_command(NULL,(char) inchar)))
1 by brian clean slate	2136	{
	2137	// Flush previously accepted characters
	2138	if (out != line)
	2139	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2140	buffer->append(line, (out-line));
1 by brian clean slate	2141	out= line;
1 by brian clean slate	2142	}
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2143
	2144	if ((*com->func)(buffer,pos-1) > 0)
142.1.2 by Patrick All DBUG_x removed from client/	2145	return(1); // Quit
1441.3.1 by Vijay Samuel all required updations have been made	2146	if (com->getTakesParams())
1 by brian clean slate	2147	{
	2148	if (ss_comment)
	2149	{
	2150	/*
	2151	If a client-side macro appears inside a server-side comment,
	2152	discard all characters in the comment after the macro (that is,
	2153	until the end of the comment rather than the next delimiter)
	2154	*/
	2155	for (pos++; pos && (pos != '' \|\| (pos + 1) != '/'); pos++)
	2156	;
	2157	pos--;
	2158	}
	2159	else
	2160	{
	2161	for (pos++ ;
	2162	pos && (pos != *delimiter \|\|
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	2163	strncmp(pos + 1, delimiter + 1,
	2164	strlen(delimiter + 1))) ; pos++)
206.3.1 by Patrick Galbraith Most everything working with client rename	2165	; // Remove parameters
1 by brian clean slate	2166	if (!*pos)
1 by brian clean slate	2167	pos--;
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2168	else
1 by brian clean slate	2169	pos+= delimiter_length - 1; // Point at last delim char
	2170	}
	2171	}
	2172	}
	2173	else
	2174	{
1126.4.1 by Monty Taylor Fixed a buffer overrun that was causing some translated message output to suck.	2175	string buff(_("Unknown command: "));
	2176	buff.push_back('\'');
	2177	buff.push_back(inchar);
	2178	buff.push_back('\'');
	2179	buff.push_back('.');
	2180	if (put_info(buff.c_str(),INFO_ERROR,0,0) > 0)
77.4.1 by Monty Taylor Merged from trunk.	2181	return(1);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2182	*out++='\\';
	2183	*out++=(char) inchar;
	2184	continue;
1 by brian clean slate	2185	}
	2186	}
	2187	else if (!ml_comment && !in_string &&
	2188	(end_of_line - pos) >= 10 &&
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2189	!strncmp(pos, "delimiter ", 10))
1 by brian clean slate	2190	{
	2191	// Flush previously accepted characters
	2192	if (out != line)
	2193	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2194	buffer->append(line, (out - line));
1 by brian clean slate	2195	out= line;
	2196	}
	2197
	2198	// Flush possible comments in the buffer
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2199	if (!buffer->empty())
1 by brian clean slate	2200	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2201	if (com_go(buffer, 0) > 0) // < 0 is not fatal
142.1.2 by Patrick All DBUG_x removed from client/	2202	return(1);
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	2203	assert(buffer!=NULL);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2204	buffer->clear();
1 by brian clean slate	2205	}
	2206
	2207	/*
	2208	Delimiter wants the get rest of the given line as argument to
	2209	allow one to change ';' to ';;' and back
	2210	*/
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2211	buffer->append(pos);
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2212	if (com_delimiter(buffer, pos) > 0)
142.1.2 by Patrick All DBUG_x removed from client/	2213	return(1);
1 by brian clean slate	2214
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2215	buffer->clear();
1 by brian clean slate	2216	break;
1 by brian clean slate	2217	}
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	2218	else if (!ml_comment && !in_string && !strncmp(pos, delimiter,
	2219	strlen(delimiter)))
1 by brian clean slate	2220	{
	2221	// Found a statement. Continue parsing after the delimiter
	2222	pos+= delimiter_length;
	2223
	2224	if (preserve_comments)
	2225	{
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2226	while (isspace(*pos))
1 by brian clean slate	2227	out++= pos++;
	2228	}
	2229	// Flush previously accepted characters
	2230	if (out != line)
	2231	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2232	buffer->append(line, (out-line));
1 by brian clean slate	2233	out= line;
	2234	}
	2235
	2236	if (preserve_comments && ((*pos == '#') \|\|
	2237	((*pos == '-') &&
	2238	(pos[1] == '-') &&
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2239	isspace(pos[2]))))
1 by brian clean slate	2240	{
1 by brian clean slate	2241	// Add trailing single line comments to this statement
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2242	buffer->append(pos);
1 by brian clean slate	2243	pos+= strlen(pos);
	2244	}
	2245
	2246	pos--;
	2247
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2248	if ((com= find_command(buffer->c_str(), 0)))
1 by brian clean slate	2249	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2250
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2251	if ((*com->func)(buffer, buffer->c_str()) > 0)
77.4.1 by Monty Taylor Merged from trunk.	2252	return(1); // Quit
1 by brian clean slate	2253	}
	2254	else
	2255	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2256	if (com_go(buffer, 0) > 0) // < 0 is not fatal
142.1.2 by Patrick All DBUG_x removed from client/	2257	return(1);
1 by brian clean slate	2258	}
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2259	buffer->clear();
1 by brian clean slate	2260	}
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2261	else if (!*ml_comment
	2262	&& (!*in_string
	2263	&& (inchar == '#'
	2264	\|\| (inchar == '-'
	2265	&& pos[1] == '-'
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2266	&& isspace(pos[2])))))
1 by brian clean slate	2267	{
	2268	// Flush previously accepted characters
	2269	if (out != line)
	2270	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2271	buffer->append(line, (out - line));
1 by brian clean slate	2272	out= line;
	2273	}
	2274
	2275	// comment to end of line
	2276	if (preserve_comments)
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2277	buffer->append(pos);
1 by brian clean slate	2278
	2279	break;
	2280	}
	2281	else if (!in_string && inchar == '/' && (pos+1) == '*' &&
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2282	*(pos+2) != '!')
1 by brian clean slate	2283	{
	2284	if (preserve_comments)
	2285	{
	2286	out++= pos++; // copy '/'
	2287	out++= pos; // copy '*'
	2288	}
	2289	else
	2290	pos++;
	2291	*ml_comment= 1;
	2292	if (out != line)
	2293	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2294	buffer->append(line, (out-line));
1 by brian clean slate	2295	out=line;
	2296	}
	2297	}
	2298	else if (ml_comment && !ss_comment && inchar == '' && *(pos + 1) == '/')
	2299	{
	2300	if (preserve_comments)
	2301	{
	2302	out++= pos++; // copy '*'
	2303	out++= pos; // copy '/'
	2304	}
	2305	else
	2306	pos++;
	2307	*ml_comment= 0;
	2308	if (out != line)
	2309	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2310	buffer->append(line, (out - line));
1 by brian clean slate	2311	out= line;
	2312	}
	2313	// Consumed a 2 chars or more, and will add 1 at most,
	2314	// so using the 'line' buffer to edit data in place is ok.
	2315	need_space= 1;
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2316	}
1 by brian clean slate	2317	else
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2318	{
	2319	// Add found char to buffer
1 by brian clean slate	2320	if (!in_string && inchar == '/' && (pos + 1) == '*' &&
	2321	*(pos + 2) == '!')
	2322	ss_comment= 1;
	2323	else if (!in_string && ss_comment && inchar == '' && *(pos + 1) == '/')
	2324	ss_comment= 0;
	2325	if (inchar == *in_string)
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2326	*in_string= 0;
1 by brian clean slate	2327	else if (!ml_comment && !in_string &&
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2328	(inchar == '\'' \|\| inchar == '"' \|\| inchar == '`'))
	2329	*in_string= (char) inchar;
1 by brian clean slate	2330	if (!*ml_comment \|\| preserve_comments)
1 by brian clean slate	2331	{
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	2332	if (need_space && !isspace((char)inchar))
1 by brian clean slate	2333	*out++= ' ';
	2334	need_space= 0;
	2335	*out++= (char) inchar;
	2336	}
	2337	}
	2338	}
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2339	if (out != line \|\| (buffer->length() > 0))
1 by brian clean slate	2340	{
1 by brian clean slate	2341	*out++='\n';
895 by Brian Aker Completion (?) of uint conversion.	2342	uint32_t length=(uint32_t) (out-line);
1909.5.1 by Andrew Hutchings Re-write of linebuffer to stop buffer overrrun and hopefully improve performance	2343	if ((buffer->length() + length) > opt_max_input_line)
	2344	{
	2345	status.setExitStatus(1);
	2346	put_info(_("Not found a delimiter within max_input_line of input"), INFO_ERROR, 0, 0);
	2347	return 1;
	2348	}
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2349	if ((!*ml_comment \|\| preserve_comments))
	2350	buffer->append(line, length);
1 by brian clean slate	2351	}
142.1.2 by Patrick All DBUG_x removed from client/	2352	return(0);
1 by brian clean slate	2353	}
	2354
	2355	/*****************************************************************
1441.3.1 by Vijay Samuel all required updations have been made	2356	Interface to Readline Completion
	2357	******************************************************************/
1 by brian clean slate	2358
1 by brian clean slate	2359
182.1.6 by Jim Winstead Fix declaration of no_completion, drop 'new_' prefix from a function to make	2360	static char *mysql_completion (const char text, int start, int end);
520.4.43 by mordred A set of Solaris fixes.	2361	extern "C" char new_command_generator(const char text, int);
182.1.6 by Jim Winstead Fix declaration of no_completion, drop 'new_' prefix from a function to make	2362
1 by brian clean slate	2363	/*
	2364	Tell the GNU Readline library how to complete. We want to try to complete
	2365	on command names if this is the first word in the line, or on filenames
	2366	if not.
	2367	*/
632.1.12 by Monty Taylor Fixed more sun studio warnings.	2368	static char no_completion(const char , int)
1 by brian clean slate	2369	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2370	/* No filename completion */
	2371	return 0;
1 by brian clean slate	2372	}
182.1.6 by Jim Winstead Fix declaration of no_completion, drop 'new_' prefix from a function to make	2373
1 by brian clean slate	2374
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2375	/* glues pieces of history back together if in pieces */
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2376	static void fix_history(string *final_command)
1 by brian clean slate	2377	{
1 by brian clean slate	2378	int total_lines = 1;
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2379	const char *ptr = final_command->c_str();
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	2380	char str_char = '\0'; /* Character if we are in a string or not */
	2381
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2382	/* Converted buffer */
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2383	string fixed_buffer;
287.3.19 by Monty Taylor Added string.reserve() calls.	2384	fixed_buffer.reserve(512);
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2385
1 by brian clean slate	2386	/* find out how many lines we have and remove newlines */
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2387	while (*ptr != '\0')
1 by brian clean slate	2388	{
	2389	switch (*ptr) {
	2390	/* string character */
	2391	case '"':
	2392	case '\'':
	2393	case '`':
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2394	// open string
	2395	if (str_char == '\0')
	2396	str_char = *ptr;
1 by brian clean slate	2397	else if (str_char == ptr) / close string */
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2398	str_char = '\0';
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2399	fixed_buffer.append(ptr, 1);
1 by brian clean slate	2400	break;
1 by brian clean slate	2401	case '\n':
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2402	/*
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2403	not in string, change to space
	2404	if in string, leave it alone
1 by brian clean slate	2405	*/
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2406	fixed_buffer.append((str_char == '\0') ? " " : "\n");
1 by brian clean slate	2407	total_lines++;
	2408	break;
	2409	case '\\':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2410	fixed_buffer.append("\\");
1 by brian clean slate	2411	/* need to see if the backslash is escaping anything */
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2412	if (str_char)
1 by brian clean slate	2413	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2414	ptr++;
	2415	/* special characters that need escaping */
	2416	if (ptr == '\'' \|\| ptr == '"' \|\| *ptr == '\\')
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2417	fixed_buffer.append(ptr, 1);
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2418	else
	2419	ptr--;
1 by brian clean slate	2420	}
	2421	break;
	2422	default:
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2423	fixed_buffer.append(ptr, 1);
1 by brian clean slate	2424	}
	2425	ptr++;
	2426	}
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2427	if (total_lines > 1)
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2428	add_history(fixed_buffer.c_str());
1 by brian clean slate	2429	}
1 by brian clean slate	2430
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2431	/*
1 by brian clean slate	2432	returns 0 if line matches the previous history entry
	2433	returns 1 if the line doesn't match the previous history entry
	2434	*/
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2435	static int not_in_history(const char *line)
1 by brian clean slate	2436	{
1 by brian clean slate	2437	HIST_ENTRY *oldhist = history_get(history_length);
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2438
1 by brian clean slate	2439	if (oldhist == 0)
	2440	return 1;
	2441	if (strcmp(oldhist->line,line) == 0)
	2442	return 0;
	2443	return 1;
	2444	}
	2445
1567.5.2 by Vijay Samuel Merge OSX fix for client drizzle.	2446	static void initialize_readline (char *name)
1 by brian clean slate	2447	{
1 by brian clean slate	2448	/* Allow conditional parsing of the ~/.inputrc file. */
319 by Brian Aker Fix (yuck!) for OSX/Google bug.	2449	rl_readline_name= name;
1 by brian clean slate	2450
1 by brian clean slate	2451	/* Tell the completer that we want a crack first. */
236.1.15 by Monty Taylor Fixed the previous merge. (since I suck)	2452	rl_attempted_completion_function= (rl_completion_func_t*)&mysql_completion;
1149.2.1 by Monty Taylor Workaround for half-present new-interface on Snow Leopard, combined	2453	rl_completion_entry_function= (drizzle_compentry_func_t*)&no_completion;
1 by brian clean slate	2454	}
1 by brian clean slate	2455
182.1.6 by Jim Winstead Fix declaration of no_completion, drop 'new_' prefix from a function to make	2456
1 by brian clean slate	2457	/*
	2458	Attempt to complete on the contents of TEXT. START and END show the
	2459	region of TEXT that contains the word to complete. We can use the
	2460	entire line in case we want to do some simple parsing. Return the
	2461	array of matches, or NULL if there aren't any.
	2462	*/
632.1.12 by Monty Taylor Fixed more sun studio warnings.	2463	char *mysql_completion (const char text, int, int)
1 by brian clean slate	2464	{
1441.3.1 by Vijay Samuel all required updations have been made	2465	if (!status.getBatch() && !quick)
1 by brian clean slate	2466	return rl_completion_matches(text, new_command_generator);
	2467	else
	2468	return (char**) 0;
	2469	}
	2470
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2471	inline string lower_string(const string &from_string)
	2472	{
	2473	string to_string= from_string;
	2474	transform(to_string.begin(), to_string.end(),
	2475	to_string.begin(), ::tolower);
	2476	return to_string;
	2477	}
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2478	inline string lower_string(const char * from_string)
	2479	{
	2480	string to_string= from_string;
	2481	return lower_string(to_string);
	2482	}
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2483
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2484	template <class T>
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2485	class CompletionMatch :
	2486	public unary_function<const string&, bool>
	2487	{
	2488	string match_text;
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2489	T match_func;
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2490	public:
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2491	CompletionMatch(string text) : match_text(text) {}
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2492	inline bool operator() (const pair<string,string> &match_against) const
	2493	{
	2494	string sub_match=
	2495	lower_string(match_against.first.substr(0,match_text.size()));
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2496	return match_func(sub_match,match_text);
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2497	}
	2498	};
	2499
	2500
	2501
520.4.43 by mordred A set of Solaris fixes.	2502	extern "C"
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2503	char new_command_generator(const char text, int state)
1 by brian clean slate	2504	{
	2505
	2506	if (!state)
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2507	{
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2508	completion_string= lower_string(text);
	2509	if (completion_string.size() == 0)
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2510	{
	2511	completion_iter= completion_map.begin();
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2512	completion_end= completion_map.end();
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2513	}
	2514	else
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2515	{
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2516	completion_iter= find_if(completion_map.begin(), completion_map.end(),
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2517	CompletionMatch<equal_to<string> >(completion_string));
	2518	completion_end= find_if(completion_iter, completion_map.end(),
	2519	CompletionMatch<not_equal_to<string> >(completion_string));
	2520	}
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2521	}
923.2.7 by Monty Taylor Finished replacing custom HashMap with std::map. We use a map and not a set	2522	if (completion_iter == completion_end \|\| (size_t)state > completion_map.size())
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2523	return NULL;
	2524	char result= (char )malloc((*completion_iter).second.size()+1);
	2525	strcpy(result, (*completion_iter).second.c_str());
	2526	completion_iter++;
	2527	return result;
1 by brian clean slate	2528	}
	2529
	2530	/* Build up the completion hash */
	2531
	2532	static void build_completion_hash(bool rehash, bool write_info)
	2533	{
1441.3.1 by Vijay Samuel all required updations have been made	2534	Commands *cmd=commands;
928.1.1 by Eric Day Started client changes.	2535	drizzle_return_t ret;
	2536	drizzle_result_st databases,tables,fields;
	2537	drizzle_row_t database_row,table_row;
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2538	string tmp_str, tmp_str_lower;
2005.2.1 by Andrew Hutchings Move to using I_S instead of SHOW for hash lookup table. Also kill bug in fields list in the processes	2539	std::string query;
142.1.2 by Patrick All DBUG_x removed from client/	2540
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	2541	if (status.getBatch() \|\| quick \|\| current_db.empty())
206.3.1 by Patrick Galbraith Most everything working with client rename	2542	return; // We don't need completion in batches
1 by brian clean slate	2543	if (!rehash)
142.1.2 by Patrick All DBUG_x removed from client/	2544	return;
1 by brian clean slate	2545
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2546	completion_map.clear();
1 by brian clean slate	2547
1 by brian clean slate	2548	/* hash this file's known subset of SQL commands */
1441.3.1 by Vijay Samuel all required updations have been made	2549	while (cmd->getName()) {
	2550	tmp_str= cmd->getName();
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2551	tmp_str_lower= lower_string(tmp_str);
	2552	completion_map[tmp_str_lower]= tmp_str;
1 by brian clean slate	2553	cmd++;
	2554	}
	2555
77.1.40 by Monty Taylor More naming changes.	2556	/* hash Drizzle functions (to be implemented) */
1 by brian clean slate	2557
1 by brian clean slate	2558	/* hash all database names */
2005.2.1 by Andrew Hutchings Move to using I_S instead of SHOW for hash lookup table. Also kill bug in fields list in the processes	2559	if (drizzle_query_str(&con, &databases, "select schema_name from information_schema.schemata", &ret) != NULL)
1 by brian clean slate	2560	{
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2561	if (ret == DRIZZLE_RETURN_OK)
1 by brian clean slate	2562	{
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2563	if (drizzle_result_buffer(&databases) != DRIZZLE_RETURN_OK)
	2564	put_info(drizzle_error(&drizzle),INFO_INFO,0,0);
	2565	else
1 by brian clean slate	2566	{
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2567	while ((database_row=drizzle_row_next(&databases)))
	2568	{
	2569	tmp_str= database_row[0];
	2570	tmp_str_lower= lower_string(tmp_str);
	2571	completion_map[tmp_str_lower]= tmp_str;
	2572	}
1 by brian clean slate	2573	}
1 by brian clean slate	2574	}
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2575
	2576	drizzle_result_free(&databases);
1 by brian clean slate	2577	}
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2578
2005.2.1 by Andrew Hutchings Move to using I_S instead of SHOW for hash lookup table. Also kill bug in fields list in the processes	2579	query= "select table_name, column_name from information_schema.columns where table_schema='";
	2580	query.append(current_db);
	2581	query.append("' order by table_name");
	2582
	2583	if (drizzle_query(&con, &fields, query.c_str(), query.length(),
	2584	&ret) != NULL)
1 by brian clean slate	2585	{
2005.2.1 by Andrew Hutchings Move to using I_S instead of SHOW for hash lookup table. Also kill bug in fields list in the processes	2586	if (ret == DRIZZLE_RETURN_OK &&
	2587	drizzle_result_buffer(&fields) == DRIZZLE_RETURN_OK)
1 by brian clean slate	2588	{
928.1.1 by Eric Day Started client changes.	2589	if (drizzle_result_row_count(&tables) > 0 && !opt_silent && write_info)
1 by brian clean slate	2590	{
1491.5.1 by Monty Taylor Removed bad spacing discovered while looking at translations.	2591	tee_fprintf(stdout,
	2592	_("Reading table information for completion of "
	2593	"table and column names\n"
	2594	"You can turn off this feature to get a quicker "
	2595	"startup with -A\n\n"));
1 by brian clean slate	2596	}
2005.2.1 by Andrew Hutchings Move to using I_S instead of SHOW for hash lookup table. Also kill bug in fields list in the processes	2597
	2598	std::string table_name;
	2599	while ((table_row=drizzle_row_next(&fields)))
1 by brian clean slate	2600	{
2005.2.1 by Andrew Hutchings Move to using I_S instead of SHOW for hash lookup table. Also kill bug in fields list in the processes	2601	if (table_name.compare(table_row[0]) != 0)
	2602	{
	2603	tmp_str= table_row[0];
	2604	tmp_str_lower= lower_string(tmp_str);
	2605	completion_map[tmp_str_lower]= tmp_str;
	2606	table_name= table_row[0];
	2607	}
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2608	tmp_str= table_row[0];
2005.2.1 by Andrew Hutchings Move to using I_S instead of SHOW for hash lookup table. Also kill bug in fields list in the processes	2609	tmp_str.append(".");
	2610	tmp_str.append(table_row[1]);
	2611	tmp_str_lower= lower_string(tmp_str);
	2612	completion_map[tmp_str_lower]= tmp_str;
	2613
	2614	tmp_str= table_row[1];
	2615	tmp_str_lower= lower_string(tmp_str);
	2616	completion_map[tmp_str_lower]= tmp_str;
	2617	}
	2618	}
	2619	}
	2620	drizzle_result_free(&fields);
923.2.6 by Monty Taylor Removing hand-done completion hash functions.	2621	completion_iter= completion_map.begin();
1 by brian clean slate	2622	}
1 by brian clean slate	2623
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2624	/* for gnu readline */
1 by brian clean slate	2625
	2626
	2627	static int reconnect(void)
	2628	{
	2629	if (opt_reconnect)
	2630	{
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	2631	put_info(_("No connection. Trying to reconnect..."),INFO_INFO,0,0);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2632	(void) com_connect((string *)0, 0);
1124.2.8 by Diego Medina Fixes lp bug#432210	2633	if (opt_rehash && connected)
1 by brian clean slate	2634	com_rehash(NULL, NULL);
1 by brian clean slate	2635	}
1136 by Brian Aker Merge for bug fixes.	2636	if (! connected)
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	2637	return put_info(_("Can't connect to the server\n"),INFO_ERROR,0,0);
1 by brian clean slate	2638	return 0;
	2639	}
	2640
77.3.7 by Monty Taylor Made mysql into a pure-C program.	2641	static void get_current_db(void)
1 by brian clean slate	2642	{
928.1.1 by Eric Day Started client changes.	2643	drizzle_return_t ret;
928.1.1 by Eric Day Started client changes.	2644	drizzle_result_st res;
1 by brian clean slate	2645
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	2646	current_db.erase();
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	2647	current_db= "";
1 by brian clean slate	2648	/* In case of error below current_db will be NULL */
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2649	if (drizzle_query_str(&con, &res, "SELECT DATABASE()", &ret) != NULL)
1 by brian clean slate	2650	{
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2651	if (ret == DRIZZLE_RETURN_OK &&
	2652	drizzle_result_buffer(&res) == DRIZZLE_RETURN_OK)
	2653	{
	2654	drizzle_row_t row= drizzle_row_next(&res);
	2655	if (row[0])
1593.1.4 by Vijay Samuel Merge Fixes for client drizzle.	2656	current_db.assign(row[0]);
1124.2.9 by Diego Medina Fixed a crash that came after fixing lp bug#432210 if you call use <db_name> twice on a	2657	drizzle_result_free(&res);
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	2658	}
1 by brian clean slate	2659	}
	2660	}
	2661
	2662	/***************************************************************************
1441.3.1 by Vijay Samuel all required updations have been made	2663	The different commands
	2664	***************************************************************************/
1 by brian clean slate	2665
1877.1.1 by Andrew Hutchings Use size_t for command in drizzle.cc	2666	int drizzleclient_real_query_for_lazy(const char *buf, size_t length,
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2667	drizzle_result_st *result,
	2668	uint32_t *error_code)
1 by brian clean slate	2669	{
928.1.1 by Eric Day Started client changes.	2670	drizzle_return_t ret;
928.1.1 by Eric Day Started client changes.	2671
893 by Brian Aker First pass of stripping uint	2672	for (uint32_t retry=0;; retry++)
1 by brian clean slate	2673	{
1 by brian clean slate	2674	int error;
928.1.1 by Eric Day Started client changes.	2675	if (drizzle_query(&con,result,buf,length,&ret) != NULL &&
	2676	ret == DRIZZLE_RETURN_OK)
	2677	{
1 by brian clean slate	2678	return 0;
928.1.1 by Eric Day Started client changes.	2679	}
928.1.1 by Eric Day Started client changes.	2680	error= put_error(&con, result);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2681
	2682	if (ret == DRIZZLE_RETURN_ERROR_CODE)
	2683	{
	2684	*error_code= drizzle_result_error_code(result);
	2685	drizzle_result_free(result);
	2686	}
	2687
	2688	if (ret != DRIZZLE_RETURN_SERVER_GONE \|\| retry > 1 \|\|
1 by brian clean slate	2689	!opt_reconnect)
928.1.1 by Eric Day Started client changes.	2690	{
1 by brian clean slate	2691	return error;
928.1.1 by Eric Day Started client changes.	2692	}
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2693
1 by brian clean slate	2694	if (reconnect())
	2695	return error;
	2696	}
	2697	}
	2698
928.1.1 by Eric Day Started client changes.	2699	int drizzleclient_store_result_for_lazy(drizzle_result_st *result)
1 by brian clean slate	2700	{
928.1.1 by Eric Day Started client changes.	2701	if (drizzle_result_buffer(result) == DRIZZLE_RETURN_OK)
1 by brian clean slate	2702	return 0;
1 by brian clean slate	2703
928.1.1 by Eric Day Started client changes.	2704	if (drizzle_con_error(&con)[0])
1746.4.1 by Andrew Hutchings An error whilst getting results instead of query meant results were not freed causing segfault on exit cleanup	2705	{
	2706	int ret= put_error(&con, result);
	2707	drizzle_result_free(result);
	2708	return ret;
	2709	}
1 by brian clean slate	2710	return 0;
	2711	}
	2712
	2713	static int
820.2.1 by Toru Maesaka Killed dead code and removed a reference to a non-existent help option	2714	com_help(string buffer, const char )
1 by brian clean slate	2715	{
1 by brian clean slate	2716	register int i, j;
520.4.43 by mordred A set of Solaris fixes.	2717	char buff[32], *end;
1720.3.2 by LinuxJedi Fix bug #617510:	2718	std::vector<char> output_buff;
1720.3.2 by LinuxJedi Fix bug #617510:	2719	output_buff.resize(512);
1 by brian clean slate	2720
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	2721	put_info(_("List of all Drizzle commands:"), INFO_INFO,0,0);
1 by brian clean slate	2722	if (!named_cmds)
1720.3.2 by LinuxJedi Fix bug #617510:	2723	{
	2724	snprintf(&output_buff[0], output_buff.size(),
	2725	_("Note that all text commands must be first on line and end with '%s' or \\g"),
	2726	delimiter);
	2727	put_info(&output_buff[0], INFO_INFO, 0, 0);
	2728	}
1441.3.1 by Vijay Samuel all required updations have been made	2729	for (i = 0; commands[i].getName(); i++)
1 by brian clean slate	2730	{
1441.3.1 by Vijay Samuel all required updations have been made	2731	end= strcpy(buff, commands[i].getName());
	2732	end+= strlen(commands[i].getName());
	2733	for (j= (int)strlen(commands[i].getName()); j < 10; j++)
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	2734	end= strcpy(end, " ")+1;
1 by brian clean slate	2735	if (commands[i].func)
1 by brian clean slate	2736	tee_fprintf(stdout, "%s(\\%c) %s\n", buff,
1441.3.1 by Vijay Samuel all required updations have been made	2737	commands[i].getCmdChar(), _(commands[i].getDoc()));
1 by brian clean slate	2738	}
820.2.1 by Toru Maesaka Killed dead code and removed a reference to a non-existent help option	2739	tee_fprintf(stdout, "\n");
	2740	buffer->clear();
1 by brian clean slate	2741	return 0;
	2742	}
	2743
	2744
	2745	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	2746	com_clear(string buffer, const char )
1 by brian clean slate	2747	{
1441.3.1 by Vijay Samuel all required updations have been made	2748	if (status.getAddToHistory())
1 by brian clean slate	2749	fix_history(buffer);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2750	buffer->clear();
1 by brian clean slate	2751	return 0;
	2752	}
	2753
	2754
	2755	/*
	2756	Execute command
1441.3.1 by Vijay Samuel all required updations have been made	2757	Returns: 0 if ok
	2758	-1 if not fatal error
	2759	1 if fatal error
1 by brian clean slate	2760	*/
1 by brian clean slate	2761	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	2762	com_go(string buffer, const char )
1 by brian clean slate	2763	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2764	char buff[200]; /* about 110 chars used so far */
	2765	char time_buff[52+3+1]; /* time max + space&parens + NUL */
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2766	drizzle_result_st result;
	2767	drizzle_return_t ret;
	2768	uint32_t timer, warnings= 0;
	2769	uint32_t error= 0;
	2770	uint32_t error_code= 0;
1 by brian clean slate	2771	int err= 0;
	2772
	2773	interrupted_query= 0;
	2774
	2775	/* Remove garbage for nicer messages */
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2776	remove_cntrl(buffer);
1 by brian clean slate	2777
287.3.17 by Monty Taylor Fixed null-query problem.	2778	if (buffer->empty())
1 by brian clean slate	2779	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2780	// Ignore empty quries
1441.3.1 by Vijay Samuel all required updations have been made	2781	if (status.getBatch())
1 by brian clean slate	2782	return 0;
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	2783	return put_info(_("No query specified\n"),INFO_ERROR,0,0);
1 by brian clean slate	2784
	2785	}
	2786	if (!connected && reconnect())
	2787	{
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2788	// Remove query on error
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2789	buffer->clear();
1 by brian clean slate	2790	return opt_reconnect ? -1 : 1; // Fatal error
	2791	}
	2792	if (verbose)
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2793	(void) com_print(buffer, 0);
1 by brian clean slate	2794
1 by brian clean slate	2795	if (skip_updates &&
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2796	((buffer->length() < 4) \|\| (buffer->find( "SET ") != 0)))
1 by brian clean slate	2797	{
202.3.13 by Monty Taylor Changed gettext() to _() in drizzle.c.	2798	(void) put_info(_("Ignoring query to other database"),INFO_INFO,0,0);
1 by brian clean slate	2799	return 0;
	2800	}
	2801
	2802	timer=start_timer();
	2803	executing_query= 1;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2804	error= drizzleclient_real_query_for_lazy(buffer->c_str(),buffer->length(),&result, &error_code);
1 by brian clean slate	2805
1441.3.1 by Vijay Samuel all required updations have been made	2806	if (status.getAddToHistory())
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	2807	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2808	buffer->append(vertical ? "\\G" : delimiter);
1 by brian clean slate	2809	/* Append final command onto history */
	2810	fix_history(buffer);
	2811	}
	2812
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2813	buffer->clear();
1 by brian clean slate	2814
	2815	if (error)
	2816	goto end;
	2817
	2818	do
	2819	{
	2820	char *pos;
	2821
	2822	if (quick)
	2823	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2824	if (drizzle_column_buffer(&result) != DRIZZLE_RETURN_OK)
1 by brian clean slate	2825	{
928.1.1 by Eric Day Started client changes.	2826	error= put_error(&con, &result);
1 by brian clean slate	2827	goto end;
	2828	}
	2829	}
	2830	else
	2831	{
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	2832	error= drizzleclient_store_result_for_lazy(&result);
1 by brian clean slate	2833	if (error)
	2834	goto end;
	2835	}
	2836
	2837	if (verbose >= 3 \|\| !opt_silent)
206.3.1 by Patrick Galbraith Most everything working with client rename	2838	drizzle_end_timer(timer,time_buff);
1 by brian clean slate	2839	else
	2840	time_buff[0]= '\0';
	2841
	2842	/* Every branch must truncate buff . */
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2843	if (drizzle_result_column_count(&result) > 0)
1 by brian clean slate	2844	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2845	if (!quick && drizzle_result_row_count(&result) == 0 &&
	2846	!column_types_flag)
1 by brian clean slate	2847	{
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	2848	strcpy(buff, _("Empty set"));
1 by brian clean slate	2849	}
	2850	else
	2851	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2852	init_pager();
266.2.1 by Jim Winstead Remove HTML and XML output support from drizzle client	2853	if (vertical \|\| (auto_vertical_output &&
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2854	(terminal_width < get_result_width(&result))))
	2855	print_table_data_vertically(&result);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2856	else if (opt_silent && verbose <= 2 && !output_tables)
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2857	print_tab_data(&result);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2858	else
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2859	print_table_data(&result);
1441.3.1 by Vijay Samuel all required updations have been made	2860	sprintf(buff,
	2861	ngettext("%ld row in set","%ld rows in set",
	2862	(long) drizzle_result_row_count(&result)),
	2863	(long) drizzle_result_row_count(&result));
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2864	end_pager();
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2865	if (drizzle_result_error_code(&result))
	2866	error= put_error(&con, &result);
1 by brian clean slate	2867	}
1 by brian clean slate	2868	}
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2869	else if (drizzle_result_affected_rows(&result) == ~(uint64_t) 0)
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	2870	strcpy(buff,_("Query OK"));
1 by brian clean slate	2871	else
1441.3.1 by Vijay Samuel all required updations have been made	2872	sprintf(buff, ngettext("Query OK, %ld row affected",
	2873	"Query OK, %ld rows affected",
	2874	(long) drizzle_result_affected_rows(&result)),
	2875	(long) drizzle_result_affected_rows(&result));
1 by brian clean slate	2876
376 by Brian Aker strend remove	2877	pos= strchr(buff, '\0');
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2878	if ((warnings= drizzle_result_warning_count(&result)))
1 by brian clean slate	2879	{
	2880	*pos++= ',';
	2881	*pos++= ' ';
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	2882	char warnings_buff[20];
	2883	memset(warnings_buff,0,20);
1441.3.1 by Vijay Samuel all required updations have been made	2884	sprintf(warnings_buff, "%d", warnings);
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	2885	strcpy(pos, warnings_buff);
	2886	pos+= strlen(warnings_buff);
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	2887	pos= strcpy(pos, " warning")+8;
1 by brian clean slate	2888	if (warnings != 1)
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2889	*pos++= 's';
1 by brian clean slate	2890	}
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	2891	strcpy(pos, time_buff);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	2892	put_info(buff,INFO_RESULT,0,0);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2893	if (strcmp(drizzle_result_info(&result), ""))
	2894	put_info(drizzle_result_info(&result),INFO_RESULT,0,0);
206.3.1 by Patrick Galbraith Most everything working with client rename	2895	put_info("",INFO_RESULT,0,0); // Empty row
1 by brian clean slate	2896
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2897	if (unbuffered)
1 by brian clean slate	2898	fflush(stdout);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2899	drizzle_result_free(&result);
	2900
	2901	if (drizzle_con_status(&con) & DRIZZLE_CON_STATUS_MORE_RESULTS_EXISTS)
	2902	{
	2903	if (drizzle_result_read(&con, &result, &ret) == NULL \|\|
	2904	ret != DRIZZLE_RETURN_OK)
	2905	{
	2906	if (ret == DRIZZLE_RETURN_ERROR_CODE)
	2907	{
	2908	error_code= drizzle_result_error_code(&result);
	2909	drizzle_result_free(&result);
	2910	}
	2911
	2912	error= put_error(&con, NULL);
	2913	goto end;
	2914	}
	2915	}
	2916
	2917	} while (drizzle_con_status(&con) & DRIZZLE_CON_STATUS_MORE_RESULTS_EXISTS);
1 by brian clean slate	2918	if (err >= 1)
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2919	error= put_error(&con, NULL);
1 by brian clean slate	2920
	2921	end:
	2922
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	2923	/* Show warnings if any or error occured */
1 by brian clean slate	2924	if (show_warnings == 1 && (warnings >= 1 \|\| error))
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2925	print_warnings(error_code);
1 by brian clean slate	2926
1441.3.1 by Vijay Samuel all required updations have been made	2927	if (!error && !status.getBatch() &&
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2928	drizzle_con_status(&con) & DRIZZLE_CON_STATUS_DB_DROPPED)
	2929	{
1 by brian clean slate	2930	get_current_db();
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2931	}
1 by brian clean slate	2932
1 by brian clean slate	2933	executing_query= 0;
206.3.1 by Patrick Galbraith Most everything working with client rename	2934	return error; /* New command follows */
1 by brian clean slate	2935	}
	2936
	2937
	2938	static void init_pager()
	2939	{
	2940	if (!opt_nopager)
	2941	{
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	2942	if (!(PAGER= popen(pager.c_str(), "w")))
1 by brian clean slate	2943	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	2944	tee_fprintf(stdout,_( "popen() failed! defaulting PAGER to stdout!\n"));
1 by brian clean slate	2945	PAGER= stdout;
	2946	}
	2947	}
	2948	else
	2949	PAGER= stdout;
	2950	}
	2951
	2952	static void end_pager()
	2953	{
	2954	if (!opt_nopager)
	2955	pclose(PAGER);
	2956	}
	2957
	2958
	2959	static void init_tee(const char *file_name)
	2960	{
	2961	FILE* new_outfile;
	2962	if (opt_outfile)
	2963	end_tee();
910.1.3 by Brian Aker Remove my_fopen() and key_map.cc file (thanks to Jay's lcov)	2964	if (!(new_outfile= fopen(file_name, "a")))
1 by brian clean slate	2965	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	2966	tee_fprintf(stdout, _("Error logging to file '%s'\n"), file_name);
1 by brian clean slate	2967	return;
	2968	}
	2969	OUTFILE = new_outfile;
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	2970	outfile.assign(file_name);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	2971	tee_fprintf(stdout, _("Logging to file '%s'\n"), file_name);
1 by brian clean slate	2972	opt_outfile= 1;
910.1.3 by Brian Aker Remove my_fopen() and key_map.cc file (thanks to Jay's lcov)	2973
1 by brian clean slate	2974	return;
	2975	}
	2976
	2977
	2978	static void end_tee()
	2979	{
910.1.3 by Brian Aker Remove my_fopen() and key_map.cc file (thanks to Jay's lcov)	2980	fclose(OUTFILE);
1 by brian clean slate	2981	OUTFILE= 0;
	2982	opt_outfile= 0;
	2983	return;
	2984	}
	2985
	2986
	2987	static int
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	2988	com_ego(string buffer,const char line)
1 by brian clean slate	2989	{
	2990	int result;
	2991	bool oldvertical=vertical;
	2992	vertical=1;
	2993	result=com_go(buffer,line);
	2994	vertical=oldvertical;
	2995	return result;
	2996	}
	2997
	2998
928.1.3 by Eric Day More changes towards getting the client utilities converted.	2999	static const char *fieldtype2str(drizzle_column_type_t type)
1 by brian clean slate	3000	{
1 by brian clean slate	3001	switch (type) {
1441.3.1 by Vijay Samuel all required updations have been made	3002	case DRIZZLE_COLUMN_TYPE_BLOB: return "BLOB";
	3003	case DRIZZLE_COLUMN_TYPE_DATE: return "DATE";
	3004	case DRIZZLE_COLUMN_TYPE_DATETIME: return "DATETIME";
	3005	case DRIZZLE_COLUMN_TYPE_NEWDECIMAL: return "DECIMAL";
	3006	case DRIZZLE_COLUMN_TYPE_DOUBLE: return "DOUBLE";
	3007	case DRIZZLE_COLUMN_TYPE_ENUM: return "ENUM";
	3008	case DRIZZLE_COLUMN_TYPE_LONG: return "LONG";
	3009	case DRIZZLE_COLUMN_TYPE_LONGLONG: return "LONGLONG";
	3010	case DRIZZLE_COLUMN_TYPE_NULL: return "NULL";
	3011	case DRIZZLE_COLUMN_TYPE_TIMESTAMP: return "TIMESTAMP";
	3012	default: return "?-unknown-?";
1 by brian clean slate	3013	}
	3014	}
	3015
893 by Brian Aker First pass of stripping uint	3016	static char *fieldflags2str(uint32_t f) {
1 by brian clean slate	3017	static char buf[1024];
	3018	char *s=buf;
	3019	*s=0;
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3020	#define ff2s_check_flag(X) \
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3021	if (f & DRIZZLE_COLUMN_FLAGS_ ## X) { s=strcpy(s, # X " ")+strlen(# X " "); \
1441.3.1 by Vijay Samuel all required updations have been made	3022	f &= ~ DRIZZLE_COLUMN_FLAGS_ ## X; }
1 by brian clean slate	3023	ff2s_check_flag(NOT_NULL);
	3024	ff2s_check_flag(PRI_KEY);
	3025	ff2s_check_flag(UNIQUE_KEY);
	3026	ff2s_check_flag(MULTIPLE_KEY);
	3027	ff2s_check_flag(BLOB);
	3028	ff2s_check_flag(UNSIGNED);
	3029	ff2s_check_flag(BINARY);
	3030	ff2s_check_flag(ENUM);
	3031	ff2s_check_flag(AUTO_INCREMENT);
	3032	ff2s_check_flag(TIMESTAMP);
	3033	ff2s_check_flag(SET);
	3034	ff2s_check_flag(NO_DEFAULT_VALUE);
	3035	ff2s_check_flag(NUM);
	3036	ff2s_check_flag(PART_KEY);
	3037	ff2s_check_flag(GROUP);
	3038	ff2s_check_flag(UNIQUE);
	3039	ff2s_check_flag(BINCMP);
	3040	ff2s_check_flag(ON_UPDATE_NOW);
	3041	#undef ff2s_check_flag
	3042	if (f)
1441.3.1 by Vijay Samuel all required updations have been made	3043	sprintf(s, " unknows=0x%04x", f);
1 by brian clean slate	3044	return buf;
	3045	}
	3046
	3047	static void
928.1.1 by Eric Day Started client changes.	3048	print_field_types(drizzle_result_st *result)
1 by brian clean slate	3049	{
928.1.1 by Eric Day Started client changes.	3050	drizzle_column_st *field;
893 by Brian Aker First pass of stripping uint	3051	uint32_t i=0;
1 by brian clean slate	3052
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3053	while ((field = drizzle_column_next(result)))
1 by brian clean slate	3054	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3055	tee_fprintf(PAGER, _("Field %3u: `%s`\n"
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3056	"Catalog: `%s`\n"
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	3057	"Schema: `%s`\n"
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3058	"Table: `%s`\n"
	3059	"Org_table: `%s`\n"
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3060	"Type: UTF-8\n"
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3061	"Collation: %s (%u)\n"
	3062	"Length: %lu\n"
	3063	"Max_length: %lu\n"
	3064	"Decimals: %u\n"
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3065	"Flags: %s\n\n"),
1 by brian clean slate	3066	++i,
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3067	drizzle_column_name(field), drizzle_column_catalog(field),
	3068	drizzle_column_db(field), drizzle_column_table(field),
	3069	drizzle_column_orig_table(field),
	3070	fieldtype2str(drizzle_column_type(field)),
	3071	drizzle_column_charset(field), drizzle_column_size(field),
	3072	drizzle_column_max_size(field), drizzle_column_decimals(field),
	3073	fieldflags2str(drizzle_column_flags(field)));
1 by brian clean slate	3074	}
	3075	tee_puts("", PAGER);
	3076	}
	3077
	3078	static void
928.1.1 by Eric Day Started client changes.	3079	print_table_data(drizzle_result_st *result)
1 by brian clean slate	3080	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3081	drizzle_row_t cur;
	3082	drizzle_return_t ret;
	3083	drizzle_column_st *field;
1707.1.22 by Brian Aker Small cleanup in mysql.cc	3084	std::vector<bool> num_flag;
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3085	string separator;
660.1.3 by Eric Herman removed trailing whitespace with simple script:	3086
287.3.19 by Monty Taylor Added string.reserve() calls.	3087	separator.reserve(256);
1 by brian clean slate	3088
1707.1.22 by Brian Aker Small cleanup in mysql.cc	3089	num_flag.resize(drizzle_result_column_count(result));
1 by brian clean slate	3090	if (column_types_flag)
	3091	{
	3092	print_field_types(result);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3093	if (!drizzle_result_row_count(result))
1 by brian clean slate	3094	return;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3095	drizzle_column_seek(result,0);
1 by brian clean slate	3096	}
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3097	separator.append("+");
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3098	while ((field = drizzle_column_next(result)))
1 by brian clean slate	3099	{
840.3.1 by Toru Maesaka Fixed the issue of seeing an oversized separator when rendering a multibyte string to console.	3100	uint32_t x, length= 0;
	3101
	3102	if (column_names)
	3103	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3104	uint32_t name_length= strlen(drizzle_column_name(field));
	3105
840.3.1 by Toru Maesaka Fixed the issue of seeing an oversized separator when rendering a multibyte string to console.	3106	/* Check if the max_byte value is really the maximum in terms
1441.3.1 by Vijay Samuel all required updations have been made	3107	of visual length since multibyte characters can affect the
	3108	length of the separator. */
1567.3.21 by Monty Taylor Moved function from drizzle client to the utf8 header where it belongs.	3109	length= drizzled::utf8::char_length(drizzle_column_name(field));
840.3.1 by Toru Maesaka Fixed the issue of seeing an oversized separator when rendering a multibyte string to console.	3110
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3111	if (name_length == drizzle_column_max_size(field))
840.1.15 by Monty Taylor Merged from Toru.	3112	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3113	if (length < drizzle_column_max_size(field))
	3114	drizzle_column_set_max_size(field, length);
840.1.15 by Monty Taylor Merged from Toru.	3115	}
840.3.1 by Toru Maesaka Fixed the issue of seeing an oversized separator when rendering a multibyte string to console.	3116	else
840.1.15 by Monty Taylor Merged from Toru.	3117	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3118	length= name_length;
840.1.15 by Monty Taylor Merged from Toru.	3119	}
840.3.1 by Toru Maesaka Fixed the issue of seeing an oversized separator when rendering a multibyte string to console.	3120	}
1441.3.1 by Vijay Samuel all required updations have been made	3121
1 by brian clean slate	3122	if (quick)
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3123	length=max(length,drizzle_column_size(field));
1 by brian clean slate	3124	else
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3125	length=max(length,(uint32_t)drizzle_column_max_size(field));
	3126	if (length < 4 &&
	3127	!(drizzle_column_flags(field) & DRIZZLE_COLUMN_FLAGS_NOT_NULL))
	3128	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3129	// Room for "NULL"
	3130	length=4;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3131	}
	3132	drizzle_column_set_max_size(field, length);
840.3.1 by Toru Maesaka Fixed the issue of seeing an oversized separator when rendering a multibyte string to console.	3133
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3134	for (x=0; x< (length+2); x++)
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3135	separator.append("-");
	3136	separator.append("+");
1 by brian clean slate	3137	}
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3138
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3139	tee_puts((char*) separator.c_str(), PAGER);
1 by brian clean slate	3140	if (column_names)
1 by brian clean slate	3141	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3142	drizzle_column_seek(result,0);
1 by brian clean slate	3143	(void) tee_fputs("\|", PAGER);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3144	for (uint32_t off=0; (field = drizzle_column_next(result)) ; off++)
1 by brian clean slate	3145	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3146	uint32_t name_length= (uint32_t) strlen(drizzle_column_name(field));
1567.3.21 by Monty Taylor Moved function from drizzle client to the utf8 header where it belongs.	3147	uint32_t numcells= drizzled::utf8::char_length(drizzle_column_name(field));
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3148	uint32_t display_length= drizzle_column_max_size(field) + name_length -
1441.3.1 by Vijay Samuel all required updations have been made	3149	numcells;
1 by brian clean slate	3150	tee_fprintf(PAGER, " %-*s \|",(int) min(display_length,
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3151	MAX_COLUMN_LENGTH),
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3152	drizzle_column_name(field));
	3153	num_flag[off]= ((drizzle_column_type(field) <= DRIZZLE_COLUMN_TYPE_LONGLONG) \|\|
	3154	(drizzle_column_type(field) == DRIZZLE_COLUMN_TYPE_NEWDECIMAL));
1 by brian clean slate	3155	}
1 by brian clean slate	3156	(void) tee_fputs("\n", PAGER);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3157	tee_puts((char*) separator.c_str(), PAGER);
1 by brian clean slate	3158	}
1 by brian clean slate	3159
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3160	while (1)
1 by brian clean slate	3161	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3162	if (quick)
	3163	{
	3164	cur= drizzle_row_buffer(result, &ret);
	3165	if (ret != DRIZZLE_RETURN_OK)
	3166	{
	3167	(void)put_error(&con, result);
	3168	break;
	3169	}
	3170	}
	3171	else
	3172	cur= drizzle_row_next(result);
	3173
	3174	if (cur == NULL \|\| interrupted_query)
1 by brian clean slate	3175	break;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3176
	3177	size_t *lengths= drizzle_row_field_sizes(result);
1 by brian clean slate	3178	(void) tee_fputs("\| ", PAGER);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3179	drizzle_column_seek(result, 0);
	3180	for (uint32_t off= 0; off < drizzle_result_column_count(result); off++)
1 by brian clean slate	3181	{
1 by brian clean slate	3182	const char *buffer;
893 by Brian Aker First pass of stripping uint	3183	uint32_t data_length;
	3184	uint32_t field_max_length;
	3185	uint32_t visible_length;
	3186	uint32_t extra_padding;
1 by brian clean slate	3187
	3188	if (cur[off] == NULL)
	3189	{
	3190	buffer= "NULL";
	3191	data_length= 4;
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3192	}
	3193	else
1 by brian clean slate	3194	{
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	3195	buffer= cur[off];
895 by Brian Aker Completion (?) of uint conversion.	3196	data_length= (uint32_t) lengths[off];
1 by brian clean slate	3197	}
1 by brian clean slate	3198
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3199	field= drizzle_column_next(result);
	3200	field_max_length= drizzle_column_max_size(field);
1 by brian clean slate	3201
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3202	/*
	3203	How many text cells on the screen will this string span? If it contains
	3204	multibyte characters, then the number of characters we occupy on screen
	3205	will be fewer than the number of bytes we occupy in memory.
1 by brian clean slate	3206
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3207	We need to find how much screen real-estate we will occupy to know how
	3208	many extra padding-characters we should send with the printing function.
1 by brian clean slate	3209	*/
1567.3.21 by Monty Taylor Moved function from drizzle client to the utf8 header where it belongs.	3210	visible_length= drizzled::utf8::char_length(buffer);
1 by brian clean slate	3211	extra_padding= data_length - visible_length;
	3212
	3213	if (field_max_length > MAX_COLUMN_LENGTH)
1075 by Brian Aker Fix for CentOS	3214	tee_print_sized_data(buffer, data_length, MAX_COLUMN_LENGTH+extra_padding, false);
1 by brian clean slate	3215	else
	3216	{
	3217	if (num_flag[off] != 0) /* if it is numeric, we right-justify it */
1075 by Brian Aker Fix for CentOS	3218	tee_print_sized_data(buffer, data_length, field_max_length+extra_padding, true);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3219	else
77.3.1 by Monty Taylor First steps in removing sql_string and using glib instead.	3220	tee_print_sized_data(buffer, data_length,
1075 by Brian Aker Fix for CentOS	3221	field_max_length+extra_padding, false);
1 by brian clean slate	3222	}
	3223	tee_fputs(" \| ", PAGER);
	3224	}
	3225	(void) tee_fputs("\n", PAGER);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3226	if (quick)
	3227	drizzle_row_free(result, cur);
1 by brian clean slate	3228	}
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3229	tee_puts(separator.c_str(), PAGER);
1 by brian clean slate	3230	}
	3231
	3232	/**
1441.3.1 by Vijay Samuel all required updations have been made	3233	Return the length of a field after it would be rendered into text.
	3234
	3235	This doesn't know or care about multibyte characters. Assume we're
	3236	using such a charset. We can't know that all of the upcoming rows
	3237	for this column will have bytes that each render into some fraction
	3238	of a character. It's at least possible that a row has bytes that
	3239	all render into one character each, and so the maximum length is
	3240	still the number of bytes. (Assumption 1: This can't be better
	3241	because we can never know the number of characters that the DB is
	3242	going to send -- only the number of bytes. 2: Chars <= Bytes.)
	3243
	3244	@param field Pointer to a field to be inspected
	3245
	3246	@returns number of character positions to be used, at most
1 by brian clean slate	3247	*/
928.1.1 by Eric Day Started client changes.	3248	static int get_field_disp_length(drizzle_column_st *field)
1 by brian clean slate	3249	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3250	uint32_t length= column_names ? strlen(drizzle_column_name(field)) : 0;
1 by brian clean slate	3251
1 by brian clean slate	3252	if (quick)
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3253	length= max(length, drizzle_column_size(field));
1 by brian clean slate	3254	else
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3255	length= max(length, (uint32_t)drizzle_column_max_size(field));
1 by brian clean slate	3256
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3257	if (length < 4 &&
1441.3.1 by Vijay Samuel all required updations have been made	3258	!(drizzle_column_flags(field) & DRIZZLE_COLUMN_FLAGS_NOT_NULL))
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3259	{
206.3.1 by Patrick Galbraith Most everything working with client rename	3260	length= 4; /* Room for "NULL" */
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3261	}
1 by brian clean slate	3262
	3263	return length;
	3264	}
	3265
	3266	/**
1441.3.1 by Vijay Samuel all required updations have been made	3267	For a new result, return the max number of characters that any
	3268	upcoming row may return.
	3269
	3270	@param result Pointer to the result to judge
	3271
	3272	@returns The max number of characters in any row of this result
1 by brian clean slate	3273	*/
928.1.1 by Eric Day Started client changes.	3274	static int get_result_width(drizzle_result_st *result)
1 by brian clean slate	3275	{
1 by brian clean slate	3276	unsigned int len= 0;
928.1.1 by Eric Day Started client changes.	3277	drizzle_column_st *field;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3278	uint16_t offset;
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3279
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3280	offset= drizzle_column_current(result);
142.1.2 by Patrick All DBUG_x removed from client/	3281	assert(offset == 0);
1 by brian clean slate	3282
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3283	while ((field= drizzle_column_next(result)) != NULL)
1 by brian clean slate	3284	len+= get_field_disp_length(field) + 3; /* plus bar, space, & final space */
1 by brian clean slate	3285
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3286	(void) drizzle_column_seek(result, offset);
1 by brian clean slate	3287
	3288	return len + 1; /* plus final bar. */
	3289	}
	3290
	3291	static void
	3292	tee_print_sized_data(const char *data, unsigned int data_length, unsigned int total_bytes_to_send, bool right_justified)
	3293	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3294	/*
1 by brian clean slate	3295	For '\0's print ASCII spaces instead, as '\0' is eaten by (at
1 by brian clean slate	3296	least my) console driver, and that messes up the pretty table
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3297	grid. (The \0 is also the reason we can't use fprintf() .)
1 by brian clean slate	3298	*/
	3299	unsigned int i;
	3300	const char *p;
	3301
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3302	if (right_justified)
1 by brian clean slate	3303	for (i= data_length; i < total_bytes_to_send; i++)
	3304	tee_putc((int)' ', PAGER);
	3305
	3306	for (i= 0, p= data; i < data_length; i+= 1, p+= 1)
	3307	{
	3308	if (*p == '\0')
	3309	tee_putc((int)' ', PAGER);
	3310	else
	3311	tee_putc((int)*p, PAGER);
	3312	}
	3313
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3314	if (! right_justified)
1 by brian clean slate	3315	for (i= data_length; i < total_bytes_to_send; i++)
	3316	tee_putc((int)' ', PAGER);
	3317	}
	3318
	3319
	3320
	3321	static void
928.1.1 by Eric Day Started client changes.	3322	print_table_data_vertically(drizzle_result_st *result)
1 by brian clean slate	3323	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3324	drizzle_row_t cur;
	3325	drizzle_return_t ret;
	3326	uint32_t max_length=0;
	3327	drizzle_column_st *field;
1 by brian clean slate	3328
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3329	while ((field = drizzle_column_next(result)))
1 by brian clean slate	3330	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3331	uint32_t length= strlen(drizzle_column_name(field));
1 by brian clean slate	3332	if (length > max_length)
1 by brian clean slate	3333	max_length= length;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3334	drizzle_column_set_max_size(field, length);
1 by brian clean slate	3335	}
1 by brian clean slate	3336
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3337	for (uint32_t row_count=1;; row_count++)
1 by brian clean slate	3338	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3339	if (quick)
	3340	{
	3341	cur= drizzle_row_buffer(result, &ret);
	3342	if (ret != DRIZZLE_RETURN_OK)
	3343	{
	3344	(void)put_error(&con, result);
	3345	break;
	3346	}
	3347	}
	3348	else
	3349	cur= drizzle_row_next(result);
	3350
	3351	if (cur == NULL \|\| interrupted_query)
1 by brian clean slate	3352	break;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3353	drizzle_column_seek(result,0);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3354	tee_fprintf(PAGER,
	3355	"************************* %d. row *************************\n", row_count);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3356	for (uint32_t off=0; off < drizzle_result_column_count(result); off++)
1 by brian clean slate	3357	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3358	field= drizzle_column_next(result);
	3359	tee_fprintf(PAGER, "%*s: ",(int) max_length,drizzle_column_name(field));
1 by brian clean slate	3360	tee_fprintf(PAGER, "%s\n",cur[off] ? (char*) cur[off] : "NULL");
1 by brian clean slate	3361	}
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3362	if (quick)
	3363	drizzle_row_free(result, cur);
1 by brian clean slate	3364	}
	3365	}
	3366
	3367
	3368	/* print_warnings should be called right after executing a statement */
	3369
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3370	static void print_warnings(uint32_t error_code)
1 by brian clean slate	3371	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3372	const char *query;
	3373	drizzle_result_st result;
	3374	drizzle_row_t cur;
157 by Brian Aker Second pass cleanup on removal of my_uint types	3375	uint64_t num_rows;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3376	uint32_t new_code= 0;
1548.1.1 by Hartmut Holzgraefe do not enable PAGER in print_warnings() when in batch mode (mysql bug #44732)	3377	FILE *out;
1 by brian clean slate	3378
	3379	/* Get the warnings */
	3380	query= "show warnings";
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3381	drizzleclient_real_query_for_lazy(query, strlen(query),&result,&new_code);
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	3382	drizzleclient_store_result_for_lazy(&result);
1 by brian clean slate	3383
1 by brian clean slate	3384	/* Bail out when no warnings */
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3385	if (!(num_rows= drizzle_result_row_count(&result)))
1 by brian clean slate	3386	goto end;
1 by brian clean slate	3387
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3388	cur= drizzle_row_next(&result);
1 by brian clean slate	3389
	3390	/*
	3391	Don't print a duplicate of the current error. It is possible for SHOW
	3392	WARNINGS to return multiple errors with the same code, but different
	3393	messages. To be safe, skip printing the duplicate only if it is the only
	3394	warning.
	3395	*/
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3396	if (!cur \|\| (num_rows == 1 &&
1441.3.1 by Vijay Samuel all required updations have been made	3397	error_code == (uint32_t) strtoul(cur[1], NULL, 10)))
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3398	{
1 by brian clean slate	3399	goto end;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3400	}
1 by brian clean slate	3401
1 by brian clean slate	3402	/* Print the warnings */
1548.1.1 by Hartmut Holzgraefe do not enable PAGER in print_warnings() when in batch mode (mysql bug #44732)	3403	if (status.getBatch())
	3404	{
1563 by Brian Aker Merge Hartmut	3405	out= stderr;
1548.1.1 by Hartmut Holzgraefe do not enable PAGER in print_warnings() when in batch mode (mysql bug #44732)	3406	}
	3407	else
	3408	{
	3409	init_pager();
1563 by Brian Aker Merge Hartmut	3410	out= PAGER;
1548.1.1 by Hartmut Holzgraefe do not enable PAGER in print_warnings() when in batch mode (mysql bug #44732)	3411	}
1 by brian clean slate	3412	do
1 by brian clean slate	3413	{
1548.1.1 by Hartmut Holzgraefe do not enable PAGER in print_warnings() when in batch mode (mysql bug #44732)	3414	tee_fprintf(out, "%s (Code %s): %s\n", cur[0], cur[1], cur[2]);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3415	} while ((cur= drizzle_row_next(&result)));
1563 by Brian Aker Merge Hartmut	3416
1563 by Brian Aker Merge Hartmut	3417	if (not status.getBatch())
1548.1.1 by Hartmut Holzgraefe do not enable PAGER in print_warnings() when in batch mode (mysql bug #44732)	3418	end_pager();
1 by brian clean slate	3419
1 by brian clean slate	3420	end:
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3421	drizzle_result_free(&result);
1 by brian clean slate	3422	}
	3423
	3424
	3425	static void
288 by Brian Aker ulong cleanp in client apps	3426	safe_put_field(const char *pos,uint32_t length)
1 by brian clean slate	3427	{
	3428	if (!pos)
	3429	tee_fputs("NULL", PAGER);
	3430	else
	3431	{
	3432	if (opt_raw_data)
	3433	tee_fputs(pos, PAGER);
	3434	else for (const char *end=pos+length ; pos != end ; pos++)
1085.3.3 by Monty Taylor Got rid of #ifdef have utf8 stuff.	3435	{
1085.3.3 by Monty Taylor Got rid of #ifdef have utf8 stuff.	3436	int l;
1567.3.20 by Monty Taylor Removed UTF-8 lib that we don't use.	3437	if ((l = drizzled::utf8::sequence_length(*pos)))
1085.3.3 by Monty Taylor Got rid of #ifdef have utf8 stuff.	3438	{
	3439	while (l--)
	3440	tee_putc(*pos++, PAGER);
	3441	pos--;
	3442	continue;
	3443	}
	3444	if (!*pos)
	3445	tee_fputs("\\0", PAGER); // This makes everything hard
	3446	else if (*pos == '\t')
	3447	tee_fputs("\\t", PAGER); // This would destroy tab format
	3448	else if (*pos == '\n')
	3449	tee_fputs("\\n", PAGER); // This too
	3450	else if (*pos == '\\')
	3451	tee_fputs("\\\\", PAGER);
	3452	else
	3453	tee_putc(*pos, PAGER);
	3454	}
1 by brian clean slate	3455	}
	3456	}
	3457
	3458
	3459	static void
928.1.1 by Eric Day Started client changes.	3460	print_tab_data(drizzle_result_st *result)
1 by brian clean slate	3461	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3462	drizzle_row_t cur;
	3463	drizzle_return_t ret;
	3464	drizzle_column_st *field;
	3465	size_t *lengths;
1 by brian clean slate	3466
	3467	if (opt_silent < 2 && column_names)
	3468	{
	3469	int first=0;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3470	while ((field = drizzle_column_next(result)))
1 by brian clean slate	3471	{
1 by brian clean slate	3472	if (first++)
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3473	(void) tee_fputs("\t", PAGER);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3474	(void) tee_fputs(drizzle_column_name(field), PAGER);
1 by brian clean slate	3475	}
	3476	(void) tee_fputs("\n", PAGER);
	3477	}
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3478	while (1)
1 by brian clean slate	3479	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3480	if (quick)
	3481	{
	3482	cur= drizzle_row_buffer(result, &ret);
	3483	if (ret != DRIZZLE_RETURN_OK)
	3484	{
	3485	(void)put_error(&con, result);
	3486	break;
	3487	}
	3488	}
	3489	else
	3490	cur= drizzle_row_next(result);
	3491
	3492	if (cur == NULL)
	3493	break;
	3494
	3495	lengths= drizzle_row_field_sizes(result);
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	3496	safe_put_field(cur[0],lengths[0]);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3497	for (uint32_t off=1 ; off < drizzle_result_column_count(result); off++)
1 by brian clean slate	3498	{
1 by brian clean slate	3499	(void) tee_fputs("\t", PAGER);
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	3500	safe_put_field(cur[off], lengths[off]);
1 by brian clean slate	3501	}
1 by brian clean slate	3502	(void) tee_fputs("\n", PAGER);
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3503	if (quick)
	3504	drizzle_row_free(result, cur);
1 by brian clean slate	3505	}
	3506	}
	3507
	3508	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3509	com_tee(string , const char line )
1 by brian clean slate	3510	{
520.4.43 by mordred A set of Solaris fixes.	3511	char file_name[FN_REFLEN], *end;
520.4.43 by mordred A set of Solaris fixes.	3512	const char *param;
1 by brian clean slate	3513
1441.3.1 by Vijay Samuel all required updations have been made	3514	if (status.getBatch())
1 by brian clean slate	3515	return 0;
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3516	while (isspace(*line))
1 by brian clean slate	3517	line++;
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3518	if (!(param =strchr(line, ' '))) // if outfile wasn't given, use the default
1 by brian clean slate	3519	{
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3520	if (outfile.empty())
1 by brian clean slate	3521	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3522	printf(_("No previous outfile available, you must give a filename!\n"));
1 by brian clean slate	3523	return 0;
	3524	}
	3525	else if (opt_outfile)
	3526	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3527	tee_fprintf(stdout, _("Currently logging to file '%s'\n"), outfile.c_str());
1 by brian clean slate	3528	return 0;
	3529	}
	3530	else
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3531	param= outfile.c_str(); //resume using the old outfile
1 by brian clean slate	3532	}
1 by brian clean slate	3533
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3534	/* @TODO: Replace this with string methods */
1 by brian clean slate	3535	/* eliminate the spaces before the parameters */
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3536	while (isspace(*param))
1 by brian clean slate	3537	param++;
629.5.3 by Toru Maesaka Third pass of replacing MySQL's strmake() with libc calls	3538	strncpy(file_name, param, sizeof(file_name) - 1);
	3539	end= file_name + strlen(file_name);
1 by brian clean slate	3540	/* remove end space from command line */
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3541	while (end > file_name && (isspace(end[-1]) \|\|
	3542	iscntrl(end[-1])))
1 by brian clean slate	3543	end--;
	3544	end[0]= 0;
	3545	if (end == file_name)
	3546	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3547	printf(_("No outfile specified!\n"));
1 by brian clean slate	3548	return 0;
	3549	}
	3550	init_tee(file_name);
	3551	return 0;
	3552	}
	3553
	3554
	3555	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3556	com_notee(string , const char )
1 by brian clean slate	3557	{
	3558	if (opt_outfile)
	3559	end_tee();
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3560	tee_fprintf(stdout, _("Outfile disabled.\n"));
1 by brian clean slate	3561	return 0;
	3562	}
	3563
	3564	/*
	3565	Sorry, this command is not available in Windows.
	3566	*/
	3567
	3568	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3569	com_pager(string , const char line)
1 by brian clean slate	3570	{
520.4.43 by mordred A set of Solaris fixes.	3571	const char *param;
1 by brian clean slate	3572
1441.3.1 by Vijay Samuel all required updations have been made	3573	if (status.getBatch())
1 by brian clean slate	3574	return 0;
1 by brian clean slate	3575	/* Skip spaces in front of the pager command */
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3576	while (isspace(*line))
1 by brian clean slate	3577	line++;
	3578	/* Skip the pager command */
	3579	param= strchr(line, ' ');
	3580	/* Skip the spaces between the command and the argument */
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3581	while (param && isspace(*param))
1 by brian clean slate	3582	param++;
1883.3.1 by Andrew Hutchings Cleanup drizzledump and drizzle for cppcheck	3583	if (!param \|\| (*param == '\0')) // if pager was not given, use the default
1 by brian clean slate	3584	{
	3585	if (!default_pager_set)
	3586	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3587	tee_fprintf(stdout, _("Default pager wasn't set, using stdout.\n"));
1 by brian clean slate	3588	opt_nopager=1;
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3589	pager.assign("stdout");
1 by brian clean slate	3590	PAGER= stdout;
	3591	return 0;
	3592	}
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3593	pager.assign(default_pager);
1 by brian clean slate	3594	}
	3595	else
	3596	{
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3597	string pager_name(param);
	3598	string::iterator end= pager_name.end();
	3599	while (end > pager_name.begin() &&
	3600	(isspace((end-1)) \|\| iscntrl((end-1))))
	3601	--end;
	3602	pager_name.erase(end, pager_name.end());
	3603	pager.assign(pager_name);
	3604	default_pager.assign(pager_name);
1 by brian clean slate	3605	}
1 by brian clean slate	3606	opt_nopager=0;
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3607	tee_fprintf(stdout, _("PAGER set to '%s'\n"), pager.c_str());
1 by brian clean slate	3608	return 0;
	3609	}
	3610
	3611
	3612	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3613	com_nopager(string , const char )
1 by brian clean slate	3614	{
1567.3.17 by Monty Taylor Removed more C-string strings. replaced with std::string.	3615	pager.assign("stdout");
1 by brian clean slate	3616	opt_nopager=1;
1 by brian clean slate	3617	PAGER= stdout;
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3618	tee_fprintf(stdout, _("PAGER set to stdout\n"));
1 by brian clean slate	3619	return 0;
	3620	}
	3621
	3622	/* If arg is given, exit without errors. This happens on command 'quit' */
	3623
	3624	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3625	com_quit(string , const char )
1 by brian clean slate	3626	{
1 by brian clean slate	3627	/* let the screen auto close on a normal shutdown */
1441.3.1 by Vijay Samuel all required updations have been made	3628	status.setExitStatus(0);
1 by brian clean slate	3629	return 1;
	3630	}
	3631
	3632	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3633	com_rehash(string , const char )
1 by brian clean slate	3634	{
	3635	build_completion_hash(1, 0);
	3636	return 0;
	3637	}
	3638
	3639
	3640
	3641	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3642	com_print(string buffer,const char )
1 by brian clean slate	3643	{
1 by brian clean slate	3644	tee_puts("--------------", stdout);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3645	(void) tee_fputs(buffer->c_str(), stdout);
	3646	if ( (buffer->length() == 0)
	3647	\|\| (buffer->c_str())[(buffer->length())-1] != '\n')
1 by brian clean slate	3648	tee_putc('\n', stdout);
1 by brian clean slate	3649	tee_puts("--------------\n", stdout);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3650	/* If empty buffer */
	3651	return 0;
1 by brian clean slate	3652	}
1 by brian clean slate	3653
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3654	/* ARGSUSED */
1 by brian clean slate	3655	static int
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3656	com_connect(string buffer, const char line)
1 by brian clean slate	3657	{
	3658	char *tmp, buff[256];
	3659	bool save_rehash= opt_rehash;
	3660	int error;
	3661
212.6.1 by Mats Kindahl Replacing all bzero() calls with memset() calls and removing the bzero.c file.	3662	memset(buff, 0, sizeof(buff));
1 by brian clean slate	3663	if (buffer)
	3664	{
	3665	/*
	3666	Two null bytes are needed in the end of buff to allow
	3667	get_arg to find end of string the second time it's called.
	3668	*/
629.5.3 by Toru Maesaka Third pass of replacing MySQL's strmake() with libc calls	3669	tmp= strncpy(buff, line, sizeof(buff)-2);
1 by brian clean slate	3670	#ifdef EXTRA_DEBUG
	3671	tmp[1]= 0;
	3672	#endif
	3673	tmp= get_arg(buff, 0);
	3674	if (tmp && *tmp)
	3675	{
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	3676	current_db.erase();
1593.1.4 by Vijay Samuel Merge Fixes for client drizzle.	3677	current_db.assign(tmp);
1 by brian clean slate	3678	tmp= get_arg(buff, 1);
	3679	if (tmp)
	3680	{
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	3681	current_host.erase();
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	3682	current_host=strdup(tmp);
1 by brian clean slate	3683	}
	3684	}
	3685	else
	3686	{
	3687	/* Quick re-connect */
971.6.11 by Eric Day Removed purecov messages.	3688	opt_rehash= 0;
1 by brian clean slate	3689	}
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3690	// command used
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	3691	assert(buffer!=NULL);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3692	buffer->clear();
1 by brian clean slate	3693	}
	3694	else
	3695	opt_rehash= 0;
2053.2.1 by Andrew Hutchings Fix hidden connect messages	3696	error=sql_connect(current_host, current_db, current_user, opt_password);
1 by brian clean slate	3697	opt_rehash= save_rehash;
	3698
	3699	if (connected)
	3700	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3701	sprintf(buff, _("Connection id: %u"), drizzle_con_thread_id(&con));
77.3.7 by Monty Taylor Made mysql into a pure-C program.	3702	put_info(buff,INFO_INFO,0,0);
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	3703	sprintf(buff, _("Current schema: %.128s\n"),
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3704	!current_db.empty() ? current_db.c_str() : _("* NONE *"));
77.3.7 by Monty Taylor Made mysql into a pure-C program.	3705	put_info(buff,INFO_INFO,0,0);
1 by brian clean slate	3706	}
	3707	return error;
	3708	}
	3709
	3710
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3711	static int com_source(string , const char line)
1 by brian clean slate	3712	{
520.4.43 by mordred A set of Solaris fixes.	3713	char source_name[FN_REFLEN], *end;
520.4.43 by mordred A set of Solaris fixes.	3714	const char *param;
1095.2.1 by Robert Klahn Replace typedef struct LINE_BUFFER with class LineBuffer, encapsulating current logic	3715	LineBuffer *line_buff;
1 by brian clean slate	3716	int error;
1441.3.1 by Vijay Samuel all required updations have been made	3717	Status old_status;
1 by brian clean slate	3718	FILE *sql_file;
	3719
	3720	/* Skip space from file name */
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3721	while (isspace(*line))
1 by brian clean slate	3722	line++;
206.3.1 by Patrick Galbraith Most everything working with client rename	3723	if (!(param = strchr(line, ' '))) // Skip command name
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3724	return put_info(_("Usage: \\. <filename> \| source <filename>"),
77.3.7 by Monty Taylor Made mysql into a pure-C program.	3725	INFO_ERROR, 0,0);
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3726	while (isspace(*param))
1 by brian clean slate	3727	param++;
629.5.3 by Toru Maesaka Third pass of replacing MySQL's strmake() with libc calls	3728	end= strncpy(source_name,param,sizeof(source_name)-1);
	3729	end+= strlen(source_name);
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3730	while (end > source_name && (isspace(end[-1]) \|\|
	3731	iscntrl(end[-1])))
1 by brian clean slate	3732	end--;
1 by brian clean slate	3733	end[0]=0;
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3734
1 by brian clean slate	3735	/* open file name */
910.1.3 by Brian Aker Remove my_fopen() and key_map.cc file (thanks to Jay's lcov)	3736	if (!(sql_file = fopen(source_name, "r")))
1 by brian clean slate	3737	{
1 by brian clean slate	3738	char buff[FN_REFLEN+60];
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3739	sprintf(buff, _("Failed to open file '%s', error: %d"), source_name,errno);
77.3.7 by Monty Taylor Made mysql into a pure-C program.	3740	return put_info(buff, INFO_ERROR, 0 ,0);
1 by brian clean slate	3741	}
1 by brian clean slate	3742
1095.2.6 by Robert Klahn Changes from additional code review feedback	3743	line_buff= new(std::nothrow) LineBuffer(opt_max_input_line,sql_file);
1095.2.4 by Robert Klahn changes from code review feedback	3744	if (line_buff == NULL)
1 by brian clean slate	3745	{
910.1.3 by Brian Aker Remove my_fopen() and key_map.cc file (thanks to Jay's lcov)	3746	fclose(sql_file);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3747	return put_info(_("Can't initialize LineBuffer"), INFO_ERROR, 0, 0);
1 by brian clean slate	3748	}
	3749
	3750	/* Save old status */
	3751	old_status=status;
212.6.10 by Mats Kindahl Removing redundant use of casts in client/ for memcmp(), memcpy(), memset(), and memmove().	3752	memset(&status, 0, sizeof(status));
1 by brian clean slate	3753
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3754	// Run in batch mode
1441.3.1 by Vijay Samuel all required updations have been made	3755	status.setBatch(old_status.getBatch());
	3756	status.setLineBuff(line_buff);
	3757	status.setFileName(source_name);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3758	// Empty command buffer
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	3759	assert(glob_buffer!=NULL);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	3760	glob_buffer->clear();
1 by brian clean slate	3761	error= read_and_execute(false);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3762	// Continue as before
	3763	status=old_status;
910.1.3 by Brian Aker Remove my_fopen() and key_map.cc file (thanks to Jay's lcov)	3764	fclose(sql_file);
1441.3.1 by Vijay Samuel all required updations have been made	3765	delete status.getLineBuff();
	3766	line_buff=0;
	3767	status.setLineBuff(0);
1 by brian clean slate	3768	return error;
	3769	}
	3770
	3771
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3772	/* ARGSUSED */
1 by brian clean slate	3773	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3774	com_delimiter(string , const char line)
1 by brian clean slate	3775	{
	3776	char buff[256], *tmp;
	3777
629.5.1 by Toru Maesaka First pass of replacing MySQL's strmake() with libc calls	3778	strncpy(buff, line, sizeof(buff) - 1);
1 by brian clean slate	3779	tmp= get_arg(buff, 0);
	3780
	3781	if (!tmp \|\| !*tmp)
	3782	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3783	put_info(_("DELIMITER must be followed by a 'delimiter' character or string"),
77.3.7 by Monty Taylor Made mysql into a pure-C program.	3784	INFO_ERROR, 0, 0);
1 by brian clean slate	3785	return 0;
	3786	}
	3787	else
	3788	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3789	if (strstr(tmp, "\\"))
1 by brian clean slate	3790	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3791	put_info(_("DELIMITER cannot contain a backslash character"),
77.3.7 by Monty Taylor Made mysql into a pure-C program.	3792	INFO_ERROR, 0, 0);
1 by brian clean slate	3793	return 0;
	3794	}
	3795	}
629.5.1 by Toru Maesaka First pass of replacing MySQL's strmake() with libc calls	3796	strncpy(delimiter, tmp, sizeof(delimiter) - 1);
1 by brian clean slate	3797	delimiter_length= (int)strlen(delimiter);
	3798	delimiter_str= delimiter;
	3799	return 0;
	3800	}
	3801
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	3802	/* ARGSUSED */
1 by brian clean slate	3803	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3804	com_use(string , const char line)
1 by brian clean slate	3805	{
	3806	char *tmp, buff[FN_REFLEN + 1];
	3807	int select_db;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3808	drizzle_result_st result;
	3809	drizzle_return_t ret;
1 by brian clean slate	3810
212.6.1 by Mats Kindahl Replacing all bzero() calls with memset() calls and removing the bzero.c file.	3811	memset(buff, 0, sizeof(buff));
629.5.1 by Toru Maesaka First pass of replacing MySQL's strmake() with libc calls	3812	strncpy(buff, line, sizeof(buff) - 1);
1 by brian clean slate	3813	tmp= get_arg(buff, 0);
	3814	if (!tmp \|\| !*tmp)
	3815	{
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	3816	put_info(_("USE must be followed by a schema name"), INFO_ERROR, 0, 0);
1 by brian clean slate	3817	return 0;
	3818	}
	3819	/*
	3820	We need to recheck the current database, because it may change
	3821	under our feet, for example if DROP DATABASE or RENAME DATABASE
	3822	(latter one not yet available by the time the comment was written)
	3823	*/
	3824	get_current_db();
	3825
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	3826	if (current_db.empty() \|\| strcmp(current_db.c_str(),tmp))
1 by brian clean slate	3827	{
	3828	if (one_database)
	3829	{
	3830	skip_updates= 1;
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	3831	select_db= 0; // don't do drizzleclient_select_db()
1 by brian clean slate	3832	}
1 by brian clean slate	3833	else
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	3834	select_db= 2; // do drizzleclient_select_db() and build_completion_hash()
1 by brian clean slate	3835	}
	3836	else
	3837	{
	3838	/*
	3839	USE to the current db specified.
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	3840	We do need to send drizzleclient_select_db() to make server
1 by brian clean slate	3841	update database level privileges, which might
	3842	change since last USE (see bug#10979).
	3843	For performance purposes, we'll skip rebuilding of completion hash.
	3844	*/
	3845	skip_updates= 0;
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	3846	select_db= 1; // do only drizzleclient_select_db(), without completion
1 by brian clean slate	3847	}
	3848
	3849	if (select_db)
	3850	{
	3851	/*
	3852	reconnect once if connection is down or if connection was found to
	3853	be down during query
	3854	*/
	3855	if (!connected && reconnect())
	3856	return opt_reconnect ? -1 : 1; // Fatal error
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	3857	for (bool try_again= true; try_again; try_again= false)
1 by brian clean slate	3858	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	3859	if (drizzle_select_db(&con,&result,tmp,&ret) == NULL \|\|
	3860	ret != DRIZZLE_RETURN_OK)
	3861	{
	3862	if (ret == DRIZZLE_RETURN_ERROR_CODE)
	3863	{
	3864	int error= put_error(&con, &result);
	3865	drizzle_result_free(&result);
	3866	return error;
	3867	}
	3868
	3869	if (ret != DRIZZLE_RETURN_SERVER_GONE \|\| !try_again)
	3870	return put_error(&con, NULL);
	3871
	3872	if (reconnect())
	3873	return opt_reconnect ? -1 : 1; // Fatal error
	3874	}
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	3875	else
	3876	drizzle_result_free(&result);
1 by brian clean slate	3877	}
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	3878	current_db.erase();
1593.1.4 by Vijay Samuel Merge Fixes for client drizzle.	3879	current_db.assign(tmp);
1 by brian clean slate	3880	if (select_db > 1)
	3881	build_completion_hash(opt_rehash, 1);
	3882	}
	3883
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	3884	put_info(_("Schema changed"),INFO_INFO, 0, 0);
1 by brian clean slate	3885	return 0;
	3886	}
	3887
1954 by Brian Aker This adds the command "shutdown" to the command line client. It does require	3888	static int com_shutdown(string , const char )
	3889	{
	3890	drizzle_result_st result;
	3891	drizzle_return_t ret;
	3892
	3893	if (verbose)
	3894	{
	3895	printf(_("shutting down drizzled"));
	3896	if (opt_drizzle_port > 0)
	3897	printf(_(" on port %d"), opt_drizzle_port);
	3898	printf("... ");
	3899	}
	3900
	3901	if (drizzle_shutdown(&con, &result, DRIZZLE_SHUTDOWN_DEFAULT,
	3902	&ret) == NULL \|\| ret != DRIZZLE_RETURN_OK)
	3903	{
	3904	if (ret == DRIZZLE_RETURN_ERROR_CODE)
	3905	{
	3906	fprintf(stderr, _("shutdown failed; error: '%s'"),
	3907	drizzle_result_error(&result));
	3908	drizzle_result_free(&result);
	3909	}
	3910	else
	3911	{
	3912	fprintf(stderr, _("shutdown failed; error: '%s'"),
	3913	drizzle_con_error(&con));
	3914	}
	3915	return false;
	3916	}
	3917
	3918	drizzle_result_free(&result);
	3919
	3920	if (verbose)
	3921	printf(_("done\n"));
	3922
	3923	return false;
	3924	}
	3925
1 by brian clean slate	3926	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3927	com_warnings(string , const char )
1 by brian clean slate	3928	{
1 by brian clean slate	3929	show_warnings = 1;
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3930	put_info(_("Show warnings enabled."),INFO_INFO, 0, 0);
1 by brian clean slate	3931	return 0;
	3932	}
	3933
	3934	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	3935	com_nowarnings(string , const char )
1 by brian clean slate	3936	{
1 by brian clean slate	3937	show_warnings = 0;
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	3938	put_info(_("Show warnings disabled."),INFO_INFO, 0, 0);
1 by brian clean slate	3939	return 0;
	3940	}
	3941
	3942	/*
	3943	Gets argument from a command on the command line. If get_next_arg is
	3944	not defined, skips the command and returns the first argument. The
	3945	line is modified by adding zero to the end of the argument. If
	3946	get_next_arg is defined, then the function searches for end of string
	3947	first, after found, returns the next argument and adds zero to the
	3948	end. If you ever wish to use this feature, remember to initialize all
	3949	items in the array to zero first.
	3950	*/
	3951
143 by Brian Aker Bool cleanup.	3952	char get_arg(char line, bool get_next_arg)
1 by brian clean slate	3953	{
1 by brian clean slate	3954	char ptr, start;
143 by Brian Aker Bool cleanup.	3955	bool quoted= 0, valid_arg= 0;
1 by brian clean slate	3956	char qtype= 0;
	3957
	3958	ptr= line;
	3959	if (get_next_arg)
	3960	{
	3961	for (; *ptr; ptr++) ;
	3962	if (*(ptr + 1))
	3963	ptr++;
	3964	}
	3965	else
	3966	{
	3967	/* skip leading white spaces */
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3968	while (isspace(*ptr))
1 by brian clean slate	3969	ptr++;
	3970	if (*ptr == '\\') // short command was used
	3971	ptr+= 2;
	3972	else
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3973	while (ptr &&!isspace(ptr)) // skip command
1 by brian clean slate	3974	ptr++;
	3975	}
	3976	if (!*ptr)
461 by Monty Taylor Removed NullS. bu-bye.	3977	return NULL;
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	3978	while (isspace(*ptr))
1 by brian clean slate	3979	ptr++;
	3980	if (ptr == '\'' \|\| ptr == '\"' \|\| *ptr == '`')
	3981	{
	3982	qtype= *ptr;
	3983	quoted= 1;
	3984	ptr++;
	3985	}
	3986	for (start=ptr ; *ptr; ptr++)
	3987	{
	3988	if (*ptr == '\\' && ptr[1]) // escaped character
	3989	{
	3990	// Remove the backslash
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	3991	strcpy(ptr, ptr+1);
1 by brian clean slate	3992	}
	3993	else if ((!quoted && ptr == ' ') \|\| (quoted && ptr == qtype))
	3994	{
	3995	*ptr= 0;
	3996	break;
	3997	}
	3998	}
	3999	valid_arg= ptr != start;
461 by Monty Taylor Removed NullS. bu-bye.	4000	return valid_arg ? start : NULL;
1 by brian clean slate	4001	}
	4002
	4003
	4004	static int
2053.2.1 by Andrew Hutchings Fix hidden connect messages	4005	sql_connect(const string &host, const string &database, const string &user, const string &password)
1 by brian clean slate	4006	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4007	drizzle_return_t ret;
1 by brian clean slate	4008	if (connected)
	4009	{
	4010	connected= 0;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4011	drizzle_con_free(&con);
	4012	drizzle_free(&drizzle);
	4013	}
	4014	drizzle_create(&drizzle);
1960.2.7 by Andrew Hutchings Drop the drizzleadmin client and use ifdef instead	4015
	4016	#ifdef DRIZZLE_ADMIN_TOOL
	4017	drizzle_con_options_t options= (drizzle_con_options_t) (DRIZZLE_CON_ADMIN \| (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL));
	4018	#else
	4019	drizzle_con_options_t options= (drizzle_con_options_t) (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL);
	4020	#endif
	4021
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	4022	if (drizzle_con_add_tcp(&drizzle, &con, (char *)host.c_str(),
	4023	opt_drizzle_port, (char *)user.c_str(),
	4024	(char )password.c_str(), (char )database.c_str(),
1960.2.7 by Andrew Hutchings Drop the drizzleadmin client and use ifdef instead	4025	options) == NULL)
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4026	{
	4027	(void) put_error(&con, NULL);
	4028	(void) fflush(stdout);
	4029	return 1;
	4030	}
	4031
1441.3.1 by Vijay Samuel all required updations have been made	4032	/* XXX add this back in
	4033	if (opt_connect_timeout)
	4034	{
893 by Brian Aker First pass of stripping uint	4035	uint32_t timeout=opt_connect_timeout;
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	4036	drizzleclient_options(&drizzle,DRIZZLE_OPT_CONNECT_TIMEOUT,
1441.3.1 by Vijay Samuel all required updations have been made	4037	(char*) &timeout);
	4038	}
	4039	*/
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4040
1441.3.1 by Vijay Samuel all required updations have been made	4041	/* XXX Do we need this?
	4042	if (safe_updates)
	4043	{
1 by brian clean slate	4044	char init_command[100];
1 by brian clean slate	4045	sprintf(init_command,
1441.3.1 by Vijay Samuel all required updations have been made	4046	"SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%"PRIu32
	4047	",MAX_JOIN_SIZE=%"PRIu32,
	4048	select_limit, max_join_size);
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	4049	drizzleclient_options(&drizzle, DRIZZLE_INIT_COMMAND, init_command);
1441.3.1 by Vijay Samuel all required updations have been made	4050	}
	4051	*/
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4052	if ((ret= drizzle_con_connect(&con)) != DRIZZLE_RETURN_OK)
1 by brian clean slate	4053	{
2053.2.1 by Andrew Hutchings Fix hidden connect messages	4054
2053.2.3 by Andrew Hutchings Make --silent work again	4055	if (opt_silent < 2)
1 by brian clean slate	4056	{
2053.2.3 by Andrew Hutchings Make --silent work again	4057	(void) put_error(&con, NULL);
2053.2.3 by Andrew Hutchings Make --silent work again	4058	(void) fflush(stdout);
206.3.1 by Patrick Galbraith Most everything working with client rename	4059	return ignore_errors ? -1 : 1; // Abort
1 by brian clean slate	4060	}
206.3.1 by Patrick Galbraith Most everything working with client rename	4061	return -1; // Retryable
1 by brian clean slate	4062	}
1 by brian clean slate	4063	connected=1;
1235.3.13 by Stewart Smith remove MY_GIVE_INFO parameter to my_end() that really just gave us the output of time(1). Use UNIX, don't re-implement the kitchen sink. This also removes --debug-info from most command line utilities.	4064
1 by brian clean slate	4065	build_completion_hash(opt_rehash, 1);
	4066	return 0;
	4067	}
	4068
	4069
	4070	static int
632.1.12 by Monty Taylor Fixed more sun studio warnings.	4071	com_status(string , const char )
1 by brian clean slate	4072	{
1441.3.1 by Vijay Samuel all required updations have been made	4073	/*
	4074	char buff[40];
	4075	uint64_t id;
	4076	*/
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4077	drizzle_result_st result;
	4078	drizzle_return_t ret;
1 by brian clean slate	4079
1 by brian clean slate	4080	tee_puts("--------------", stdout);
1729.3.2 by LinuxJedi Further cleanups based on Monty's comments (also revert a couple of things)	4081	printf(_("Drizzle client %s build %s, for %s-%s (%s) using readline %s\n"),
	4082	drizzle_version(), VERSION,
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	4083	HOST_VENDOR, HOST_OS, HOST_CPU,
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4084	rl_library_version);
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	4085
1 by brian clean slate	4086	if (connected)
1 by brian clean slate	4087	{
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4088	tee_fprintf(stdout, _("\nConnection id:\t\t%lu\n"),drizzle_con_thread_id(&con));
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4089	/*
	4090	Don't remove "limit 1",
1 by brian clean slate	4091	it is protection againts SQL_SELECT_LIMIT=0
1 by brian clean slate	4092	*/
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4093	if (drizzle_query_str(&con,&result,"select DATABASE(), USER() limit 1",
	4094	&ret) != NULL && ret == DRIZZLE_RETURN_OK &&
	4095	drizzle_result_buffer(&result) == DRIZZLE_RETURN_OK)
1 by brian clean slate	4096	{
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4097	drizzle_row_t cur=drizzle_row_next(&result);
1 by brian clean slate	4098	if (cur)
1 by brian clean slate	4099	{
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	4100	tee_fprintf(stdout, _("Current schema:\t%s\n"), cur[0] ? cur[0] : "");
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4101	tee_fprintf(stdout, _("Current user:\t\t%s\n"), cur[1]);
1 by brian clean slate	4102	}
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4103	drizzle_result_free(&result);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4104	}
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	4105	else if (ret == DRIZZLE_RETURN_ERROR_CODE)
	4106	drizzle_result_free(&result);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4107	tee_puts(_("SSL:\t\t\tNot in use"), stdout);
1 by brian clean slate	4108	}
	4109	else
	4110	{
	4111	vidattr(A_BOLD);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4112	tee_fprintf(stdout, _("\nNo connection\n"));
1 by brian clean slate	4113	vidattr(A_NORMAL);
	4114	return 0;
	4115	}
	4116	if (skip_updates)
	4117	{
	4118	vidattr(A_BOLD);
2005.2.2 by Andrew Hutchings Change most places to use 'schema' instead of 'database'	4119	tee_fprintf(stdout, _("\nAll updates ignored to this schema\n"));
1 by brian clean slate	4120	vidattr(A_NORMAL);
1 by brian clean slate	4121	}
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4122	tee_fprintf(stdout, _("Current pager:\t\t%s\n"), pager.c_str());
	4123	tee_fprintf(stdout, _("Using outfile:\t\t'%s'\n"), opt_outfile ? outfile.c_str() : "");
	4124	tee_fprintf(stdout, _("Using delimiter:\t%s\n"), delimiter);
	4125	tee_fprintf(stdout, _("Server version:\t\t%s\n"), server_version_string(&con));
1745.2.1 by LinuxJedi Remove the --mysql option and convert the --protocol option to do something similar.	4126	tee_fprintf(stdout, _("Protocol:\t\t%s\n"), opt_protocol.c_str());
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4127	tee_fprintf(stdout, _("Protocol version:\t%d\n"), drizzle_con_protocol_version(&con));
	4128	tee_fprintf(stdout, _("Connection:\t\t%s\n"), drizzle_con_host(&con));
1441.3.1 by Vijay Samuel all required updations have been made	4129	/* XXX need to save this from result
	4130	if ((id= drizzleclient_insert_id(&drizzle)))
1280.1.10 by Monty Taylor Put everything in drizzled into drizzled namespace.	4131	tee_fprintf(stdout, "Insert id:\t\t%s\n", internal::llstr(id, buff));
1441.3.1 by Vijay Samuel all required updations have been made	4132	*/
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4133
1377.2.2 by Zimin bug fix: ./bin/drizzle with \s would segfault.	4134	if (drizzle_con_uds(&con))
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4135	tee_fprintf(stdout, _("UNIX socket:\t\t%s\n"), drizzle_con_uds(&con));
1 by brian clean slate	4136	else
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4137	tee_fprintf(stdout, _("TCP port:\t\t%d\n"), drizzle_con_port(&con));
1 by brian clean slate	4138
	4139	if (safe_updates)
	4140	{
	4141	vidattr(A_BOLD);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4142	tee_fprintf(stdout, _("\nNote that you are running in safe_update_mode:\n"));
1 by brian clean slate	4143	vidattr(A_NORMAL);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4144	tee_fprintf(stdout, _("\
1441.3.1 by Vijay Samuel all required updations have been made	4145	UPDATEs and DELETEs that don't use a key in the WHERE clause are not allowed.\n\
	4146	(One can force an UPDATE/DELETE by adding LIMIT # at the end of the command.)\n \
	4147	SELECT has an automatic 'LIMIT %lu' if LIMIT is not used.\n \
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4148	Max number of examined row combination in a join is set to: %lu\n\n"),
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4149	select_limit, max_join_size);
1 by brian clean slate	4150	}
	4151	tee_puts("--------------\n", stdout);
	4152	return 0;
	4153	}
	4154
	4155	static const char *
928.1.7 by Eric Day Tools mostly converted, still fixing bugs from test suite.	4156	server_version_string(drizzle_con_st *local_con)
1 by brian clean slate	4157	{
534 by Monty Taylor Removed stxnmov. Also deleted strstr which had already been removed.	4158	static string buf("");
	4159	static bool server_version_string_reserved= false;
1 by brian clean slate	4160
534 by Monty Taylor Removed stxnmov. Also deleted strstr which had already been removed.	4161	if (!server_version_string_reserved)
	4162	{
	4163	buf.reserve(MAX_SERVER_VERSION_LENGTH);
	4164	server_version_string_reserved= true;
	4165	}
1 by brian clean slate	4166	/* Only one thread calls this, so no synchronization is needed */
	4167	if (buf[0] == '\0')
	4168	{
928.1.1 by Eric Day Started client changes.	4169	drizzle_result_st result;
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4170	drizzle_return_t ret;
1 by brian clean slate	4171
928.1.7 by Eric Day Tools mostly converted, still fixing bugs from test suite.	4172	buf.append(drizzle_con_server_version(local_con));
1 by brian clean slate	4173
1 by brian clean slate	4174	/* "limit 1" is protection against SQL_SELECT_LIMIT=0 */
928.1.7 by Eric Day Tools mostly converted, still fixing bugs from test suite.	4175	(void)drizzle_query_str(local_con, &result,
	4176	"select @@version_comment limit 1", &ret);
928.1.1 by Eric Day Started client changes.	4177	if (ret == DRIZZLE_RETURN_OK &&
928.1.1 by Eric Day Started client changes.	4178	drizzle_result_buffer(&result) == DRIZZLE_RETURN_OK)
1 by brian clean slate	4179	{
928.1.1 by Eric Day Started client changes.	4180	drizzle_row_t cur = drizzle_row_next(&result);
1 by brian clean slate	4181	if (cur && cur[0])
1 by brian clean slate	4182	{
534 by Monty Taylor Removed stxnmov. Also deleted strstr which had already been removed.	4183	buf.append(" ");
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	4184	buf.append(cur[0]);
1 by brian clean slate	4185	}
928.1.1 by Eric Day Started client changes.	4186	drizzle_result_free(&result);
1 by brian clean slate	4187	}
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	4188	else if (ret == DRIZZLE_RETURN_ERROR_CODE)
	4189	drizzle_result_free(&result);
1 by brian clean slate	4190	}
1 by brian clean slate	4191
534 by Monty Taylor Removed stxnmov. Also deleted strstr which had already been removed.	4192	return buf.c_str();
1 by brian clean slate	4193	}
	4194
	4195	static int
893 by Brian Aker First pass of stripping uint	4196	put_info(const char str,INFO_TYPE info_type, uint32_t error, const char sqlstate)
1 by brian clean slate	4197	{
	4198	FILE *file= (info_type == INFO_ERROR ? stderr : stdout);
	4199	static int inited=0;
	4200
1441.3.1 by Vijay Samuel all required updations have been made	4201	if (status.getBatch())
1 by brian clean slate	4202	{
	4203	if (info_type == INFO_ERROR)
	4204	{
	4205	(void) fflush(file);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4206	fprintf(file,_("ERROR"));
1 by brian clean slate	4207	if (error)
1 by brian clean slate	4208	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4209	if (sqlstate)
	4210	(void) fprintf(file," %d (%s)",error, sqlstate);
1 by brian clean slate	4211	else
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4212	(void) fprintf(file," %d",error);
1 by brian clean slate	4213	}
1441.3.1 by Vijay Samuel all required updations have been made	4214	if (status.getQueryStartLine() && line_numbers)
1 by brian clean slate	4215	{
1441.3.1 by Vijay Samuel all required updations have been made	4216	(void) fprintf(file," at line %"PRIu32,status.getQueryStartLine());
	4217	if (status.getFileName())
	4218	(void) fprintf(file," in file: '%s'", status.getFileName());
1 by brian clean slate	4219	}
	4220	(void) fprintf(file,": %s\n",str);
	4221	(void) fflush(file);
	4222	if (!ignore_errors)
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4223	return 1;
1 by brian clean slate	4224	}
	4225	else if (info_type == INFO_RESULT && verbose > 1)
	4226	tee_puts(str, file);
	4227	if (unbuffered)
	4228	fflush(file);
	4229	return info_type == INFO_ERROR ? -1 : 0;
	4230	}
	4231	if (!opt_silent \|\| info_type == INFO_ERROR)
	4232	{
	4233	if (!inited)
	4234	{
	4235	inited=1;
	4236	#ifdef HAVE_SETUPTERM
	4237	(void) setupterm((char )0, 1, (int ) 0);
	4238	#endif
	4239	}
	4240	if (info_type == INFO_ERROR)
	4241	{
	4242	if (!opt_nobeep)
77.3.7 by Monty Taylor Made mysql into a pure-C program.	4243	/* This should make a bell */
77.3.7 by Monty Taylor Made mysql into a pure-C program.	4244	putchar('\a');
1 by brian clean slate	4245	vidattr(A_STANDOUT);
	4246	if (error)
	4247	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4248	if (sqlstate)
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4249	(void) tee_fprintf(file, _("ERROR %d (%s): "), error, sqlstate);
1 by brian clean slate	4250	else
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4251	(void) tee_fprintf(file, _("ERROR %d: "), error);
1 by brian clean slate	4252	}
1 by brian clean slate	4253	else
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4254	tee_puts(_("ERROR: "), file);
1 by brian clean slate	4255	}
	4256	else
	4257	vidattr(A_BOLD);
	4258	(void) tee_puts(str, file);
	4259	vidattr(A_NORMAL);
	4260	}
	4261	if (unbuffered)
	4262	fflush(file);
	4263	return info_type == INFO_ERROR ? -1 : 0;
	4264	}
	4265
	4266
	4267	static int
928.1.7 by Eric Day Tools mostly converted, still fixing bugs from test suite.	4268	put_error(drizzle_con_st local_con, drizzle_result_st res)
1 by brian clean slate	4269	{
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	4270	const char *error;
	4271
	4272	if (res != NULL)
	4273	{
	4274	error= drizzle_result_error(res);
	4275	if (!strcmp(error, ""))
928.1.7 by Eric Day Tools mostly converted, still fixing bugs from test suite.	4276	error= drizzle_con_error(local_con);
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	4277	}
	4278	else
928.1.7 by Eric Day Tools mostly converted, still fixing bugs from test suite.	4279	error= drizzle_con_error(local_con);
928.1.4 by Eric Day Fixed a few bugs, more progress on conversion.	4280
928.1.7 by Eric Day Tools mostly converted, still fixing bugs from test suite.	4281	return put_info(error, INFO_ERROR,
928.1.8 by Eric Day All tests now passing now, fixed a few more client utility bugs.	4282	res == NULL ? drizzle_con_error_code(local_con) :
1441.3.1 by Vijay Samuel all required updations have been made	4283	drizzle_result_error_code(res),
928.1.8 by Eric Day All tests now passing now, fixed a few more client utility bugs.	4284	res == NULL ? drizzle_con_sqlstate(local_con) :
1441.3.1 by Vijay Samuel all required updations have been made	4285	drizzle_result_sqlstate(res));
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4286	}
1 by brian clean slate	4287
1 by brian clean slate	4288
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4289	static void remove_cntrl(string *buffer)
1 by brian clean slate	4290	{
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4291	const char *start= buffer->c_str();
	4292	const char *end= start + (buffer->length());
1567.3.14 by Monty Taylor Removed the need for drizzled::internal usage in drizzle.cc.	4293	while (start < end && !isgraph(end[-1]))
1 by brian clean slate	4294	end--;
893 by Brian Aker First pass of stripping uint	4295	uint32_t pos_to_truncate= (end-start);
287.3.17 by Monty Taylor Fixed null-query problem.	4296	if (buffer->length() > pos_to_truncate)
287.3.17 by Monty Taylor Fixed null-query problem.	4297	buffer->erase(pos_to_truncate);
1 by brian clean slate	4298	}
	4299
	4300
	4301	void tee_fprintf(FILE file, const char fmt, ...)
	4302	{
	4303	va_list args;
	4304
	4305	va_start(args, fmt);
	4306	(void) vfprintf(file, fmt, args);
	4307	va_end(args);
	4308
	4309	if (opt_outfile)
	4310	{
	4311	va_start(args, fmt);
	4312	(void) vfprintf(OUTFILE, fmt, args);
	4313	va_end(args);
	4314	}
	4315	}
	4316
	4317
	4318	void tee_fputs(const char s, FILE file)
	4319	{
	4320	fputs(s, file);
	4321	if (opt_outfile)
	4322	fputs(s, OUTFILE);
	4323	}
	4324
	4325
	4326	void tee_puts(const char s, FILE file)
	4327	{
	4328	fputs(s, file);
	4329	fputc('\n', file);
	4330	if (opt_outfile)
	4331	{
	4332	fputs(s, OUTFILE);
	4333	fputc('\n', OUTFILE);
	4334	}
	4335	}
	4336
	4337	void tee_putc(int c, FILE *file)
	4338	{
	4339	putc(c, file);
	4340	if (opt_outfile)
	4341	putc(c, OUTFILE);
	4342	}
	4343
	4344	#include <sys/times.h>
206.3.1 by Patrick Galbraith Most everything working with client rename	4345	#ifdef _SC_CLK_TCK // For mit-pthreads
1 by brian clean slate	4346	#undef CLOCKS_PER_SEC
	4347	#define CLOCKS_PER_SEC (sysconf(_SC_CLK_TCK))
	4348	#endif
	4349
288 by Brian Aker ulong cleanp in client apps	4350	static uint32_t start_timer(void)
1 by brian clean slate	4351	{
	4352	struct tms tms_tmp;
	4353	return times(&tms_tmp);
	4354	}
	4355
	4356
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4357	/**
1441.3.1 by Vijay Samuel all required updations have been made	4358	Write as many as 52+1 bytes to buff, in the form of a legible
	4359	duration of time.
1 by brian clean slate	4360
1441.3.1 by Vijay Samuel all required updations have been made	4361	len("4294967296 days, 23 hours, 59 minutes, 60.00 seconds") -> 52
1 by brian clean slate	4362	*/
	4363	static void nice_time(double sec,char *buff,bool part_second)
	4364	{
288 by Brian Aker ulong cleanp in client apps	4365	uint32_t tmp;
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4366	ostringstream tmp_buff_str;
	4367
1 by brian clean slate	4368	if (sec >= 3600.0*24)
1 by brian clean slate	4369	{
288 by Brian Aker ulong cleanp in client apps	4370	tmp=(uint32_t) floor(sec/(3600.0*24));
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	4371	sec-= 3600.024tmp;
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4372	tmp_buff_str << tmp;
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	4373
	4374	if (tmp > 1)
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4375	tmp_buff_str << " days ";
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	4376	else
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4377	tmp_buff_str << " day ";
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	4378
1 by brian clean slate	4379	}
	4380	if (sec >= 3600.0)
	4381	{
288 by Brian Aker ulong cleanp in client apps	4382	tmp=(uint32_t) floor(sec/3600.0);
1 by brian clean slate	4383	sec-=3600.0*tmp;
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4384	tmp_buff_str << tmp;
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	4385
	4386	if (tmp > 1)
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4387	tmp_buff_str << _(" hours ");
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	4388	else
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4389	tmp_buff_str << _(" hour ");
1 by brian clean slate	4390	}
	4391	if (sec >= 60.0)
	4392	{
288 by Brian Aker ulong cleanp in client apps	4393	tmp=(uint32_t) floor(sec/60.0);
1 by brian clean slate	4394	sec-=60.0*tmp;
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4395	tmp_buff_str << tmp << _(" min ");
1 by brian clean slate	4396	}
1 by brian clean slate	4397	if (part_second)
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4398	tmp_buff_str.precision(2);
1 by brian clean slate	4399	else
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4400	tmp_buff_str.precision(0);
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4401	tmp_buff_str << sec << _(" sec");
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4402	strcpy(buff, tmp_buff_str.str().c_str());
1 by brian clean slate	4403	}
	4404
	4405
288 by Brian Aker ulong cleanp in client apps	4406	static void end_timer(uint32_t start_time,char *buff)
1 by brian clean slate	4407	{
1 by brian clean slate	4408	nice_time((double) (start_timer() - start_time) /
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4409	CLOCKS_PER_SEC,buff,1);
1 by brian clean slate	4410	}
	4411
	4412
288 by Brian Aker ulong cleanp in client apps	4413	static void drizzle_end_timer(uint32_t start_time,char *buff)
1 by brian clean slate	4414	{
	4415	buff[0]=' ';
	4416	buff[1]='(';
	4417	end_timer(start_time,buff+2);
641.4.1 by Toru Maesaka First pass of replacing MySQL's my_stpcpy() with appropriate libc calls	4418	strcpy(strchr(buff, '\0'),")");
1 by brian clean slate	4419	}
1 by brian clean slate	4420
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4421	static const char * construct_prompt()
1 by brian clean slate	4422	{
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4423	// Erase the old prompt
77.3.3 by Monty Taylor Last change to migrate to glib from sql_string.	4424	assert(processed_prompt!=NULL);
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4425	processed_prompt->clear();
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4426
	4427	// Get the date struct
	4428	time_t lclock = time(NULL);
1 by brian clean slate	4429	struct tm *t = localtime(&lclock);
	4430
	4431	/* parse thru the settings for the prompt */
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4432	string::iterator c= current_prompt.begin();
	4433	while (c != current_prompt.end())
1 by brian clean slate	4434	{
1 by brian clean slate	4435	if (*c != PROMPT_CHAR)
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4436	{
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4437	processed_prompt->push_back(*c);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4438	}
1 by brian clean slate	4439	else
1 by brian clean slate	4440	{
77.3.7 by Monty Taylor Made mysql into a pure-C program.	4441	int getHour;
77.3.7 by Monty Taylor Made mysql into a pure-C program.	4442	int getYear;
971.4.1 by Monty Taylor GCC on Solaris build fixes.	4443	/* Room for Dow MMM DD HH:MM:SS YYYY */
971.4.1 by Monty Taylor GCC on Solaris build fixes.	4444	char dateTime[32];
1 by brian clean slate	4445	switch (*++c) {
1 by brian clean slate	4446	case '\0':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4447	// stop it from going beyond if ends with %
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4448	--c;
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4449	break;
1 by brian clean slate	4450	case 'c':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4451	add_int_to_prompt(++prompt_counter);
	4452	break;
1 by brian clean slate	4453	case 'v':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4454	if (connected)
928.1.3 by Eric Day More changes towards getting the client utilities converted.	4455	processed_prompt->append(drizzle_con_server_version(&con));
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4456	else
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4457	processed_prompt->append("not_connected");
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4458	break;
1 by brian clean slate	4459	case 'd':
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4460	processed_prompt->append(not current_db.empty() ? current_db : "(none)");
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4461	break;
1 by brian clean slate	4462	case 'h':
1441.3.1 by Vijay Samuel all required updations have been made	4463	{
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4464	const char *prompt= connected ? drizzle_con_host(&con) : "not_connected";
1441.3.1 by Vijay Samuel all required updations have been made	4465	if (strstr(prompt, "Localhost"))
	4466	processed_prompt->append("localhost");
	4467	else
	4468	{
	4469	const char *end=strrchr(prompt,' ');
	4470	if (end != NULL)
	4471	processed_prompt->append(prompt, (end-prompt));
	4472	}
	4473	break;
	4474	}
	4475	case 'p':
	4476	{
	4477	if (!connected)
	4478	{
	4479	processed_prompt->append("not_connected");
1407 by Brian Aker Merge Siddharth, ran formatting across it.	4480	break;
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4481	}
1441.3.1 by Vijay Samuel all required updations have been made	4482
	4483	if (drizzle_con_uds(&con))
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4484	{
1441.3.1 by Vijay Samuel all required updations have been made	4485	const char *pos=strrchr(drizzle_con_uds(&con),'/');
	4486	processed_prompt->append(pos ? pos+1 : drizzle_con_uds(&con));
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4487	}
1441.3.1 by Vijay Samuel all required updations have been made	4488	else
	4489	add_int_to_prompt(drizzle_con_port(&con));
	4490	}
	4491	break;
1 by brian clean slate	4492	case 'U':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4493	if (!full_username)
	4494	init_username();
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4495	processed_prompt->append(full_username ? full_username :
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4496	(!current_user.empty() ? current_user : "(unknown)"));
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4497	break;
1 by brian clean slate	4498	case 'u':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4499	if (!full_username)
	4500	init_username();
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4501	processed_prompt->append(part_username ? part_username :
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4502	(!current_user.empty() ? current_user : _("(unknown)")));
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4503	break;
1 by brian clean slate	4504	case PROMPT_CHAR:
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4505	{
632.1.12 by Monty Taylor Fixed more sun studio warnings.	4506	processed_prompt->append(PROMPT_CHAR, 1);
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4507	}
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4508	break;
1 by brian clean slate	4509	case 'n':
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4510	{
632.1.12 by Monty Taylor Fixed more sun studio warnings.	4511	processed_prompt->append('\n', 1);
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4512	}
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4513	break;
1 by brian clean slate	4514	case ' ':
1 by brian clean slate	4515	case '_':
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4516	{
632.1.12 by Monty Taylor Fixed more sun studio warnings.	4517	processed_prompt->append(' ', 1);
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4518	}
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4519	break;
1 by brian clean slate	4520	case 'R':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4521	if (t->tm_hour < 10)
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4522	add_int_to_prompt(0);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4523	add_int_to_prompt(t->tm_hour);
	4524	break;
1 by brian clean slate	4525	case 'r':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4526	getHour = t->tm_hour % 12;
	4527	if (getHour == 0)
	4528	getHour=12;
	4529	if (getHour < 10)
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4530	add_int_to_prompt(0);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4531	add_int_to_prompt(getHour);
	4532	break;
1 by brian clean slate	4533	case 'm':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4534	if (t->tm_min < 10)
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4535	add_int_to_prompt(0);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4536	add_int_to_prompt(t->tm_min);
	4537	break;
1 by brian clean slate	4538	case 'y':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4539	getYear = t->tm_year % 100;
	4540	if (getYear < 10)
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4541	add_int_to_prompt(0);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4542	add_int_to_prompt(getYear);
	4543	break;
1 by brian clean slate	4544	case 'Y':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4545	add_int_to_prompt(t->tm_year+1900);
	4546	break;
1 by brian clean slate	4547	case 'D':
971.4.1 by Monty Taylor GCC on Solaris build fixes.	4548	strftime(dateTime, 32, "%a %b %d %H:%M:%S %Y", localtime(&lclock));
971.4.1 by Monty Taylor GCC on Solaris build fixes.	4549	processed_prompt->append(dateTime);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4550	break;
1 by brian clean slate	4551	case 's':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4552	if (t->tm_sec < 10)
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4553	add_int_to_prompt(0);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4554	add_int_to_prompt(t->tm_sec);
	4555	break;
1 by brian clean slate	4556	case 'w':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4557	processed_prompt->append(day_names[t->tm_wday]);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4558	break;
1 by brian clean slate	4559	case 'P':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4560	processed_prompt->append(t->tm_hour < 12 ? "am" : "pm");
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4561	break;
1 by brian clean slate	4562	case 'o':
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4563	add_int_to_prompt(t->tm_mon+1);
	4564	break;
1 by brian clean slate	4565	case 'O':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4566	processed_prompt->append(month_names[t->tm_mon]);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4567	break;
1 by brian clean slate	4568	case '\'':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4569	processed_prompt->append("'");
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4570	break;
1 by brian clean slate	4571	case '"':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4572	processed_prompt->append("\"");
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4573	break;
1 by brian clean slate	4574	case 'S':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4575	processed_prompt->append(";");
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4576	break;
1 by brian clean slate	4577	case 't':
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4578	processed_prompt->append("\t");
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4579	break;
1 by brian clean slate	4580	case 'l':
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4581	processed_prompt->append(delimiter_str);
77.3.2 by Monty Taylor Got it compiling... now, too bad it doesn't work.	4582	break;
1 by brian clean slate	4583	default:
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4584	processed_prompt->push_back(*c);
1 by brian clean slate	4585	}
1 by brian clean slate	4586	}
1596.1.1 by Monty Taylor Merged in remove-internal-from-drizzle-cc	4587	++c;
1 by brian clean slate	4588	}
279.2.2 by Monty Taylor Replaced DYNAMIC_STRING with C++ string in drizzle command line client.	4589	return processed_prompt->c_str();
1 by brian clean slate	4590	}
	4591
	4592
	4593	static void add_int_to_prompt(int toadd)
	4594	{
971.1.77 by Monty Taylor Removed mysys/mystrings things from client/ progs. Still need to get rid of my_getopt, but I think that's all now.	4595	ostringstream buffer;
	4596	buffer << toadd;
	4597	processed_prompt->append(buffer.str().c_str());
1 by brian clean slate	4598	}
	4599
	4600	static void init_username()
	4601	{
1441.3.1 by Vijay Samuel all required updations have been made	4602	/* XXX need this?
	4603	free(full_username);
	4604	free(part_username);
1 by brian clean slate	4605
1441.3.1 by Vijay Samuel all required updations have been made	4606	drizzle_result_st *result;
	4607	if (!drizzleclient_query(&drizzle,"select USER()") &&
	4608	(result=drizzleclient_use_result(&drizzle)))
	4609	{
928.1.1 by Eric Day Started client changes.	4610	drizzle_row_t cur=drizzleclient_fetch_row(result);
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4611	full_username= strdup(cur[0]);
	4612	part_username= strdup(strtok(cur[0],"@"));
840.1.21 by Monty Taylor ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.	4613	(void) drizzleclient_fetch_row(result); // Read eof
1441.3.1 by Vijay Samuel all required updations have been made	4614	}
	4615	*/
1 by brian clean slate	4616	}
1 by brian clean slate	4617
632.1.12 by Monty Taylor Fixed more sun studio warnings.	4618	static int com_prompt(string , const char line)
1 by brian clean slate	4619	{
520.4.43 by mordred A set of Solaris fixes.	4620	const char *ptr=strchr(line, ' ');
656.1.51 by Monty Taylor Fixed strdup return checking in client/	4621	if (ptr == NULL)
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4622	tee_fprintf(stdout, _("Returning to default PROMPT of %s\n"),
182.1.2 by Jim Winstead Various fixes to enable compilation on Mac OS X, and remove the glib dependency.	4623	default_prompt);
656.1.51 by Monty Taylor Fixed strdup return checking in client/	4624	prompt_counter = 0;
	4625	char * tmpptr= strdup(ptr ? ptr+1 : default_prompt);
	4626	if (tmpptr == NULL)
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4627	tee_fprintf(stdout, _("Memory allocation error. Not changing prompt\n"));
1 by brian clean slate	4628	else
656.1.51 by Monty Taylor Fixed strdup return checking in client/	4629	{
1567.3.1 by Vijay Samuel Refactoring of the drizzle client.	4630	current_prompt.erase();
656.1.51 by Monty Taylor Fixed strdup return checking in client/	4631	current_prompt= tmpptr;
1729.3.1 by LinuxJedi some string and options cleanups for drizzle and drizzledump	4632	tee_fprintf(stdout, _("PROMPT set to '%s'\n"), current_prompt.c_str());
656.1.51 by Monty Taylor Fixed strdup return checking in client/	4633	}
1 by brian clean slate	4634	return 0;
1 by brian clean slate	4635	}
266.6.1 by Andy Lester merging from main	4636
266.6.1 by Andy Lester merging from main	4637	/*
1441.3.1 by Vijay Samuel all required updations have been made	4638	strcont(str, set) if str contanies any character in the string set.
	4639	The result is the position of the first found character in str, or NULL
	4640	if there isn't anything found.
266.6.1 by Andy Lester merging from main	4641	*/
	4642
	4643	static const char * strcont(register const char str, register const char set)
	4644	{
	4645	register const char * start = (const char *) set;
	4646
	4647	while (*str)
	4648	{
	4649	while (*set)
	4650	{
	4651	if (set++ == str)
	4652	return ((const char*) str);
	4653	}
	4654	set=start; str++;
	4655	}
	4656	return NULL;
	4657	} /* strcont */