Changeset 1934 in MondoRescue

Timestamp:

May 7, 2008, 3:08:46 PM (17 years ago)

Author:

Bruno Cornec

Message:

Handle part of #250

Location:

branches/2.2.6/mondo/src

Files:

• common/libmondo-devices.c (modified) (3 diffs)
• common/libmondo-stream.c (modified) (4 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.6/mondo/src/common/libmondo-devices.c

@@ -1661 +1661 @@
     bkpinfo->nonbootable_backup = FALSE;
 
-// Tape, CD, NFS, ...?
+    // Tape, CD, NFS, ...?
     srandom(getpid());
     bkpinfo->backup_media_type =
@@ -1670 +1670 @@
         finish(1);
     }
+    /* Why asking to remove the media with tape ?
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
         popup_and_OK("Please remove media from drive(s)");
     }
+    */
     log_msg(3, "media type = %s",
             bkptype_to_string(bkpinfo->backup_media_type));
@@ -1685 +1687 @@
     mvaddstr_and_log_it(2, 0, " ");
 
-// Find device's /dev (or SCSI) entry
+    // Find device's /dev (or SCSI) entry
     switch (bkpinfo->backup_media_type) {
     case cdr:

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -110 +110 @@
 
 #define EXTRA_TAPE_CHECKSUMS
+#define STR_HEADER  "Mondolicious, baby"
 
 /*@unused@*/
@@ -1144 +1145 @@
 /*  for(*plen=0,i=7;i>=0;i--) {*plen<<=8; *plen |= tempblock[7001+i];} */
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
-    if (strcmp(tempblock + 6000 + *pcontrol_char, "Mondolicious, baby")) {
+    if (strcmp(tempblock + 6000 + *pcontrol_char, STR_HEADER)) {
         log_it("Bad header block at %ld K", (long) g_tape_posK);
     }
@@ -1390 +1391 @@
 
     paranoid_pclose(g_tape_stream);
-    system("sync");
-    system("sync");
-    system("sync");
+    sync();
+    sync();
+    sync();
     log_it("Next tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment it, too
@@ -1744 +1745 @@
         tempblock[i] = 0;
     }
-    sprintf(tempblock + 6000 + control_char, "Mondolicious, baby");
+    sprintf(tempblock + 6000 + control_char, STR_HEADER);
     tempblock[7000] = control_char;
 /*  for(i=0;i<8;i++) {tempblock[7001+i]=olen&0xff; olen>>=8;} */

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

@@ -2403 +2403 @@
                         ("Please reinsert the disk/CD and try again.");
                 }
-                    /*
-            }
-                */
         }
     }