[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9508 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9508 - gnunet/src/util |
Date: |
Sun, 15 Nov 2009 03:03:47 -0700 |
Author: durner
Date: 2009-11-15 03:03:47 -0700 (Sun, 15 Nov 2009)
New Revision: 9508
Modified:
gnunet/src/util/common_logging.c
gnunet/src/util/disk.c
Log:
MinGW fixes
Modified: gnunet/src/util/common_logging.c
===================================================================
--- gnunet/src/util/common_logging.c 2009-11-15 10:01:03 UTC (rev 9507)
+++ gnunet/src/util/common_logging.c 2009-11-15 10:03:47 UTC (rev 9508)
@@ -167,7 +167,7 @@
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);
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2009-11-15 10:01:03 UTC (rev 9507)
+++ gnunet/src/util/disk.c 2009-11-15 10:03:47 UTC (rev 9508)
@@ -284,10 +284,15 @@
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 @@
#endif
expfn = GNUNET_STRINGS_filename_expand (fn);
+ if (NULL == expfn)
+ return NULL;
#ifndef MINGW
mode = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9508 - gnunet/src/util,
gnunet <=