Changeset 1185 in MondoRescue for trunk/mondo/src/common/libmondo-tools.c

Timestamp:

Feb 19, 2007, 1:51:26 AM (17 years ago)

Author:

Bruno Cornec

Message:

Merges in trunk modifications coming from stable (common)

File:

• trunk/mondo/src/common/libmondo-tools.c (modified) (29 diffs)

trunk/mondo/src/common/libmondo-tools.c

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 #include "mr_file.h"
 
@@ -24 +25 @@
 #include <arpa/inet.h>
 #endif
-#include "mr_mem.h"
 
 /*@unused@*/
@@ -199 +199 @@
 
 
-char *get_architecture()
+char *get_architecture(void)
 {
 #ifdef __IA32__
@@ -205 +205 @@
 #endif
 #ifdef __X86_64__
-    return ("x86-64");
+    return ("x86_64");
 #endif
 #ifdef __IA64__
@@ -215 +215 @@
 
 
-double get_kernel_version()
+double get_kernel_version(void)
 {
     char *p, *tmp;
@@ -242 +242 @@
 
 
-
-
-
 /**
  * Get the current time.
  * @return number of seconds since the epoch.
  */
-long get_time()
+long get_time(void)
 {
     return (long) time((void *) 0);
 }
-
-
-
-
-
 
 
@@ -298 +290 @@
 }
 #endif
-
-
 
 
@@ -354 +344 @@
     char *mondo_mkisofs_sz = NULL;
     char *command = NULL;
-    char *hostname = NULL, *ip_address = NULL;
+    char *hostname = NULL;
+    char *ip_address = NULL;
     int retval = 0;
     long avm = 0;
@@ -363 +354 @@
     char *call_before_iso_user = NULL;
     int rdsiz_MB;
+    char *iso_dev = NULL;
+    char *iso_mnt = NULL;
+    char *iso_tmp = NULL;
     char *iso_path = NULL;
     FILE *fd1 = NULL;
@@ -400 +394 @@
     avm += atol(tmp);
     mr_free(tmp);
-    tmp = call_program_and_get_last_line_of_output
+    tmp1 = call_program_and_get_last_line_of_output
              ("swapinfo | grep -v Device | tr -s ' ' | cut -d' ' -f4 | tr '\n' '+' | sed 's/+$//' | bc");
     avm += atol(tmp);
@@ -412 +406 @@
     mr_free(tmp);
     mr_asprintf(&command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
-             g_tmpfs_mountpt, rdsiz_MB, 'm');
+            g_tmpfs_mountpt, rdsiz_MB, 'm');
     run_program_and_log_output("cat /proc/cpuinfo", 5);
     /* BERLIOS: rpm is not necessarily there ! */
@@ -495 +489 @@
                 popup_and_OK("Fatal Error: Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
                 fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
-            }       
+            }
             mr_free(tmp);
             mr_free(command);
@@ -507 +501 @@
         || bkpinfo->backup_media_type == cdr) {
         if (!bkpinfo->manual_cd_tray) {
-            mr_asprintf(&extra_cdrom_params, "-waiti ");
+            mr_strcat(extra_cdrom_params, "-waiti ");
         }
         if (bkpinfo->backup_media_type == cdrw) {
-            if (extra_cdrom_params != NULL) {
-                mr_asprintf(&tmp, extra_cdrom_params);
-                mr_free(extra_cdrom_params);
-                mr_asprintf(&extra_cdrom_params, "%s blank=fast ", tmp);
-            } else {
-                mr_asprintf(&extra_cdrom_params, "blank=fast ");
-            }
+            mr_strcat(extra_cdrom_params, "blank=fast ");
         }
         tmp = find_home_of_exe("cdrecord");
@@ -600 +588 @@
 
         fd1 = mr_fopen(MONDORESTORECFG, "a");
-        mr_fprintf(fd1, "iso-dev %s\n", iso_dev);
+        mr_fprintf(fd1, "iso-dev=%s\n", iso_dev);
 
         mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
@@ -611 +599 @@
 
         log_it("res of it = %s", iso_mnt);
-        mr_fprintf(fd1, "iso-mnt %s\n", iso_mnt);
+        mr_fprintf(fd1, "iso-mnt=%s\n", iso_mnt);
         log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
 
@@ -617 +605 @@
         if (strlen(iso_tmp) >= strlen(iso_mnt)) {
             mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+        } else {
+            mr_asprintf(&iso_path, "");
         }
         mr_free(iso_tmp);
@@ -622 +612 @@
 
         log_it("isodir: %s", iso_path);
-        mr_fprintf(fd1, "isodir %s\n", iso_path);
+        mr_fprintf(fd1, "isodir=%s\n", iso_path);
         mr_free(iso_path);
 
         log_it("iso-prefix: %s",  bkpinfo->prefix);
-        mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
+        mr_fprintf(fd1, "iso-prefix=%s\n", bkpinfo->prefix);
 
         mr_fclose(fd1);
@@ -648 +638 @@
             } else {
                 mr_asprintf(&ip_address, "%s%s", inet_ntoa((struct in_addr)
-                                                        *((struct in_addr
-                                                           *) hent->
-                                                          h_addr)),
-                         strchr(bkpinfo->nfs_mount, ':'));
+                                                *((struct in_addr *) hent->h_addr)),
+                                                strchr(bkpinfo->nfs_mount, ':'));
                 mr_allocstr(bkpinfo->nfs_mount, ip_address);
                 mr_free(ip_address);
@@ -684 +672 @@
     return (retval);
 }
-
 
 
@@ -710 +697 @@
     }
 
-    unlink(MONDO_TRACEFILE);
     run_program_and_log_output("rm -Rf /tmp/changed.files*", FALSE);
     if ((g_mondo_home = find_and_store_mondoarchives_home()) == NULL) {
@@ -811 +797 @@
     char *command = NULL;
     char *out_sz = NULL;
-    long res;
+    long res = 0L;
 
     assert_string_is_neither_NULL_nor_zerolength(partition);
@@ -822 +808 @@
 
     mr_asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
-             partition);
+            partition);
     out_sz = call_program_and_get_last_line_of_output(command);
     mr_free(command);
+
     if (strlen(out_sz) == 0) {
         return (-1);
@@ -832 +819 @@
     return (res);
 }
-
 
 
@@ -1062 +1048 @@
         return (0);
     */ } else {
-        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
+        mr_asprintf(&command, "grep '%s .*' %s| cut -d'=' -f2,3,4,5",
                 label, config_file);
         value = call_program_and_get_last_line_of_output(command);
@@ -1110 +1096 @@
 void mount_boot_if_necessary()
 {
-    char *tmp;
-    char *tmp1;
-    char *command;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
 
     mr_msg(1, "Started sub");
@@ -1140 +1126 @@
                 mr_asprintf(&g_boot_mountpt, tmp);
                 mr_asprintf(&tmp1,
-                         "%s (your /boot partition) is not mounted. I'll mount it before backing up",
-                         g_boot_mountpt);
+                        "%s (your /boot partition) is not mounted. I'll mount it before backing up",
+                        g_boot_mountpt);
                 log_it(tmp1);
                 mr_free(tmp1);
@@ -1190 +1176 @@
 
 
-
 /**
  * Write a line to a configuration file. Writes a line of the form,
@@ -1202 +1187 @@
 {
     /*@ buffers ***************************************************** */
-    char *command;
-    char *tempfile;
-    char *tmp;
+    char *command = NULL;
+    char *tempfile = NULL;
+    char *tmp = NULL;
 
 
@@ -1238 +1223 @@
     return (0);
 }
+
 
 /**