Changeset 3185 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (12 diffs)

branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -330 +330 @@
                 if (HDD) {
                     /*  We need an additional param */
-                    mr_asprintf(&(bkpinfo->subdir), "%s", bkpinfo->isodir);
+                    mr_asprintf(bkpinfo->subdir, "%s", bkpinfo->isodir);
                     strcpy(bkpinfo->isodir, "/tmp/isodir");
                     log_it("Now bkpinfo->isodir = %s and subdir = ", bkpinfo->isodir, bkpinfo->subdir);
@@ -383 +383 @@
     log_to_screen("WARNING - isodir is already mounted");
 } else {
-    mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
+    mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
     if (strlen(g_isodir_format) > 1) {
         mr_strcat(mount_isodir_command, " -t %s", g_isodir_format);
@@ -478 +478 @@
     log_msg(1, tmp);
     /* Deal with additional params only if not /proc or /sys */
-    mr_asprintf(&additional_parameters, "");
+    mr_asprintf(additional_parameters, "");
     if (strcmp(format, "proc") && strcmp(format, "sys")) {
         if (writeable) {
@@ -586 +586 @@
                "", mountlist->entries);
 
-    mr_asprintf(&these_failed, "");
+    mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
@@ -766 +766 @@
     bkpinfo->please_dont_eject = TRUE;
     if (read_cfg_var(cfg_file, "netfs-proto", value) == 0) {
-        mr_asprintf(&(bkpinfo->netfs_proto),"%s", value);
+        mr_asprintf(bkpinfo->netfs_proto,"%s", value);
     } else {
         /* For compatibility, force protocol in old nfs case to be transparent */
-        mr_asprintf(&(bkpinfo->netfs_proto), "nfs");
+        mr_asprintf(bkpinfo->netfs_proto, "nfs");
     }
     if (read_cfg_var(cfg_file, "netfs-server-user", value) == 0) {
-        mr_asprintf(&(bkpinfo->netfs_user),"%s", value);
+        mr_asprintf(bkpinfo->netfs_user,"%s", value);
     }
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
@@ -851 +851 @@
 read_cfg_var(cfg_file, "acl", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfacl,"setfacl");
+    mr_asprintf(g_getfacl,"setfacl");
     log_msg(1, "We will restore ACLs");
     if (! find_home_of_exe("setfacl")) {
@@ -859 +859 @@
 read_cfg_var(cfg_file, "xattr", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfattr,"setfattr");
+    mr_asprintf(g_getfattr,"setfattr");
     log_msg(1, "We will restore XATTRs");
     if (! find_home_of_exe("setfattr")) {
@@ -1370 +1370 @@
      * the current /dev location 
      */
-    mr_asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    mr_asprintf(cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
     run_program_and_log_output(cmd, 3);
     paranoid_free(cmd);
@@ -1385 +1385 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
+    mr_asprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
     log_msg(2, tmp);
     paranoid_free(tmp);
@@ -1402 +1402 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        mr_asprintf(&tmp, "boot0cfg -B %s", device);
+        mr_asprintf(tmp, "boot0cfg -B %s", device);
         res = run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     } else {
-        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        mr_asprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             paranoid_free(tmp);
-            mr_asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            mr_asprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
@@ -2056 +2056 @@
     paranoid_system("sync");
 
-    mr_asprintf(&tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
+    mr_asprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
     if (run_program_and_log_output(tmp, FALSE)) {
         log_msg(1,
@@ -2075 +2075 @@
             continue;
         }
-        mr_asprintf(&tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+        mr_asprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
 
         update_progress_form(tmp);