Changeset 3194 in MondoRescue for branches/3.2/mondo/src/common/libmondo-tools.c

Timestamp:

Sep 29, 2013, 7:27:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix all compilation/link error due to the previous giant merge with 3.1. 3.2 is ready to test

File:

• branches/3.2/mondo/src/common/libmondo-tools.c (modified) (8 diffs)

branches/3.2/mondo/src/common/libmondo-tools.c

@@ -34 +34 @@
 extern int g_current_media_number;
 extern char *MONDO_LOGFILE;
-extern char *g_serial_string;
 
 /* Reference to global bkpinfo */
@@ -61 +60 @@
  * The serial string (used to differentiate between backups) of the current backup.
  */
-char *g_serial_string = NULL;
+extern char *g_serial_string;
 
 /**
@@ -359 +358 @@
     char *cdr_exe = NULL;
     char *tmp = NULL;
-    char *p = NULL;
     char *call_before_iso_user = NULL;
     char *iso_dev = NULL;
@@ -633 +631 @@
                 mr_asprintf(ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
                 mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
-                strcpy(bkpinfo->netfs_mount, ip_address);
-                mr_free(ip_address);
+                mr_free(bkpinfo->netfs_mount);
+                bkpinfo->netfs_mount = ip_address;
             }
         }
@@ -801 +799 @@
 void reset_bkpinfo()
 {
-    int i;
     log_msg(1, "Initializing bkpinfo");
 
@@ -824 +821 @@
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
     
-/*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir = NULL;         // Really setup after
+    /*  We need tmpdir as early as possible for further function calls */
+    bkpinfo->tmpdir[0]= '\0';           // Really setup after
+    bkpinfo->scratchdir[0]= '\0';           // Really setup after
     setup_tmpdir(NULL);
     setup_scratchdir(NULL);
@@ -848 +846 @@
     bkpinfo->call_after_iso[0] = '\0';
     bkpinfo->kernel_path[0] = '\0';
-    bkpinfo->netfs_mount[0] = '\0';
+    bkpinfo->netfs_mount = NULL;
     bkpinfo->netfs_proto = NULL;
     bkpinfo->netfs_user = NULL;
-    bkpinfo->netfs_remote_dir[0] = '\0';
+    bkpinfo->netfs_remote_dir = NULL;
     bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->subdir = NULL;
@@ -1365 +1363 @@
  * Function pointer to the @c log_debug_msg function to use. Points to standard_log_debug_msg() by default.
  */
-void (*log_debug_msg) (int, const char *, const char *, int, const char *,
-                       ...) = standard_log_debug_msg;
+void (*log_debug_msg) (int, const char *, const char *, int, const char *, ...) = standard_log_debug_msg;