Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (7 diffs)

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

@@ -107 +107 @@
 * @ingroup restoreUtilityGroup
 */
-void ask_about_these_imagedevs(char *infname, char *outfname)
-{
+void ask_about_these_imagedevs(char *infname, char *outfname) {
+
 FILE *fin;
 FILE *fout;
-/************************************************************************
-* allocate memory regions. test and set  -sab 16 feb 2003              *
-************************************************************************/
-char *incoming_ptr;
-char *question_ptr = NULL;
-
-char incoming[MAX_STR_LEN] = "\0";
+char *incoming = NULL;
+char *question = NULL;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
 assert_string_is_neither_NULL_nor_zerolength(outfname);
 
-incoming_ptr = malloc(sizeof(incoming));
-if (incoming_ptr == NULL) {
-fprintf(stderr, "Out of Memory\n");
-exit(EXIT_FAILURE);
-}
-
-memset(incoming_ptr, '\0', sizeof(incoming));
-
 if (!(fin = fopen(infname, "r"))) {
-fatal_error("Cannot openin infname");
+    fatal_error("Cannot openin infname");
 }
 if (!(fout = fopen(outfname, "w"))) {
-fatal_error("Cannot openin outfname");
-}
-for (fgets(incoming_ptr, MAX_STR_LEN, fin);
- !feof(fin); fgets(incoming_ptr, MAX_STR_LEN, fin)) {
-strip_spaces(incoming_ptr);
-
-if (incoming[0] == '\0') {
-    continue;
-}
-
-mr_asprintf(question_ptr, "Should I restore the image of %s ?", incoming_ptr);
-
-if (ask_me_yes_or_no(question_ptr)) {
-    fprintf(fout, "%s\n", incoming_ptr);
-}
-}
-
-/*** free memory ***********/
-paranoid_free(incoming_ptr);
-incoming_ptr = NULL;
-mr_free(question_ptr);
+    fatal_error("Cannot openin outfname");
+}
+for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+    mr_strip_spaces(incoming);
+
+    if (incoming[0] == '\0') {
+        mr_free(incoming);
+        continue;
+    }
+
+    mr_asprintf(question, "Should I restore the image of %s ?", incoming);
+    
+    if (ask_me_yes_or_no(question)) {
+        fprintf(fout, "%s\n", incoming);
+    }
+    mr_free(incoming);
+}
+mr_free(incoming);
+mr_free(question);
 paranoid_fclose(fout);
 paranoid_fclose(fin);
@@ -619 +604 @@
         mr_free(bkpinfo->media_device);
         if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+            bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
         } else {
             bkpinfo->media_device = find_cdrom_device(TRUE);
@@ -1119 +1104 @@
 char *command = NULL;
 char *tmp;
+char *tmp1 = NULL;
 int res = 0;
 pid_t pid;
@@ -1260 +1246 @@
     if (g_text_mode) {
         printf("Restore which directory? --> ");
-        fgets(tmp, sizeof(tmp), stdin);
-        toggle_path_selection(filelist, tmp, TRUE);
-        if (strlen(tmp) == 0) {
+        mr_getline(tmp1, stdin);
+        toggle_path_selection(filelist, tmp1, TRUE);
+        if (strlen(tmp1) == 0) {
             res = 1;
         } else {
             res = 0;
         }
+        mr_free(tmp1);
     } else {
         res = edit_filelist(filelist);
@@ -1938 +1925 @@
     FILE *fin;
     FILE *fout;
-  /** malloc **/
-    char *incoming;
+    char *incoming = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
     assert_string_is_neither_NULL_nor_zerolength(input_file);
-    malloc_string(incoming);
 
     if (!(fin = fopen(input_file, "r"))) {
@@ -1952 +1937 @@
         fatal_error("cannot open output_file");
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         if (strncmp(incoming, "etc/adjtime", 11)
             && strncmp(incoming, "etc/mtab", 8)
@@ -1962 +1946 @@
             && strncmp(incoming, "var/", 4))
             fprintf(fout, "%s", incoming);  /* don't need \n here, for some reason.. */
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(incoming);
 }