Changeset 783 in MondoRescue for trunk/mondo/mondo/common/libmondo-fork.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/common/libmondo-fork.c (modified) (11 diffs)

trunk/mondo/mondo/common/libmondo-fork.c

@@ -11 +11 @@
 #include "libmondo-tools-EXT.h"
 
-extern char *g_tmpfs_mountpt;
-extern t_bkptype g_backup_media_type;
 extern bool g_text_mode;
 pid_t g_buffer_pid = 0;
@@ -107 +105 @@
     log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
-    strcpy(tmp, command);
     if (bkpinfo->manual_cd_tray) {
-        p = strstr(tmp, "2>>");
+        /* Find everything after a 2>> and remove it */
+        p = strstr(command, "2>>");
         if (p) {
-            sprintf(p, "   ");
-            while (*p == ' ') {
-                p++;
-            }
-            for (; *p != ' '; p++) {
+            for (; *p != ' ' && *p != '\0'; p++) {
                 *p = ' ';
             }
         }
-        paranoid_free(command);
-        asprintf(&command, tmp);
 #ifndef _XWIN
         if (!g_text_mode) {
@@ -164 +156 @@
 {
     /*@ buffer ****************************************************** */
-    char *callstr;
+    char *callstr = NULL;
     char *incoming = NULL;
-    char tmp[MAX_STR_LEN * 2];
 
     /*@ int ********************************************************* */
-    int res;
-    int i;
+    int res = 0;
     size_t n = 0;
-    int len;
     bool log_if_failure = FALSE;
     bool log_if_success = FALSE;
@@ -203 +192 @@
 
 
-    len = (int) strlen(program);
-    for (i = 0; i < 35 - len / 2; i++) {
-        tmp[i] = '-';
-    }
-    tmp[i] = '\0';
-    strcat(tmp, " ");
-    strcat(tmp, program);
-    strcat(tmp, " ");
-    for (i = 0; i < 35 - len / 2; i++) {
-        strcat(tmp, "-");
-    }
     res = system(callstr);
     if (((res == 0) && log_if_success) || ((res != 0) && log_if_failure)) {
@@ -361 +339 @@
 // if dir=='w' then copy from orig to archived
 // if dir=='r' then copy from archived to orig
-    char *tmp;
-    char *buf;
+    char *tmp = NULL;
+    char *buf = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
     int retval = 0;
-    FILE *fin;
-    FILE *fout;
-    FILE *ftmp;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
+    FILE *ftmp = NULL;
 
     log_msg(5, "Opening.");
@@ -439 +417 @@
             }
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Cannot read post-thingy block");
             }
@@ -448 +426 @@
             log_msg(7, "Subslice #%ld read OK", subsliceno);
             subsliceno++;
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Cannot read introductory block");
             }
@@ -458 +436 @@
 
     if (direction == 'w') {
+        paranoid_free(tmp);
         asprintf(&tmp, "%-64s", PIMP_END_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
+        if (fwrite(tmp, 1, 64L, fout) != 64L) {
             fatal_error("Can't write the final block");
         }
@@ -466 +445 @@
         log_msg(1, "tmpA is %s", tmp);
         if (!strstr(tmp, PIMP_END_SZ)) {
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Can't read the final block");
             }
@@ -472 +451 @@
             if (!strstr(tmp, PIMP_END_SZ)) {
                 ftmp = fopen("/tmp/out.leftover", "w");
-                bytes_read_in = fread(tmp, 1, 64, fin);
+                bytes_read_in = fread(tmp, 1, 64L, fin);
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
 //      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
                 fwrite(tmp, 1, bytes_read_in, ftmp);
+                
                 paranoid_free(tmp);
-                
                 if (!(tmp = malloc(512))) {
                     fatal_error("Failed to malloc() tmp");
                 }
                 /* BERLIOS : strange ???
-                sprintf(tmp, "I am here - %llu", ftello(fin));
-      log_msg(0, tmp);
-*/
+                s-printf(tmp, "I am here - %llu", ftello(fin));
+                log_msg(0, tmp);
+                */
                 fread(tmp, 1, 512, fin);
                 log_msg(0, "tmp = '%s'", tmp);
@@ -571 +550 @@
         if (pcno <= 5 && last_pcno > 40) {
             close_evalcall_form();
-            open_evalcall_form("_(Verifying..."));
+            open_evalcall_form("_(Verifying...");
         }
         last_pcno = pcno;