[Ayttm-commits] CVS: ayttm/src chat_room.c, 1.82, 1.83 main.c, 1.24, 1.25

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13824

Modified Files:
	chat_room.c main.c 
Log Message:
* Removed unnecessary path separator when opening files like chatroom_autoconnect
* Hopefully, fixed memory leak in HTML text buffer
* Replaced '/' with G_DIR_SEPARATOR

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- chat_room.c	30 Aug 2009 14:55:58 -0000	1.82
+++ chat_room.c	7 Sep 2009 07:19:07 -0000	1.83
@@ -353,9 +353,7 @@
 {
 	FILE *fp;
 	char buff [4096];
-	snprintf(buff, 4095, "%s%cchatroom_autoconnect",
-				config_dir,
-				G_DIR_SEPARATOR);
+	snprintf(buff, 4095, "%schatroom_autoconnect", config_dir);
 	if (!ela)
 		return;
 
@@ -381,9 +379,7 @@
 {
 	FILE *fp;
 	char buff [4096];
-	snprintf(buff, 4095, "%s%cchatroom_autoconnect",
-				config_dir,
-				G_DIR_SEPARATOR);
+	snprintf(buff, 4095, "%schatroom_autoconnect", config_dir);
 	if (!cr->local_user || !cr->room_name)
 		return FALSE;
 
@@ -416,7 +412,7 @@
 {
 	FILE *fp;
 	char buff[4096];
-	snprintf(buff, 4095, "%s%cchatroom_autoconnect", config_dir, G_DIR_SEPARATOR);
+	snprintf(buff, 4095, "%schatroom_autoconnect", config_dir);
 
 	if (!ela || !name) 
 		return;
@@ -439,7 +435,7 @@
 		fclose(fp);
 	}
 
-	snprintf(buff, 4095, "%s%cchatroom_autoconnect", config_dir, G_DIR_SEPARATOR);
+	snprintf(buff, 4095, "%schatroom_autoconnect", config_dir);
 	fp = fopen(buff, "a");
 	if (!fp) 
 		return;
@@ -451,16 +447,12 @@
 {
 	FILE *fp, *tmp;
 	char buffin[4095], bufftmp[4095], buff[4095];
-	snprintf(bufftmp, 4095, "%s%cchatroom_autoconnect.tmp",
-				config_dir, 
-				G_DIR_SEPARATOR);
-	snprintf(buffin, 4095, "%s%cchatroom_autoconnect",
-				config_dir,
-				G_DIR_SEPARATOR);
+	snprintf(bufftmp, 4095, "%schatroom_autoconnect.tmp", config_dir);
+	snprintf(buffin, 4095, "%schatroom_autoconnect", config_dir);
 	if (!ela || !name)
 		return;
 
-	eb_debug(DBG_CORE, "buff %s\n", buff);
+	eb_debug(DBG_CORE, "buff %s\n", buffin);
 	fp = fopen(buffin, "r");
 	tmp = fopen(bufftmp, "w");
 
@@ -666,9 +658,7 @@
 	char buff [4096];
 	FILE *fp = NULL;
 
-	snprintf(buff, 4095, "%s%cchatroom_mru",
-				config_dir,
-				G_DIR_SEPARATOR);
+	snprintf(buff, 4095, "%schatroom_mru", config_dir);
 
 	fp = fopen(buff, "r");
 	memset(buff, 0, 4096);
@@ -691,9 +681,7 @@
 	char buff [4096];
 	FILE *fp = NULL;
 
-	snprintf(buff, 4095, "%s%cchatroom_mru",
-				config_dir,
-				G_DIR_SEPARATOR);
+	snprintf(buff, 4095, "%schatroom_mru", config_dir);
 
 	fp = fopen(buff, "r");
 	memset (buff, 0, 4096);
@@ -718,9 +706,7 @@
 	FILE *fp = NULL;
 	int i = 0;
 
-	snprintf(buff, 4095, "%s%cchatroom_mru",
-				config_dir,
-				G_DIR_SEPARATOR);
+	snprintf(buff, 4095, "%schatroom_mru", config_dir);
 
 	fp = fopen(buff, "w");
 	memset(buff, 0, 4096);

Index: main.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- main.c	8 Mar 2009 18:42:31 -0000	1.24
+++ main.c	7 Sep 2009 07:19:07 -0000	1.25
@@ -221,7 +221,8 @@
 	}
 #else
 	gtk_set_locale ();
-	g_snprintf(config_dir, 1024, "%s/.ayttm/",getenv("HOME"));
+	g_snprintf(
+			config_dir, 1024, "%s%c.ayttm%c", getenv("HOME"), G_DIR_SEPARATOR, G_DIR_SEPARATOR);
 #endif
 
 	g_thread_init(NULL);
@@ -232,7 +233,7 @@
 		static struct option long_options[] = 
 		{
 	    	{"version", no_argument, NULL, 'v'},
-		{"help", no_argument, NULL, 'h'},
+	    	{"help", no_argument, NULL, 'h'},
 	    	{"geometry", required_argument, NULL, 'g'},
 	    	{"activate-goad-server", required_argument, NULL, 'a'},
 	    	{"disable-server", no_argument, NULL, 'D'},
@@ -309,11 +310,11 @@
 			strncpy(config_dir, optarg, sizeof(config_dir));
 			/*Make sure we have directory delimiter */
 #if defined( _WIN32 )
-			if (config_dir[strlen(config_dir)-1]!='\\')
+			if (config_dir[strlen(config_dir)-1] != '\\')
 				strcat(config_dir, "\\");
 #else
-			if (config_dir[strlen(config_dir)-1]!='/')
-				strcat(config_dir, "/");
+			if (config_dir[strlen(config_dir)-1] != G_DIR_SEPARATOR)
+				strcat(config_dir, (char *)G_DIR_SEPARATOR);
 #endif
 			if (stat(config_dir, &stat_buf)==-1)
 			{