diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 22 | ||||
| -rw-r--r-- | extra/charset2html.c | 177 | ||||
| -rw-r--r-- | extra/comp_err.c | 1065 |
3 files changed, 1053 insertions, 211 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index aec7ad7dda5..43981753515 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -15,11 +15,31 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include \ - @ndbcluster_includes@ -I$(top_srcdir)/sql + @ndbcluster_includes@ -I$(top_srcdir)/sql \ + -I$(top_builddir)/include LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a +BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ + $(top_builddir)/include/sql_state.h \ + $(top_builddir)/include/mysqld_ername.h +pkginclude_HEADERS= $(BUILT_SOURCES) +CLEANFILES = $(BUILT_SOURCES) + +# This will build mysqld_error.h and sql_state.h +$(top_builddir)/include/mysqld_error.h: comp_err + $(top_builddir)/extra/comp_err \ + --charset=$(top_srcdir)/sql/share/charsets \ + --out-dir=$(top_builddir)/sql/share/ \ + --header_file=$(top_builddir)/include/mysqld_error.h \ + --name_file=$(top_builddir)/include/mysqld_ername.h \ + --state_file=$(top_builddir)/include/sql_state.h \ + --in_file=$(top_srcdir)/sql/share/errmsg.txt +$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h +$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h + bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ resolve_stack_dump mysql_waitpid +noinst_PROGRAMS = charset2html # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/extra/charset2html.c b/extra/charset2html.c new file mode 100644 index 00000000000..96862ff16a1 --- /dev/null +++ b/extra/charset2html.c @@ -0,0 +1,177 @@ +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + Written by Alexander Barkov to check what + a charset is in your favorite web browser +*/ + +#include <my_global.h> +#include <m_ctype.h> +#include <my_sys.h> +#include <mysql_version.h> + +#include <stdio.h> + +typedef struct char_info_st +{ + int cod; + int srt; + int uni; + int low; + int upp; + int ctp; +} MY_CH; + +static int chcmp(const void *vf, const void *vs) +{ + const MY_CH *f=vf; + const MY_CH *s=vs; + + return f->srt-s->srt ? f->srt-s->srt : f->uni-s->uni; +} + +static void print_cs(CHARSET_INFO *cs) +{ + uint i; + int srt; + int clr=0; + MY_CH ch[256]; + + printf("<HTML>\n"); + printf("<HEAD>\n"); + printf("</HEAD>\n"); + printf("<BODY><PRE>\n"); + printf("Charset %s\n",cs->name); + + printf("<TABLE>\n"); + printf("<TR><TH>Code<TH>Uni<TH>Sort<TH>Ctype<TH>Ch<TH>Lo<TH>Up</TR>"); + + for (i=0; i<256; i++) + { + ch[i].cod=i; + ch[i].srt=cs->sort_order ? cs->sort_order[i] : i; + ch[i].uni=cs->tab_to_uni[i]; + ch[i].low=cs->tab_to_uni[cs->to_lower[i]]; + ch[i].upp=cs->tab_to_uni[cs->to_upper[i]]; + ch[i].ctp=cs->ctype[i+1]; + } + + qsort(ch,256,sizeof(MY_CH),&chcmp); + srt=ch[0].srt; + + for (i=0; i<256; i++) + { + clr = (srt!=ch[i].srt) ? !clr : clr; + + printf("<TR bgcolor=#%s>",clr ? "DDDDDD" : "EEEE99"); + printf("<TD>%02X",ch[i].cod); + printf("<TD>%04X",ch[i].uni); + printf("<TD>%02X",ch[i].srt); + + printf("<TD>%s%s%s%s%s%s%s%s", + ch[i].ctp & _MY_U ? "U" : "", + ch[i].ctp & _MY_L ? "L" : "", + ch[i].ctp & _MY_NMR ? "N" : "", + ch[i].ctp & _MY_SPC ? "S" : "", + ch[i].ctp & _MY_PNT ? "P" : "", + ch[i].ctp & _MY_CTR ? "C" : "", + ch[i].ctp & _MY_B ? "B" : "", + ch[i].ctp & _MY_X ? "X" : ""); + + if ((ch[i].uni >= 0x80) && (ch[i].uni <= 0x9F)) + { + /* + Control characters 0x0080..0x009F are dysplayed by some + browers as if they were letters. Don't print them to + avoid confusion. + */ + printf("<TD>ctrl<TD>ctrl<TD>ctrl"); + } + else + { + printf("<TD>&#%d;",ch[i].uni); + printf("<TD>&#%d;",ch[i].low); + printf("<TD>&#%d;",ch[i].upp); + } + printf("</TR>\n"); + srt=ch[i].srt; + } + printf("</TABLE>\n"); + printf("</PRE></BODY>\n"); + printf("</HTML>\n"); +} + +static void print_index() +{ + CHARSET_INFO **cs; + int clr=0; + + get_charset_by_name("",MYF(0)); /* To execute init_available_charsets */ + + printf("All charsets\n"); + printf("<table border=1>\n"); + printf("<tr bgcolor=EEEE99><th>ID<th>Charset<th>Collation<th>Def<th>Bin<th>Com<th>Comment\n"); + for (cs=all_charsets ; cs < all_charsets+256; cs++) + { + if (!cs[0]) + continue; + printf("<tr bgcolor=#%s><td><a href=\"?%s\">%d</a><td>%s<td>%s<td>%s<td>%s<td>%s<td>%s\n", + (clr= !clr) ? "DDDDDD" : "EEEE99", + cs[0]->name,cs[0]->number,cs[0]->csname, + cs[0]->name, + (cs[0]->state & MY_CS_PRIMARY) ? "def " : " ", + (cs[0]->state & MY_CS_BINSORT) ? "bin " : " ", + (cs[0]->state & MY_CS_COMPILED) ? "com " : " ", + cs[0]->comment); + } + printf("</table>\n"); +} + +int main(int argc, char **argv) { + const char *the_set = NULL; + int argcnt = 1; + CHARSET_INFO *cs; + + if (getenv("SCRIPT_NAME")) + { + printf("Content-Type: text/html\r\n\r\n"); + } + my_init(); + + if (argc > argcnt && argv[argcnt][0] == '-' && argv[argcnt][1] == '#') + DBUG_PUSH(argv[argcnt++]+2); + + if (argc > argcnt) + the_set = argv[argcnt++]; + + if (argc > argcnt) + charsets_dir = argv[argcnt++]; + + if (!the_set) + { + print_index(); + return 0; + } + + if (!(cs= get_charset_by_name(the_set, MYF(MY_WME)))) + return 1; + + print_cs(cs); + + return 0; +} diff --git a/extra/comp_err.c b/extra/comp_err.c index 6c7fad6a270..a554fc2437e 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (C) 2004 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,287 +14,932 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Saves all errmesg in a header file, updated by me, in a compact file */ +/* + Written by Anjuta Widenius +*/ + +/* + Creates one include file and multiple language-error message files from one + multi-language text file. +*/ #include <my_global.h> #include <m_ctype.h> #include <my_sys.h> #include <m_string.h> +#include <my_getopt.h> +#include <assert.h> +#include <my_dir.h> -#define MAXLENGTH 1000 #define MAX_ROWS 1000 -#define MAX_FILES 10 -#define MAX_CHARSET_NAME 64 +#define HEADER_LENGTH 32 /* Length of header in errmsg.sys */ +#define DEFAULT_CHARSET_DIR "../sql/share/charsets" +#define ER_PREFIX "ER_" +#define WARN_PREFIX "WARN_" +static char *OUTFILE= (char*) "errmsg.sys"; +static char *HEADERFILE= (char*) "mysqld_error.h"; +static char *NAMEFILE= (char*) "mysqld_ername.h"; +static char *STATEFILE= (char*) "sql_state.h"; +static char *TXTFILE= (char*) "../sql/share/errmsg.txt"; +static char *DATADIRECTORY= (char*) "../sql/share/"; +static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace"; + +/* Header for errmsg.sys files */ +uchar file_head[]= { 254, 254, 2, 1 }; +/* Store positions to each error message row to store in errmsg.sys header */ +uint file_pos[MAX_ROWS]; + +const char *empty_string= ""; /* For empty states */ +/* + Default values for command line options. See getopt structure for defintions + for these. +*/ + +const char *default_language= "eng"; +int er_offset= 1000; +my_bool info_flag= 0; + +/* Storage of one error message row (for one language) */ + +struct message +{ + char *lang_short_name; + char *text; +}; -int row_count; -uint file_pos[MAX_ROWS],file_row_pos[MAX_FILES]; -my_string saved_row[MAX_ROWS]; -uchar file_head[]= { 254,254,2,1 }; -char charset_name[MAX_CHARSET_NAME]; -static void get_options(int *argc,char **argv[]); -static int count_rows(FILE *from,pchar c, pchar c2); -static int remember_rows(FILE *from,pchar c); -static int copy_rows(FILE *to); +/* Storage for languages and charsets (from start of error text file) */ + +struct languages +{ + char *lang_long_name; /* full name of the language */ + char *lang_short_name; /* abbreviation of the lang. */ + char *charset; /* Character set name */ + struct languages *next_lang; /* Pointer to next language */ +}; - /* Functions defined in this file */ +/* Name, code and texts (for all lang) for one error message */ -int main(int argc,char *argv[]) +struct errors { - uint csnum= 0; - int i,error,files,length; - uchar head[32]; - FILE *from,*to; - MY_INIT(argv[0]); - - get_options(&argc,&argv); - error=1; - row_count=files=0; + const char *er_name; /* Name of the error (ER_HASHCK) */ + int d_code; /* Error code number */ + const char *sql_code1; /* sql state */ + const char *sql_code2; /* ODBC state */ + struct errors *next_error; /* Pointer to next error */ + DYNAMIC_ARRAY msg; /* All language texts for this error */ +}; + - to=0; - for ( ; argc-- > 1 ; argv++) +static struct my_option my_long_options[]= +{ +#ifdef DBUG_OFF + {"debug", '#', "This is a non-debug version. Catch this and exit", + 0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0}, +#else + {"debug", '#', "Output debug log", (gptr *) & default_dbug_option, + (gptr *) & default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, +#endif + {"debug-info", 'T', "Print some debug info at exit.", (gptr *) & info_flag, + (gptr *) & info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"help", '?', "Displays this help and exits.", 0, 0, 0, GET_NO_ARG, + NO_ARG, 0, 0, 0, 0, 0, 0}, + {"version", 'V', "Prints version", 0, 0, 0, GET_NO_ARG, + NO_ARG, 0, 0, 0, 0, 0, 0}, + {"charset", 'C', "Charset dir", (gptr *) & charsets_dir, + (gptr *) & charsets_dir, + 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"in_file", 'F', "Input file", (gptr *) & TXTFILE, (gptr *) & TXTFILE, + 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"out_dir", 'D', "Output base directory", (gptr *) & DATADIRECTORY, + (gptr *) & DATADIRECTORY, + 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"out_file", 'O', "Output filename (errmsg.sys)", (gptr *) & OUTFILE, + (gptr *) & OUTFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"header_file", 'H', "mysqld_error.h file ", (gptr *) & HEADERFILE, + (gptr *) & HEADERFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"name_file", 'N', "mysqld_ername.h file ", (gptr *) & NAMEFILE, + (gptr *) & NAMEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"state_file", 'S', "sql_state.h file", (gptr *) & STATEFILE, + (gptr *) & STATEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} +}; + + +static struct languages *parse_charset_string(char *str); +static struct errors *parse_error_string(char *ptr, int er_count); +static struct message *parse_message_string(struct message *new_message, + char *str); +static struct message *find_message(struct errors *err, const char *lang); +static int parse_input_file(const char *file_name, struct errors **top_error, + struct languages **top_language); +static int get_options(int *argc, char ***argv); +static void print_version(void); +static void usage(void); +static my_bool get_one_option(int optid, const struct my_option *opt, + char *argument); +static char *parse_text_line(char *pos); +static int copy_rows(FILE * to, char *row, int row_nr, long start_pos); +static char *parse_default_language(char *str); +static uint parse_error_offset(char *str); + +static char *skip_delimiters(char *str); +static char *get_word(char **str); +static char *find_end_of_word(char *str); +static void clean_up(struct languages *lang_head, struct errors *error_head); +static int create_header_files(struct errors *error_head); +static int create_sys_files(struct languages *lang_head, + struct errors *error_head, uint row_count); + + +int main(int argc, char *argv[]) +{ + MY_INIT(argv[0]); { - file_row_pos[files++] = row_count; + uint row_count; + struct errors *error_head; + struct languages *lang_head; + DBUG_ENTER("main"); - if ((from = fopen(*argv,"r")) == NULL) + charsets_dir= DEFAULT_CHARSET_DIR; + if (get_options(&argc, &argv)) + DBUG_RETURN(1); + if (!(row_count= parse_input_file(TXTFILE, &error_head, &lang_head))) { - fprintf(stderr,"Can't open file '%s'\n",*argv); - return(1); + fprintf(stderr, "Failed to parse input file %s\n", TXTFILE); + DBUG_RETURN(1); } - - VOID(count_rows(from,'"','{')); /* Calculate start-info */ - if (!charset_name[0]) + if (lang_head == NULL || error_head == NULL) { - fprintf(stderr,"Character set is not specified in '%s'\n",*argv); - fclose(from); - goto end; + fprintf(stderr, "Failed to parse input file %s\n", TXTFILE); + DBUG_RETURN(1); } - if (!(csnum= get_charset_number(charset_name, MY_CS_PRIMARY))) + if (create_header_files(error_head)) { - fprintf(stderr,"Unknown character '%s' in '%s'\n",charset_name, *argv); - fclose(from); - goto end; + fprintf(stderr, "Failed to create header files\n"); + DBUG_RETURN(1); } - - if (remember_rows(from,'}') < 0) /* Remember rows */ + if (create_sys_files(lang_head, error_head, row_count)) { - fprintf(stderr,"Can't find textrows in '%s'\n",*argv); - fclose(from); - goto end; + fprintf(stderr, "Failed to create sys files\n"); + DBUG_RETURN(1); } - fclose(from); + clean_up(lang_head, error_head); + my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); + DBUG_RETURN(0); } +} - if ((to=my_fopen(*argv,O_WRONLY | FILE_BINARY,MYF(0))) == NULL) + +static int create_header_files(struct errors *error_head) +{ + uint er_last; + FILE *er_definef, *sql_statef, *er_namef; + struct errors *tmp_error; + DBUG_ENTER("create_header_files"); + LINT_INIT(er_last); + + if (!(er_definef= my_fopen(HEADERFILE, O_WRONLY, MYF(MY_WME)))) + { + DBUG_RETURN(1); + } + if (!(sql_statef= my_fopen(STATEFILE, O_WRONLY, MYF(MY_WME)))) { - fprintf(stderr,"Can't create file '%s'\n",*argv); - return(1); + my_fclose(er_definef, MYF(0)); + DBUG_RETURN(1); + } + if (!(er_namef= my_fopen(NAMEFILE, O_WRONLY, MYF(MY_WME)))) + { + my_fclose(er_definef, MYF(0)); + my_fclose(sql_statef, MYF(0)); + DBUG_RETURN(1); } - fseek(to,(long) (32+row_count*2),0); - if (copy_rows(to)) - goto end; + fprintf(er_definef, "/* Autogenerated file, please don't edit */\n\n"); + fprintf(sql_statef, "/* Autogenerated file, please don't edit */\n\n"); + fprintf(er_namef, "/* Autogenerated file, please don't edit */\n\n"); - length=ftell(to)-32-row_count*2; + fprintf(er_definef, "#define ER_ERROR_FIRST %d\n", error_head->d_code); - bzero((gptr) head,32); /* Save Header & pointers */ - bmove((byte*) head,(byte*) file_head,4); - head[4]=files; - int2store(head+6,length); - int2store(head+8,row_count); - for (i=0 ; i<files ; i++) + for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error) { - int2store(head+10+i+i,file_row_pos[i]); + /* + generating mysqld_error.h + fprintf() will automaticly add \r on windows + */ + fprintf(er_definef, "#define %s %d\n", tmp_error->er_name, + tmp_error->d_code); + er_last= tmp_error->d_code; + + /* generating sql_state.h file */ + if (tmp_error->sql_code1[0] || tmp_error->sql_code2[0]) + fprintf(sql_statef, + "%-40s,\"%s\", \"%s\",\n", tmp_error->er_name, + tmp_error->sql_code1, tmp_error->sql_code2); + /*generating er_name file */ + fprintf(er_namef, "{ \"%s\", %d },\n", tmp_error->er_name, + tmp_error->d_code); + } - head[30]= csnum; - - fseek(to,0l,0); - if (fwrite(head,1,32,to) != 32) - goto end; + /* finishing off with mysqld_error.h */ + fprintf(er_definef, "#define ER_ERROR_LAST %d\n", er_last); + my_fclose(er_definef, MYF(0)); + my_fclose(sql_statef, MYF(0)); + my_fclose(er_namef, MYF(0)); + DBUG_RETURN(0); +} + - for (i=0 ; i<row_count ; i++) +static int create_sys_files(struct languages *lang_head, + struct errors *error_head, uint row_count) +{ + FILE *to; + uint csnum= 0, length, i, row_nr; + uchar head[32]; + char outfile[FN_REFLEN], *outfile_end; + long start_pos; + struct message *tmp; + struct languages *tmp_lang; + struct errors *tmp_error; + + MY_STAT stat_info; + DBUG_ENTER("create_sys_files"); + + /* + going over all languages and assembling corresponding error messages + */ + for (tmp_lang= lang_head; tmp_lang; tmp_lang= tmp_lang->next_lang) { - int2store(head,file_pos[i]); - if (fwrite(head,1,2,to) != 2) - goto end; - } - error=0; - printf("Found %d messages in language file %s\n",row_count,*argv); - end: - if (to) - fclose(to); - if (error) - fprintf(stderr,"Can't update messagefile %s, errno: %d\n",*argv,errno); + /* setting charset name */ + if (!(csnum= get_charset_number(tmp_lang->charset, MY_CS_PRIMARY))) + { + fprintf(stderr, "Unknown charset '%s' in '%s'\n", tmp_lang->charset, + TXTFILE); + DBUG_RETURN(1); + } + + outfile_end= strxmov(outfile, DATADIRECTORY, + tmp_lang->lang_long_name, NullS); + if (!my_stat(outfile, &stat_info,MYF(0))) + { + if (my_mkdir(outfile, 0777,MYF(0)) < 0) + { + fprintf(stderr, "Can't create output directory for %s\n", + outfile); + DBUG_RETURN(1); + } + } + + strxmov(outfile_end, FN_ROOTDIR, OUTFILE, NullS); - exit(error); - return(0); -} /* main */ + if (!(to= my_fopen(outfile, O_WRONLY | FILE_BINARY, MYF(MY_WME)))) + DBUG_RETURN(1); + /* 2 is for 2 bytes to store row position / error message */ + start_pos= (long) (HEADER_LENGTH + row_count * 2); + fseek(to, start_pos, 0); + row_nr= 0; + for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error) + { + /* dealing with messages */ + tmp= find_message(tmp_error, tmp_lang->lang_short_name); - /* Read options */ + if (!tmp) + { + fprintf(stderr, + "Did not find message for %s neither in %s nor in default " + "language\n", tmp_error->er_name, tmp_lang->lang_short_name); + goto err; + } + if (copy_rows(to, tmp->text, row_nr, start_pos)) + { + fprintf(stderr, "Failed to copy rows to %s\n", outfile); + goto err; + } + row_nr++; + } -static void get_options(register int *argc,register char **argv[]) -{ - int help=0; - char *pos,*progname; - - progname= (*argv)[0]; - while (--*argc >0 && *(pos = *(++*argv)) == '-' ) { - while (*++pos) - switch(*pos) { - case '#': - DBUG_PUSH (++pos); - *(pos--) = '\0'; /* Skippa argument */ - break; - case 'V': - printf("%s (Compile errormessage) Ver 1.3\n",progname); - break; - case 'C': - charsets_dir= pos+1; - *(pos--)= '\0'; - break; - case 'I': - case '?': - printf(" %s (Compile errormessage) Ver 1.3\n",progname); - puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n"); - printf("Usage: %s [-?] [-I] [-V] fromfile[s] tofile\n",progname); - puts("Options: -Info -Version\n"); - help=1; - break; - default: - fprintf(stderr,"illegal option: -%c\n",*pos); - fprintf(stderr,"legal options: -?IV\n"); - break; + /* continue with header of the errmsg.sys file */ + length= ftell(to) - HEADER_LENGTH - row_count * 2; + bzero((gptr) head, HEADER_LENGTH); + bmove((byte *) head, (byte *) file_head, 4); + head[4]= 1; + int2store(head + 6, length); + int2store(head + 8, row_count); + head[30]= csnum; + + my_fseek(to, 0l, MY_SEEK_SET, MYF(0)); + if (my_fwrite(to, head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP))) + goto err; + + for (i= 0; i < row_count; i++) + { + int2store(head, file_pos[i]); + if (my_fwrite(to, head, 2, MYF(MY_WME | MY_FNABP))) + goto err; } + my_fclose(to, MYF(0)); } - if (*argc < 2) + DBUG_RETURN(0); + +err: + my_fclose(to, MYF(0)); + DBUG_RETURN(1); +} + + +static void clean_up(struct languages *lang_head, struct errors *error_head) +{ + struct languages *tmp_lang, *next_language; + struct errors *tmp_error, *next_error; + uint count, i; + + my_free((gptr) default_language, MYF(0)); + + for (tmp_lang= lang_head; tmp_lang; tmp_lang= next_language) { - if (!help) - printf("Usage: %s [-?] [-I] [-V] fromfile[s] tofile\n",progname); - exit(-1); + next_language= tmp_lang->next_lang; + my_free(tmp_lang->lang_short_name, MYF(0)); + my_free(tmp_lang->lang_long_name, MYF(0)); + my_free(tmp_lang->charset, MYF(0)); + my_free((gptr) tmp_lang, MYF(0)); } - return; -} /* get_options */ + for (tmp_error= error_head; tmp_error; tmp_error= next_error) + { + next_error= tmp_error->next_error; + count= (tmp_error->msg).elements; + for (i= 0; i < count; i++) + { + struct message *tmp; + tmp= dynamic_element(&tmp_error->msg, i, struct message*); + my_free((gptr) tmp->lang_short_name, MYF(0)); + my_free((gptr) tmp->text, MYF(0)); + } + + delete_dynamic(&tmp_error->msg); + if (tmp_error->sql_code1[0]) + my_free((gptr) tmp_error->sql_code1, MYF(0)); + if (tmp_error->sql_code2[0]) + my_free((gptr) tmp_error->sql_code2, MYF(0)); + my_free((gptr) tmp_error->er_name, MYF(0)); + my_free((gptr) tmp_error, MYF(0)); + } +} - /* Count rows in from-file until row that start with char is found */ -static int count_rows(FILE *from, pchar c, pchar c2) +static int parse_input_file(const char *file_name, struct errors **top_error, + struct languages **top_lang) { - int count; - long pos; - char rad[MAXLENGTH]; - DBUG_ENTER("count_rows"); - - pos=ftell(from); count=0; - - charset_name[0]= '\0'; - while (fgets(rad,MAXLENGTH,from) != NULL) + FILE *file; + char *str, buff[1000]; + struct errors *current_error= 0, **tail_error= top_error; + struct message current_message; + int rcount= 0; + DBUG_ENTER("parse_input_file"); + + if (!(file= my_fopen(file_name, O_RDONLY | O_SHARE, MYF(MY_WME)))) + DBUG_RETURN(0); + + while ((str= fgets(buff, sizeof(buff), file))) { - if (!strncmp(rad,"character-set=",14)) + if (is_prefix(str, "language")) + { + if (!(*top_lang= parse_charset_string(str))) + { + fprintf(stderr, "Failed to parse the charset string!\n"); + DBUG_RETURN(0); + } + continue; + } + if (is_prefix(str, "start-error-number")) + { + if (!(er_offset= parse_error_offset(str))) + { + fprintf(stderr, "Failed to parse the error offset string!\n"); + DBUG_RETURN(0); + } + continue; + } + if (is_prefix(str, "default-language")) + { + if (!(default_language= parse_default_language(str))) + { + DBUG_PRINT("info", ("default_slang: %s", default_language)); + fprintf(stderr, + "Failed to parse the default language line. Aborting\n"); + DBUG_RETURN(0); + } + continue; + } + + if (*str == '\t' || *str == ' ') { - char *b= rad+14, *e; - for (e=b ; e[0] && e-b < MAX_CHARSET_NAME && - e[0] != ' ' && e[0] != '\r' && - e[0] != '\n' && e[0] != '\t' ; e++); - e[0]= '\0'; - strcpy(charset_name, b); + /* New error message in another language for previous error */ + if (!current_error) + { + fprintf(stderr, "Error in the input file format\n"); + DBUG_RETURN(0); + } + if (!parse_message_string(¤t_message, str)) + { + fprintf(stderr, "Failed to parse message string for error '%s'", + current_error->er_name); + DBUG_RETURN(0); + } + if (insert_dynamic(¤t_error->msg, (byte *) & current_message)) + DBUG_RETURN(0); + continue; } - if (rad[0] == c || rad[0] == c2) - break; - count++; - pos=ftell(from); + if (is_prefix(str, ER_PREFIX) || is_prefix(str, WARN_PREFIX)) + { + if (!(current_error= parse_error_string(str, rcount))) + { + fprintf(stderr, "Failed to parse the error name string\n"); + DBUG_RETURN(0); + } + rcount++; /* Count number of unique errors */ + + /* add error to the list */ + *tail_error= current_error; + tail_error= ¤t_error->next_error; + continue; + } + if (*str == '#' || *str == '\n') + continue; /* skip comment or empty lines */ + + fprintf(stderr, "Wrong input file format. Stop!\nLine: %s\n", str); + DBUG_RETURN(0); + } + *tail_error= 0; /* Mark end of list */ + + my_fclose(file, MYF(0)); + DBUG_RETURN(rcount); +} + + +static uint parse_error_offset(char *str) +{ + char *soffset, *end; + int error; + uint ioffset; + + DBUG_ENTER("parse_error_offset"); + /* skipping the "start-error-number" keyword and spaces after it */ + str= find_end_of_word(str); + str= skip_delimiters(str); + + if (!*str) + DBUG_RETURN(0); /* Unexpected EOL: No error number after the keyword */ + + /* reading the error offset */ + if (!(soffset= get_word(&str))) + DBUG_RETURN(0); /* OOM: Fatal error */ + DBUG_PRINT("info", ("default_error_offset: %s", soffset)); + + /* skipping space(s) and/or tabs after the error offset */ + str= skip_delimiters(str); + DBUG_PRINT("info", ("str: %s", str)); + if (*str) + { + /* The line does not end with the error offset -> error! */ + fprintf(stderr, "The error offset line does not end with an error offset"); + DBUG_RETURN(0); } - fseek(from,pos,0); /* Position to beginning of last row */ - DBUG_PRINT("exit",("count: %d",count)); - DBUG_RETURN(count); -} /* count_rows */ + DBUG_PRINT("info", ("str: %s", str)); + + end= 0; + ioffset= (uint) my_strtoll10(soffset, &end, &error); + my_free((gptr) soffset, MYF(0)); + DBUG_RETURN(ioffset); +} - /* Read rows and remember them until row that start with char */ - /* Converts row as a C-compiler would convert a textstring */ +/* Parsing of the default language line. e.g. "default-lanuage eng" */ -static int remember_rows(FILE* from, pchar c) +static char *parse_default_language(char *str) { - int i,nr,start_count,found_end; - char row[MAXLENGTH],*pos; - DBUG_ENTER("remember_rows"); + char *slang; + + DBUG_ENTER("parse_default_language"); + /* skipping the "default_language" keyword */ + str= find_end_of_word(str); + /* skipping space(s) and/or tabs after the keyword */ + str= skip_delimiters(str); + if (!*str) + { + fprintf(stderr, + "Unexpected EOL: No short language name after the keyword\n"); + DBUG_RETURN(0); + } + + /* reading the short language tag */ + if (!(slang= get_word(&str))) + DBUG_RETURN(0); /* OOM: Fatal error */ + DBUG_PRINT("info", ("default_slang: %s", slang)); - start_count=row_count; found_end=0; - while (fgets(row,MAXLENGTH,from) != NULL) + str= skip_delimiters(str); + DBUG_PRINT("info", ("str: %s", str)); + if (*str) { - if (row[0] == c) + fprintf(stderr, + "The default language line does not end with short language " + "name\n"); + DBUG_RETURN(0); + } + DBUG_PRINT("info", ("str: %s", str)); + DBUG_RETURN(slang); +} + + +/* + For given error finds message on given language, if does not exist, + returns english. +*/ + +static struct message *find_message(struct errors *err, const char *lang) +{ + struct message *tmp, *return_val= 0; + uint i, count; + DBUG_ENTER("find_message"); + + count= (err->msg).elements; + for (i= 0; i < count; i++) + { + tmp= dynamic_element(&err->msg, i, struct message*); + + if (!strcmp(tmp->lang_short_name, lang)) + DBUG_RETURN(tmp); + if (!strcmp(tmp->lang_short_name, default_language)) { - found_end=1; - break; + DBUG_ASSERT(tmp->text[0] != 0); + return_val= tmp; } - for (pos=row ; *pos ;) + } + DBUG_RETURN(return_val); +} + + +/* + Skips spaces and or tabs till the beginning of the next word + Returns pointer to the beginning of the first character of the word +*/ + +static char *skip_delimiters(char *str) +{ + DBUG_ENTER("skip_delimiters"); + for (; + *str == ' ' || *str == ',' || *str == '\t' || *str == '\r' || + *str == '\n' || *str == '='; str++) + ; + DBUG_RETURN(str); +} + + +/* + Skips all characters till meets with space, or tab, or EOL +*/ + +static char *find_end_of_word(char *str) +{ + DBUG_ENTER("find_end_of_word"); + for (; + *str != ' ' && *str != '\t' && *str != '\n' && *str != '\r' && *str && + *str != ',' && *str != ';' && *str != '='; str++) + ; + DBUG_RETURN(str); +} + + +/* Read the word starting from *str */ + +static char *get_word(char **str) +{ + char *start= *str; + DBUG_ENTER("get_word"); + + *str= find_end_of_word(start); + DBUG_RETURN(my_strdup_with_length(start, (uint) (*str - start), + MYF(MY_WME | MY_FAE))); +} + + +/* + Parsing the string with short_lang - message text. Code - to + remember to which error does the text belong +*/ + +static struct message *parse_message_string(struct message *new_message, + char *str) +{ + char *start; + + DBUG_ENTER("parse_message_string"); + DBUG_PRINT("enter", ("str: %s", str)); + + /*skip space(s) and/or tabs in the beginning */ + while (*str == ' ' || *str == '\t' || *str == '\n') + str++; + + if (!*str) + { + /* It was not a message line, but an empty line. */ + DBUG_PRINT("info", ("str: %s", str)); + DBUG_RETURN(0); + } + + /* reading the short lang */ + start= str; + while (*str != ' ' && *str != '\t' && *str) + str++; + if (!(new_message->lang_short_name= + my_strdup_with_length(start, (uint) (str - start), + MYF(MY_WME | MY_FAE)))) + DBUG_RETURN(0); /* Fatal error */ + DBUG_PRINT("info", ("msg_slang: %s", new_message->lang_short_name)); + + /*skip space(s) and/or tabs after the lang */ + while (*str == ' ' || *str == '\t' || *str == '\n') + str++; + + if (*str != '"') + { + fprintf(stderr, "Unexpected EOL"); + DBUG_PRINT("info", ("str: %s", str)); + DBUG_RETURN(0); + } + + /* reading the text */ + start= str + 1; + str= parse_text_line(start); + + if (!(new_message->text= my_strdup_with_length(start, (uint) (str - start), + MYF(MY_WME | MY_FAE)))) + DBUG_RETURN(0); /* Fatal error */ + DBUG_PRINT("info", ("msg_text: %s", new_message->text)); + + DBUG_RETURN(new_message); +} + + +/* + Parsing the string with error name and codes; returns the pointer to + the errors struct +*/ + +static struct errors *parse_error_string(char *str, int er_count) +{ + struct errors *new_error; + char *start; + DBUG_ENTER("parse_error_string"); + DBUG_PRINT("enter", ("str: %s", str)); + + /* create a new a element */ + new_error= (struct errors *) my_malloc(sizeof(*new_error), MYF(MY_WME)); + + if (my_init_dynamic_array(&new_error->msg, sizeof(struct message), 0, 0)) + DBUG_RETURN(0); /* OOM: Fatal error */ + + /* getting the error name */ + start= str; + str= skip_delimiters(str); + + if (!(new_error->er_name= get_word(&str))) + DBUG_RETURN(0); /* OOM: Fatal error */ + DBUG_PRINT("info", ("er_name: %s", new_error->er_name)); + + str= skip_delimiters(str); + + /* getting the code1 */ + + new_error->d_code= er_offset + er_count; + DBUG_PRINT("info", ("d_code: %d", new_error->d_code)); + + str= skip_delimiters(str); + + /* if we reached EOL => no more codes, but this can happen */ + if (!*str) + { + new_error->sql_code1= empty_string; + new_error->sql_code2= empty_string; + DBUG_PRINT("info", ("str: %s", str)); + DBUG_RETURN(new_error); + } + + /* getting the sql_code 1 */ + + if (!(new_error->sql_code1= get_word(&str))) + DBUG_RETURN(0); /* OOM: Fatal error */ + DBUG_PRINT("info", ("sql_code1: %s", new_error->sql_code1)); + + str= skip_delimiters(str); + + /* if we reached EOL => no more codes, but this can happen */ + if (!*str) + { + new_error->sql_code2= empty_string; + DBUG_PRINT("info", ("str: %s", str)); + DBUG_RETURN(new_error); + } + + /* getting the sql_code 2 */ + if (!(new_error->sql_code2= get_word(&str))) + DBUG_RETURN(0); /* OOM: Fatal error */ + DBUG_PRINT("info", ("sql_code2: %s", new_error->sql_code2)); + + str= skip_delimiters(str); + if (*str) + { + fprintf(stderr, "The error line did not end with sql/odbc code!"); + DBUG_RETURN(0); + } + + DBUG_RETURN(new_error); +} + + +/* + Parsing the string with charset/full lang name/short lang name; + returns pointer to the language structure +*/ + +static struct languages *parse_charset_string(char *str) +{ + struct languages *head=0, *new_lang; + DBUG_ENTER("parse_charset_string"); + DBUG_PRINT("enter", ("str: %s", str)); + + /* skip over keyword */ + str= find_end_of_word(str); + if (!*str) + { + /* unexpected EOL */ + DBUG_PRINT("info", ("str: %s", str)); + DBUG_RETURN(0); + } + + str= skip_delimiters(str); + if (!(*str != ';' && *str)) + DBUG_RETURN(0); + + do + { + /*creating new element of the linked list */ + new_lang= (struct languages *) my_malloc(sizeof(*new_lang), MYF(MY_WME)); + new_lang->next_lang= head; + head= new_lang; + + /* get the full language name */ + + if (!(new_lang->lang_long_name= get_word(&str))) + DBUG_RETURN(0); /* OOM: Fatal error */ + + DBUG_PRINT("info", ("long_name: %s", new_lang->lang_long_name)); + + /* getting the short name for language */ + str= skip_delimiters(str); + if (!*str) + DBUG_RETURN(0); /* Error: No space or tab */ + + if (!(new_lang->lang_short_name= get_word(&str))) + DBUG_RETURN(0); /* OOM: Fatal error */ + DBUG_PRINT("info", ("short_name: %s", new_lang->lang_short_name)); + + /* getting the charset name */ + str= skip_delimiters(str); + if (!(new_lang->charset= get_word(&str))) + DBUG_RETURN(0); /* Fatal error */ + DBUG_PRINT("info", ("charset: %s", new_lang->charset)); + + /* skipping space, tub or "," */ + str= skip_delimiters(str); + } + while (*str != ';' && *str); + + DBUG_PRINT("info", ("long name: %s", new_lang->lang_long_name)); + DBUG_RETURN(head); +} + + +/* Read options */ + +static void print_version(void) +{ + DBUG_ENTER("print_version"); + printf("%s (Compile errormessage) Ver %s\n", my_progname, "2.0"); + DBUG_VOID_RETURN; +} + + +static my_bool +get_one_option(int optid, const struct my_option *opt __attribute__ ((unused)), + char *argument __attribute__ ((unused))) +{ + DBUG_ENTER("get_one_option"); + switch (optid) { + case 'V': + print_version(); + exit(0); + break; + case '?': + usage(); + exit(0); + break; + case '#': + DBUG_PUSH(argument ? argument : default_dbug_option); + break; + } + DBUG_RETURN(0); +} + + +static void usage(void) +{ + DBUG_ENTER("usage"); + print_version(); + printf("This software comes with ABSOLUTELY NO WARRANTY. This is free " + "software,\nand you are welcome to modify and redistribute it under " + "the GPL license\nUsage:\n"); + my_print_help(my_long_options); + my_print_variables(my_long_options); + DBUG_VOID_RETURN; +} + + +static int get_options(int *argc, char ***argv) +{ + int ho_error; + DBUG_ENTER("get_options"); + + if ((ho_error= handle_options(argc, argv, my_long_options, get_one_option))) + DBUG_RETURN(ho_error); + DBUG_RETURN(0); +} + + +/* + Read rows and remember them until row that start with char Converts + row as a C-compiler would convert a textstring +*/ + +static char *parse_text_line(char *pos) +{ + int i, nr; + char *row= pos; + DBUG_ENTER("parse_text_line"); + + while (*pos) + { + if (*pos == '\\') { - if (*pos == '\\') - { - switch (*++pos) { - case '\\': - case '"': - VOID(strmov(pos-1,pos)); - break; - case 'n': - pos[-1]='\n'; - VOID(strmov(pos,pos+1)); - break; - default: - if (*pos >= '0' && *pos <'8') - { - nr=0; - for (i=0 ; i<3 && (*pos >= '0' && *pos <'8' ) ; i++) - nr=nr*8+ (*(pos++) -'0'); - pos-=i; - pos[-1]=nr; - VOID(strmov(pos,pos+i)); - } - else if (*pos) - VOID(strmov(pos-1,pos)); /* Remove '\' */ + switch (*++pos) { + case '\\': + case '"': + VOID(strmov(pos - 1, pos)); + break; + case 'n': + pos[-1]= '\n'; + VOID(strmov(pos, pos + 1)); + break; + default: + if (*pos >= '0' && *pos < '8') + { + nr= 0; + for (i= 0; i < 3 && (*pos >= '0' && *pos < '8'); i++) + nr= nr * 8 + (*(pos++) - '0'); + pos -= i; + pos[-1]= nr; + VOID(strmov(pos, pos + i)); } + else if (*pos) + VOID(strmov(pos - 1, pos)); /* Remove '\' */ } - else pos++; } - while (pos >row+1 && *pos != '"') - pos--; - - if (!(saved_row[row_count] = (my_string) my_malloc((uint) (pos-row), - MYF(MY_WME)))) - DBUG_RETURN(-1); - *pos=0; - VOID(strmov(saved_row[row_count],row+1)); - row_count++; + else + pos++; } - if (row_count-start_count == 0 && ! found_end) - DBUG_RETURN(-1); /* Found nothing */ - DBUG_RETURN(row_count-start_count); -} /* remember_rows */ + while (pos > row + 1 && *pos != '"') + pos--; + *pos= 0; + DBUG_RETURN(pos); +} - /* Copy rows from memory to file and remember position */ +/* Copy rows from memory to file and remember position */ - -static int copy_rows(FILE *to) +static int copy_rows(FILE *to, char *row, int row_nr, long start_pos) { - int row_nr; - long start_pos; DBUG_ENTER("copy_rows"); - start_pos=ftell(to); - for (row_nr =0 ; row_nr < row_count; row_nr++) + file_pos[row_nr]= (int) (ftell(to) - start_pos); + if (fputs(row, to) == EOF || fputc('\0', to) == EOF) { - file_pos[row_nr]= (int) (ftell(to)-start_pos); - if (fputs(saved_row[row_nr],to) == EOF || fputc('\0',to) == EOF) - { - fprintf(stderr,"Can't write to outputfile\n"); - DBUG_RETURN(1); - } - my_free((gptr) saved_row[row_nr],MYF(0)); + fprintf(stderr, "Can't write to outputfile\n"); + DBUG_RETURN(1); } + DBUG_RETURN(0); -} /* copy_rows */ +} |