tolerate additional IPv4 address now available for gnunet.org

[oweals/gnunet.git] / src / util / disk.c

diff --git a/src/util/disk.c b/src/util/disk.c
index 26b615df9db2612d70a7b85b5f7ad84e3fa9bb3d..4f78c77470ee5317c3d7853b3cef161f0794434b 100644 (file)
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -11,9 +11,11 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/disk.c
@@ -236,7 +238,8 @@ GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh,
  * @return the new position on success, #GNUNET_SYSERR otherwise
  */
 off_t
-GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, off_t offset,
+GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h,
+                      off_t offset,
                        enum GNUNET_DISK_Seek whence)
 {
   if (h == NULL)
@@ -605,7 +608,6 @@ GNUNET_DISK_mktemp (const char *t)
   umask (omask);
   if (0 != CLOSE (fd))
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "close", fn);
-  GNUNET_free (fn);
   return fn;
 }
 
@@ -623,7 +625,8 @@ GNUNET_DISK_mktemp (const char *t)
  *           does not exist or stat'ed
  */
 int
-GNUNET_DISK_directory_test (const char *fil, int is_readable)
+GNUNET_DISK_directory_test (const char *fil,
+                            int is_readable)
 {
   struct stat filestat;
   int ret;
@@ -637,7 +640,7 @@ GNUNET_DISK_directory_test (const char *fil, int is_readable)
   }
   if (!S_ISDIR (filestat.st_mode))
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
+    LOG (GNUNET_ERROR_TYPE_INFO,
          "A file already exits with the same name %s\n", fil);
     return GNUNET_NO;
   }
@@ -718,7 +721,10 @@ GNUNET_DISK_directory_create (const char *dir)
 
   rdir = GNUNET_STRINGS_filename_expand (dir);
   if (rdir == NULL)
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
+  }
 
   len = strlen (rdir);
 #ifndef MINGW
@@ -754,6 +760,9 @@ GNUNET_DISK_directory_create (const char *dir)
       ret = GNUNET_DISK_directory_test (rdir, GNUNET_NO);
       if (GNUNET_NO == ret)
       {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Creating directory `%s' failed",
+                    rdir);
         GNUNET_free (rdir);
         return GNUNET_SYSERR;
       }
@@ -778,6 +787,9 @@ GNUNET_DISK_directory_create (const char *dir)
       ret = GNUNET_DISK_directory_test (rdir, GNUNET_NO);
       if (GNUNET_NO == ret)
       {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Creating directory `%s' failed",
+                    rdir);
         GNUNET_free (rdir);
         return GNUNET_SYSERR;
       }
@@ -1035,7 +1047,8 @@ GNUNET_DISK_fn_read (const char *fn,
  */
 ssize_t
 GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle * h,
-                        const void *buffer, size_t n)
+                        const void *buffer,
+                       size_t n)
 {
   if (NULL == h)
   {
@@ -2669,28 +2682,19 @@ GNUNET_DISK_internal_file_handle_ (const struct GNUNET_DISK_FileHandle *fh,
 
 
 /**
- * Remove the directory given under @a option in
- * section [PATHS] in configuration under @a cfg_filename
+ * Helper function for #GNUNET_DISK_purge_cfg_dir.
  *
- * @param cfg_filename configuration file to parse
- * @param option option with the dir name to purge
+ * @param cls a `const char *` with the option to purge
+ * @param cfg our configuration
+ * @return #GNUNET_OK on success
  */
-void
-GNUNET_DISK_purge_cfg_dir (const char *cfg_filename,
-                           const char *option)
+static int
+purge_cfg_dir (void *cls,
+              const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  const char *option = cls;
   char *tmpname;
 
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_load (cfg,
-                                 cfg_filename))
-  {
-    GNUNET_break (0);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return;
-  }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
                                                "PATHS",
@@ -2700,10 +2704,8 @@ GNUNET_DISK_purge_cfg_dir (const char *cfg_filename,
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "PATHS",
                                option);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return;
+    return GNUNET_NO;
   }
-  GNUNET_CONFIGURATION_destroy (cfg);
   if (GNUNET_SYSERR ==
       GNUNET_DISK_directory_remove (tmpname))
   {
@@ -2711,11 +2713,29 @@ GNUNET_DISK_purge_cfg_dir (const char *cfg_filename,
                               "remove",
                               tmpname);
     GNUNET_free (tmpname);
-    return;
+    return GNUNET_OK;
   }
   GNUNET_free (tmpname);
+  return GNUNET_OK;
 }
 
 
+/**
+ * Remove the directory given under @a option in
+ * section [PATHS] in configuration under @a cfg_filename
+ *
+ * @param cfg_filename configuration file to parse
+ * @param option option with the dir name to purge
+ */
+void
+GNUNET_DISK_purge_cfg_dir (const char *cfg_filename,
+                           const char *option)
+{
+  GNUNET_break (GNUNET_OK ==
+               GNUNET_CONFIGURATION_parse_and_run (cfg_filename,
+                                                   &purge_cfg_dir,
+                                                   (void *) option));
+}
+
 
 /* end of disk.c */