X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mysql_selector.c;h=054c797ebcd10e66635197b73dc7548449bc6bce;hp=8d043f5ae4759b21487a30916155df8275aeff3d;hb=de4ed577b6019b9b83466c2c893ff02bb5d833f5;hpb=9c0fedbedd284d4c76d785b6243fc2027344242d

diff --git a/mysql_selector.c b/mysql_selector.c
index 8d043f5a..054c797e 100644
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -32,7 +32,6 @@
 #include "net.h"
 #include "string.h"
 
-extern struct gengetopt_args_info conf;
 /** pointer to the shared memory area */
 extern struct misc_meta_data *mmd;
 
@@ -663,7 +662,7 @@ out:
 	return ret;
 }
 
-static char *escape_blob(char* old, int size)
+static char *escape_blob(const char* old, int size)
 {
 	char *new;
 
@@ -674,7 +673,7 @@ static char *escape_blob(char* old, int size)
 	return new;
 }
 
-static char *escape_str(char* old)
+static char *escape_str(const char* old)
 {
 	return escape_blob(old, strlen(old));
 }
@@ -2321,7 +2320,6 @@ static int mysql_write_tmp_file(const char *dir, const char *name)
 {
 	int ret = -E_TMPFILE;
 	char *msg = make_message("%s\t%s\n", dir, name);
-
 	if (fputs(msg, out_file) != EOF)
 		ret = 1;
 	free(msg);
@@ -2384,12 +2382,15 @@ static int com_upd(int fd, int argc, __a_unused char *argv[])
 		goto out;
 	}
 	while ((row = mysql_fetch_row(result))) {
+		char *erow;
 		ret = -E_NOROW;
 		if (!row[0])
 			goto out;
 		send_va_buffer(fd, "new entry: %s\n", row[0]);
+		erow = escape_str(row[0]);
 		query = make_message("insert into data (name, pic_id) values "
-			"('%s','%s')", row[0], "1");
+			"('%s','%s')", erow, "1");
+		free(erow);
 		ret = real_query(query);
 		free(query);
 		if (ret < 0)