[ekg2-commit] ekg2: userlist.c (HEAD) [darkjames]

[CVS commit]

Module name:	ekg2
Changes by:	darkjames	2007-05-03 20:15:23

Modified files:
	userlist.c

Log message:
userlist + prepare_pathf()

Index: userlist.c
===================================================================
RCS file: /home/cvs/ekg2/ekg/userlist.c,v
diff -d -u -r1.100 -r1.101
--- userlist.c	2 May 2007 21:25:06 -0000	1.100
+++ userlist.c	3 May 2007 18:15:23 -0000	1.101
@@ -196,13 +196,9 @@
         const char *filename;
         char *buf;
         FILE *f;
-        char *tmp=saprintf("%s-userlist", session->uid);
 
-        if (!(filename = prepare_path(tmp, 0))) {
-                xfree(tmp);
-                return -1;
-        }       
-        xfree(tmp);
+	if (!(filename = prepare_pathf("%s-userlist", session->uid)))
+		return -1;
         
         if (!(f = fopen(filename, "r")))
                 return -1;
@@ -238,15 +234,13 @@
 {
 	const char *filename;
 	FILE *f;
-	char *tmp = saprintf("%s-userlist", session->uid); 
 	list_t l;
 
-	if (!(filename = prepare_path(tmp, 1))) {
-		xfree(tmp);
+	if (!prepare_path(NULL, 1))	/* try to create ~/.ekg2 dir */
 		return -1;
-	}
 
-	xfree(tmp);
+	if (!(filename = prepare_pathf("%s-userlist", session->uid)))
+		return -1;
 	
 	if (!(f = fopen(filename, "w"))) {
 		return -2;