Changeset 1170 in MondoRescue for branches/stable/mondo

Timestamp:

Feb 15, 2007, 1:07:22 AM (18 years ago)

Author:

Bruno Cornec

Message:

Includes are now also taken temporarily in common (to allow for ../common removal in files which is a bad practice)

Location:

branches/stable/mondo/src

Files:

• mondoarchive/Makefile.am (modified) (1 diff)
• mondorestore/Makefile.am (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (4 diffs)
• mondorestore/mondo-restore.c (modified) (1 diff)

branches/stable/mondo/src/mondoarchive/Makefile.am

@@ -4 +4 @@
 ## Process with Automake to generate Makefile.in
 ##
-AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include -I${top_builddir}/src/common
 
 ## Headers

branches/stable/mondo/src/mondorestore/Makefile.am

@@ -4 +4 @@
 ## Process with Automake to generate Makefile.in
 ##
-AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include -I${top_builddir}/src/common
 
 ## Headers

branches/stable/mondo/src/mondorestore/mondo-prep.c

@@ -588 +588 @@
   }
   // create device list from normal disks followed by spare ones
-  asprintf(&devices, raidlist->el[i].data_disks.el[0].device);
+  mr_asprintf(&devices, raidlist->el[i].data_disks.el[0].device);
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
-    asprintf(&strtmp, "%s", devices);
+    mr_asprintf(&strtmp, "%s", devices);
     mr_free(devices);
-    asprintf(&devices, "%s %s", strtmp,
+    mr_asprintf(&devices, "%s %s", strtmp,
          raidlist->el[i].data_disks.el[j].device);
     mr_free(strtmp);
   }
   for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
-    asprintf(&strtmp, "%s", devices);
+    mr_asprintf(&strtmp, "%s", devices);
     mr_free(devices);
-    asprintf(&devices, "%s %s", strtmp,
+    mr_asprintf(&devices, "%s %s", strtmp,
          raidlist->el[i].spare_disks.el[j].device);
     mr_free(strtmp);
@@ -605 +605 @@
   // translate RAID level
   if (raidlist->el[i].raid_level == -2) {
-    asprintf(&level, "multipath");
+    mr_asprintf(&level, "multipath");
   } else if (raidlist->el[i].raid_level == -1) {
-    asprintf(&level, "linear");
+    mr_asprintf(&level, "linear");
   } else {
-    asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+    mr_asprintf(&level, "raid%d", raidlist->el[i].raid_level);
   }
   // create RAID device:
@@ -616 +616 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  asprintf(&program,
+  mr_asprintf(&program,
        "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d",
        raidlist->el[i].raid_device, level,
        raidlist->el[i].data_disks.entries);
   if (raidlist->el[i].parity != -1) {
-    asprintf(&strtmp, "%s", program);
+    mr_asprintf(&strtmp, "%s", program);
     mr_free(program);
     switch(raidlist->el[i].parity) {
     case 0:
-      asprintf(&program, "%s --parity=%s", strtmp, "la");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "la");
       break;
     case 1:
-      asprintf(&program, "%s --parity=%s", strtmp, "ra");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "ra");
       break;
     case 2:
-      asprintf(&program, "%s --parity=%s", strtmp, "ls");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "ls");
       break;
     case 3:
-      asprintf(&program, "%s --parity=%s", strtmp, "rs");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "rs");
       break;
     default:
@@ -643 +643 @@
   }
   if (raidlist->el[i].chunk_size != -1) {
-    asprintf(&strtmp, "%s", program);
+    mr_asprintf(&strtmp, "%s", program);
     mr_free(program);
-    asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
+    mr_asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
     mr_free(strtmp);
   }
   if (raidlist->el[i].spare_disks.entries > 0) {
-    asprintf(&strtmp, "%s", program);
+    mr_asprintf(&strtmp, "%s", program);
     mr_free(program);
-    asprintf(&program, "%s --spare-devices=%d", strtmp,
+    mr_asprintf(&program, "%s --spare-devices=%d", strtmp,
          raidlist->el[i].spare_disks.entries);
     mr_free(strtmp);
   }
-  asprintf(&strtmp, "%s", program);
+  mr_asprintf(&strtmp, "%s", program);
   mr_free(program);
-  asprintf(&program, "%s %s", strtmp, devices);
+  mr_asprintf(&program, "%s %s", strtmp, devices);
   mr_free(strtmp);
   res = run_program_and_log_output(program, 1);

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -1580 +1580 @@
 restore_a_tarball_from_CD(char *tarball_fname,
                           long current_tarball_number,
-                          struct s_node *filelist, struct s_bkpinfo *)
+                          struct s_node *filelist, struct s_bkpinfo *bkpinfo)
 {
     int retval = 0;