From be85325b006a230c8a59486c4bd28b03540b732e Mon Sep 17 00:00:00 2001 From: pk910 Date: Sun, 2 Oct 2011 13:20:24 +0200 Subject: [PATCH] fixed "may be uninitialized" on linux systems --- .gitignore | 1 + database.defaults.sql | 3 +-- src/lib/ini.c | 6 ++---- src/lib/ini.o | Bin 9510 -> 0 bytes src/mysqlConn.c | 25 ++++++++++++++++--------- 5 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 src/lib/ini.o diff --git a/.gitignore b/.gitignore index c95860b..c39a038 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ src/.deps src/.dirstamp src/lib/.deps src/lib/.dirstamp +src/lib/*.o src/*.o autom4te.cache aclocal.m4 diff --git a/database.defaults.sql b/database.defaults.sql index a4d0c33..4413b58 100644 --- a/database.defaults.sql +++ b/database.defaults.sql @@ -547,7 +547,6 @@ INSERT INTO `language` (`id`, `lang`, `ident`, `text`) VALUES -- INSERT INTO `bots` (`id`, `active`, `nick`, `server`, `port`, `pass`, `ssl`, `bind`, `ident`, `realname`, `automodes`, `botclass`, `textbot`, `defaulttrigger`, `max_channels`, `register_priority`) VALUES -(4, 0, 'TestBot', '127.0.0.1', 6667, NULL, 0, NULL, 'testbot', 'TestBot2', 'ix', 1, 0, '+', 0, 0); - +(4, 1, 'TestBot', '127.0.0.1', 6667, "", 0, NULL, 'testbot', 'TestBot2', 'ix', 1, 0, '+', 0, 0); diff --git a/src/lib/ini.c b/src/lib/ini.c index e0bd1af..b9e8f97 100644 --- a/src/lib/ini.c +++ b/src/lib/ini.c @@ -124,7 +124,7 @@ void ReadString(char *SectionName,char *FieldName,char *FieldValue) { int loadINI(char *filename) { FILE *f; - int i, fpointer; + int i, fpointer = 0; char SectionName[SECTION_LEN], FieldName[FIELDNAME_LEN], FieldValue[FIELDVALUE_LEN], ch; f=fopen(filename,"rb"); @@ -150,10 +150,9 @@ int loadINI(char *filename) { removeSpace(SectionName); while(!feof(f)) { fread(&ch,sizeof(char),1,f); - if (ch == 0x0d) + if (ch == '\r' || ch == '\n') break; } - fread(&ch,sizeof(char),1,f); if (SectionName[0] == '\0') continue; while(!feof(f)) { @@ -195,7 +194,6 @@ int loadINI(char *filename) { } } removeSpace(FieldValue); - fread(&ch,sizeof(char),1,f); WriteString(SectionName,FieldName,FieldValue); } } diff --git a/src/lib/ini.o b/src/lib/ini.o deleted file mode 100644 index 60943f1bdbe48e47a0fc7bcdd6b0002914dcad36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9510 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 T(ESJ*befrWO7LRp6XpK`Mi;%_ diff --git a/src/mysqlConn.c b/src/mysqlConn.c index 5965e6a..7484059 100644 --- a/src/mysqlConn.c +++ b/src/mysqlConn.c @@ -82,6 +82,7 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) { version = atoi(row[0]); } } + printf("%d \n", version); if(!version) { //CREATE DATABASE FILE *f = fopen("database.sql", "r"); @@ -92,30 +93,31 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) { int query_buffer_pos = 0; while (fgets(line, sizeof(line), f)) { query_buffer_pos += sprintf(query_buffer + query_buffer_pos, " %s", line); - if(line[(strlen(line) - 1)] == ';') { - mysql_query(mysql_conn, query_buffer); + if(line[(strlen(line) - 2)] == ';') { + if(mysql_query(mysql_conn, query_buffer)) + show_mysql_error(); query_buffer_pos = 0; } } fclose(f); } f = fopen("database.defaults.sql", "r"); - mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_ON); if (f) { - char line[2048]; - char query_buffer[65536]; + char line[4096]; + char query_buffer[131072]; int query_buffer_pos = 0; while (fgets(line, sizeof(line), f)) { query_buffer_pos += sprintf(query_buffer + query_buffer_pos, " %s", line); - if(line[(strlen(line) - 1)] == ';') { - mysql_query(mysql_conn, query_buffer); + if(line[(strlen(line) - 2)] == ';') { + if(mysql_query(mysql_conn, query_buffer)) + show_mysql_error(); query_buffer_pos = 0; } } fclose(f); } mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF); - mysql_query(mysql_conn, "UPDATE `version` SET `database_version` = '" DATABASE_VERSION "'"); + mysql_query(mysql_conn, "INSERT INTO `version` (`database_version`) VALUES ('" DATABASE_VERSION "')"); } else if(version < atoi(DATABASE_VERSION)) { //UPDATE DATABASE @@ -137,8 +139,13 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) { use_querys = 1; } } + if(query_buffer_pos) { + if(mysql_query(mysql_conn, query_buffer)) + show_mysql_error(); + } fclose(f); - } + } else + perror("database.sql missing!"); mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF); mysql_query(mysql_conn, "UPDATE `version` SET `database_version` = '" DATABASE_VERSION "'"); } -- 2.20.1