From 498e92b0ecb6b569ceb7a9e97f727df463a55af5 Mon Sep 17 00:00:00 2001 From: Nils Durner Date: Sun, 15 Nov 2009 10:03:47 +0000 Subject: [PATCH] MinGW fixes --- src/util/common_logging.c | 2 +- src/util/disk.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 5af499341..b0c97df7d 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -167,7 +167,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile) min_level = get_type (loglevel); if (logfile == NULL) return GNUNET_OK; - altlog = fopen (logfile, "a"); + altlog = FOPEN (logfile, "a"); if (altlog == NULL) { GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", logfile); diff --git a/src/util/disk.c b/src/util/disk.c index ce0b2676f..79b1b64a8 100644 --- a/src/util/disk.c +++ b/src/util/disk.c @@ -284,10 +284,15 @@ GNUNET_DISK_mktemp (const char *t) tmpdir = getenv ("TMPDIR"); tmpdir = tmpdir ? tmpdir : "/tmp"; - GNUNET_asprintf (&tmpl, "%s%s%s%s", tmpdir, DIR_SEPARATOR_STR, t, "XXXXXX"); + GNUNET_asprintf (&tmpl, "%s/%s%s", tmpdir, t, "XXXXXX"); #ifdef MINGW fn = (char *) GNUNET_malloc (MAX_PATH + 1); - plibc_conv_to_win_path (tmpl, fn); + if (ERROR_SUCCESS != plibc_conv_to_win_path (tmpl, fn)) + { + GNUNET_free (fn); + GNUNET_free (tmpl); + return NULL; + } GNUNET_free (tmpl); #else fn = tmpl; @@ -1185,6 +1190,8 @@ GNUNET_DISK_file_open (const char *fn, #endif expfn = GNUNET_STRINGS_filename_expand (fn); + if (NULL == expfn) + return NULL; #ifndef MINGW mode = 0; -- 2.25.1