Changeset 3208 in MondoRescue

Timestamp:

Dec 10, 2013, 8:50:00 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix typos preventnig compilation !
• revert mr_getline modifications which where in fact incorrect
• initialize log earlier so all messages go indeed in it

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• lib/mr_mem.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (2 diffs)

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

@@ -780 +780 @@
         log_msg(1, "%ld: Unable to write one-liner bootloader.name", __LINE__);
     }
-    r_free(bootldr_str);
+    mr_free(bootldr_str);
     mr_free(tmp);
 

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

@@ -417 +417 @@
         mr_free(bkpinfo->netfs_user);
         mr_free(bkpinfo->netfs_proto);
-        mr_free(bkpinfo->netfs_remotedir);
+        mr_free(bkpinfo->netfs_remote_dir);
         mr_free(bkpinfo->exclude_devs);
         mr_free(bkpinfo->exclude_paths);

branches/3.2/mondo/src/lib/mr_mem.c

@@ -74 +74 @@
     size_t n = 0;
 
-    /*  We reached end of file, allocating empty string */
-    if (feof(fd)) {
-        mr_asprintf_int(lineptr, line, file, "");
-        return;
-    }
     ret = getline(lineptr,&n,fd);
-    if (ret == -1) {
+    if ((ret == -1) && (! feof(fd))) {
         mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_getline");
+    }
+    /*  We reached end of file, allocating empty string */
+    if (ret == -1) {
+        mr_asprintf_int(lineptr, line, file, "");
     }
 }

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -165 +165 @@
     FILE *fin = NULL;
 
-/* Make sure I'm root; abort if not */
+    /* Make sure I'm root; abort if not */
     if (getuid() != 0) {
         fprintf(stderr, "Please run as root.\r\n");
-        exit(127);
-    }
-
-/* If -V, -v or --version then echo version no. and quit */
+        finish(127);
+    }
+
+    /* If -V, -v or --version then echo version no. and quit */
     if (argc == 2 && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V") || !strcmp(argv[argc - 1], "--version"))) {
         printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
-        exit(0);
-    }
-
-/* Initialize variables */
-
-    printf("Initializing...\n");
-    if (!(bkpinfo = (struct s_bkpinfo *)malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
-    reset_bkpinfo();
-
-    /* Memory allocation is done in those functions */
-    malloc_libmondo_global_strings();
+        finish(0);
+    }
 
     /* initialize log file with time stamp */
     unlink(MONDO_LOGFILE);
     log_msg(0, "Time started: %s", mr_date());
+
+    /* Initialize variables */
+    if (!(bkpinfo = (struct s_bkpinfo *)malloc(sizeof(struct s_bkpinfo)))) {
+        fprintf(stderr, "Cannot malloc bkpinfo\n");
+        finish(-1);
+    }
+    log_msg(9, "reset_bkpinfo");
+    reset_bkpinfo();
+
+    /* Memory allocation is done in those functions */
+    malloc_libmondo_global_strings();
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
@@ -351 +351 @@
     }
 
-/* Finish configuring global structures */
+    /* Finish configuring global structures */
     if (post_param_configuration()) {
         fatal_error("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");