Changeset 3060 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondorestore.c

Timestamp:

Nov 10, 2012, 5:05:37 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5035@localhost: bruno | 2012-11-09 03:17:01 +0100

• Fix a compilation error and most compilation warnings

File:

• branches/3.0/mondo/src/mondorestore/mondorestore.c (modified) (17 diffs)

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -767 +767 @@
     int retval = 0;
     int res = 0;
-    bool boot_loader_installed = FALSE;
   /** malloc **/
     char tmp[MAX_STR_LEN];
@@ -846 +845 @@
                 log_to_screen("Preparing to format your disk(s)");
                 sleep(1);
-                system("sync");
+                paranoid_system("sync");
                 log_to_screen("Please wait. This may take a few minutes.");
                 res += format_everything(mountlist, FALSE, raidlist);
@@ -881 +880 @@
         log_msg(1,
                 "Great! Boot loader was installed. No need for msg at end.");
-        boot_loader_installed = TRUE;
     }
     clean_blkid();
@@ -919 +917 @@
     }
     g_I_have_just_nuked = TRUE;
-/*
-  if (!boot_loader_installed && !does_file_exist(DO_MBR_PLEASE))
-    {
-      log_to_screen("PLEASE RUN 'mondorestore --mbr' NOW TO INITIALIZE YOUR BOOT SECTOR");
-      write_one_liner_data_file(DO_MBR_PLEASE, "mondorestore --mbr");
-    }
-*/
     return (retval);
 }
@@ -1063 +1054 @@
         *ntfsprog_command, *suffix, *sz_devfile;
     char *bigblk;
-    char *p;
     char *mds = NULL;
     int retval = 0;
@@ -1116 +1106 @@
                 bigfileno + 1);
         log_msg(3, tmp);
-        p = checksum;
     }
 
@@ -1344 +1333 @@
 
     if (strcmp(outfile_fname, "/dev/null")) {
-        chown(outfile_fname, biggiestruct.properties.st_uid,
-              biggiestruct.properties.st_gid);
+        if (chown(outfile_fname, biggiestruct.properties.st_uid,
+              biggiestruct.properties.st_gid)) {
+            // FIXME
+        }
         chmod(outfile_fname, biggiestruct.properties.st_mode);
         ubuf->actime = biggiestruct.properties.st_atime;
@@ -1615 +1606 @@
     if (strcmp(outfile_fname, "/dev/null")) {
         chmod(outfile_fname, biggiestruct.properties.st_mode);
-        chown(outfile_fname, biggiestruct.properties.st_uid,
-              biggiestruct.properties.st_gid);
+        if (chown(outfile_fname, biggiestruct.properties.st_uid,
+              biggiestruct.properties.st_gid)) {
+            // FIXME
+        }
         ubuf->actime = biggiestruct.properties.st_atime;
         ubuf->modtime = biggiestruct.properties.st_mtime;
@@ -1831 +1824 @@
         if (retval) {
             mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
-            system(command);
+            paranoid_system(command);
             paranoid_free(command);
 
@@ -2580 +2573 @@
     max_val = atol(tmp) + 1;
 
-    chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+    if (chdir(bkpinfo->restore_path)) { /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+        //FIXME
+    }
 
     run_program_and_log_output("pwd", 5);
@@ -2708 +2703 @@
     log_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
-    getcwd(cwd, MAX_STR_LEN - 1);
+    if (getcwd(cwd, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
     log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
-    chdir(bkpinfo->restore_path);
-    getcwd(newpath, MAX_STR_LEN - 1);
+    if (chdir(bkpinfo->restore_path)) {
+        //FIXME
+    }
+    if (getcwd(newpath, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     log_msg(1, "path is now %s", newpath);
     log_msg(1, "restoring everything");
@@ -2745 +2746 @@
         resB = restore_all_biggiefiles_from_CD(filelist);
     }
-    chdir(cwd);
+    if (chdir(cwd)) {
+        //FIXME
+    }
     if (resA + resB) {
         log_to_screen("Errors occurred while data was being restored.");
@@ -2936 +2939 @@
     if (argc == 2 && strcmp(argv[1], "--edit-mountlist") == 0) {
 #ifdef __FreeBSD__
-        system("mv -f /tmp/raidconf.txt /etc/raidtab");
+        paranoid_system("mv -f /tmp/raidconf.txt /etc/raidtab");
         if (!does_file_exist("/etc/raidtab"))
-            system("vinum printconfig > /etc/raidtab");
+            paranoid_system("vinum printconfig > /etc/raidtab");
 #endif
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
@@ -2946 +2949 @@
         res = let_user_edit_the_mountlist(mountlist, raidlist);
 #ifdef __FreeBSD__
-        system("mv -f /etc/raidtab /tmp/raidconf.txt");
+        paranoid_system("mv -f /etc/raidtab /tmp/raidconf.txt");
 #endif
         paranoid_MR_finish(res);
@@ -2959 +2962 @@
     if (argc >= 2 && strcmp(argv[1], "--pih") == 0) {
         if (system("mount | grep cdrom 2> /dev/null > /dev/null")) {
-            system("mount " MNT_CDROM);
+            paranoid_system("mount " MNT_CDROM);
         }
         bkpinfo->compression_level = 1;
@@ -2969 +2972 @@
                            "Please wait. This may take some time.",
                            "", 1999);
-        system("rm -Rf /tmp/*pih*");
+        paranoid_system("rm -Rf /tmp/*pih*");
 
         restore_a_biggiefile_from_CD(42, NULL, tmp);
@@ -3269 +3272 @@
     if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
         sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
-        system(tmp);
+        paranoid_system(tmp);
     }
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo