Changeset 2376 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

Sep 9, 2009, 12:37:59 PM (16 years ago)

Author:

Bruno Cornec

Message:

• replace system("sync") by sync() calls

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-devices.c (modified) (2 diffs)
• libmondo-fifo.c (modified) (2 diffs)
• libmondo-stream.c (modified) (3 diffs)
• libmondo-verify.c (modified) (2 diffs)
• newt-specific.c (modified) (4 diffs)

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

@@ -1722 +1722 @@
                     ("Failed to write to disk. I shall blank it and then try again.");
                 sleep(5);
-                (void)system("sync");
+                sync();
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 

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

@@ -1350 +1350 @@
 
         while (what_number_cd_is_this() != cd_number_i_want) {
-            paranoid_system("sync");
+            sync();
             if (is_this_device_mounted(MNT_CDROM)) {
                 res =
@@ -1372 +1372 @@
                 inject_device(bkpinfo->media_device);
             }
-            paranoid_system("sync");
+            sync();
         }
         mr_free(request);

branches/2.2.10/mondo/src/common/libmondo-fifo.c

@@ -85 +85 @@
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
-    paranoid_system("sync");
+    sync();
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
@@ -162 +162 @@
         return;
     }
-    paranoid_system("sync");
+    sync();
     mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);

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

@@ -134 +134 @@
     }
     sleep(1);
-    paranoid_system("sync");
+    sync();
     sleep(1);
     paranoid_pclose(g_tape_stream);
@@ -173 +173 @@
 
     sleep(1);
-    paranoid_system("sync");
+    sync();
     sleep(1);
     log_it("closeout_tape() -- entering");
@@ -1467 +1467 @@
 
     paranoid_pclose(g_tape_stream);
-    system("sync");
-    system("sync");
-    system("sync");
+    sync();
+    sync();
+    sync();
     log_it("New tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too

branches/2.2.10/mondo/src/common/libmondo-verify.c

@@ -92 +92 @@
 
     mr_asprintf(afio_found_changes, "%s.afio", ignorefiles_fname);
-    paranoid_system("sync");
+    sync();
 
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
@@ -1177 +1177 @@
     retval += verify_biggiefiles_from_stream();
 /* find the final blocks */
-    paranoid_system("sync");
+    sync();
     sleep(2);
     closein_tape();

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -99 +99 @@
     long g_start_time = 0L;     ///< The time (in seconds since the epoch) that the progress form was opened.
     bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
-    char g_xmondo_stdin[MAX_NEWT_COMMENT_LEN],  ///< ... @bug Unneeded w/current XMondo.
-     g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
-    bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
     char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
-
-//int g_fd_in=-1, g_fd_out=-1;
 
     void popup_and_OK(char *);
@@ -130 +125 @@
         if (g_text_mode) {
             while (1) {
-                system("sync");
+                sync();
                 printf("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ", prompt);
                 mr_getline(tmp, stdin);
@@ -147 +142 @@
                     return (FALSE);
                 } else {
-                    system("sync");
+                    sync();
                     printf("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
                 }
@@ -172 +167 @@
 
         if (g_text_mode) {
-            system("sync");
+            sync();
             printf("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ", prompt);
             mr_getline(tmp, stdin);