[Gaim-commits] CVS: gaim/src util.c,1.119,1.120

[Jim S. <jse...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv13869/src

Modified Files:
	util.c 
Log Message:
Changed gaim_mkstemp() to use GLib's g_get_tmp_dir() at Sean's suggestion.


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- util.c	7 May 2002 23:41:30 -0000	1.119
+++ util.c	8 May 2002 00:21:26 -0000	1.120
@@ -1281,20 +1281,11 @@
 
 FILE *gaim_mkstemp(gchar **fpath)
 {
-	static char *tmpdir = NULL;
+	gchar *tmpdir;
 	int fd;
 	FILE *fp = NULL;
 
-	if(!tmpdir) {
-		if((tmpdir = tempnam(NULL, NULL)) == NULL) {
-			debug_printf("Error: tempnam() failed, error: %d\n", errno);
-		} else {
-			char *t = strrchr(tmpdir, '/');
-			*t = '\0';
-		}
-	}
-
-	if(tmpdir) {
+	if((tmpdir = g_get_tmp_dir()) != NULL) {
 		if((*fpath = g_strdup_printf("%s/%s", tmpdir, gaim_mkstemp_templ)) != NULL) {
 			if((fd = mkstemp(*fpath)) == -1) {
 				debug_printf("Error: Couldn't make \"%s\", error: %d\n", *fpath, errno);
@@ -1309,6 +1300,8 @@
 				*fpath = NULL;
 			}
 		}
+	} else {
+		debug_printf("Error: g_get_tmp_dir() failed in gaim_mkstemp()!\n");
 	}
 
 	return fp;