Changeset 1136 in MondoRescue

Timestamp:

Feb 11, 2007, 2:20:53 PM (18 years ago)

Author:

Bruno Cornec

Message:

Typo + new libmondo-archive.c merges

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• lib/mr_file.c (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -1692 +1692 @@
 
 
-
-
 /**
  * Create an ISO image in @c destfile, from files in @c bkpinfo->scratchdir.
@@ -1772 +1770 @@
     mr_free(tmp3);
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
-        popup_and_OK("Please insert new media and press Enter.");
+        popup_and_OK(_("Please insert new media and press Enter."));
     }
 
     mr_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
             bkpinfo->scratchdir, destfile);
+    /* BERLIOS: Do not ignore getcwd result */
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
     sprintf(tmp, "chmod 744 %s", bkpinfo->scratchdir);
@@ -1836 +1835 @@
                     ("Failed to write to disk. I shall blank it and then try again.");
                 sleep(5);
-                system("sync");
+                sync();
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 
-// dvd+rw-format --- OPTION 2
+                // dvd+rw-format --- OPTION 2
                 if (!bkpinfo->please_dont_eject) {
                     log_to_screen("Ejecting media to clear drive status.");
@@ -2029 +2028 @@
 
 
-
-
-
-
-
-
-
 bool is_dev_an_NTFS_dev(char *bigfile_fname)
 {
@@ -2041 +2033 @@
     char *command;
     malloc_string(tmp);
+
     malloc_string(command);
     sprintf(command,

branches/stable/mondo/src/lib/mr_file.c

@@ -47 +47 @@
 void mr_fclose_int(FILE **fd, int line, char *file) {
 
-    if (**fd == NULL) {
+    if (fd == NULL) {
         mr_msg_int(1,line,file,"fd is NULL.\nShould NOT happen.");
         mr_exit(-1,"Exiting");