Changeset 2338 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Aug 21, 2009, 1:47:12 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds LZMA support (Fix #309)
• Change

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (4 diffs)

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

@@ -422 +422 @@
     char *command = NULL;
     /*@ pointers **************************************************** */
-    char *p;
+    char *p = NULL;
 
     /*@ int's ******************************************************* */
-    int i;
-
-    for (i = NOOF_ERR_LINES - 1;
-         i >= 0 && !strstr(err_log_lines[i], "% Done")
-         && !strstr(err_log_lines[i], "% done"); i--);
+    int i = 0;
+
+    for (i = NOOF_ERR_LINES - 1; i >= 0 && !strstr(err_log_lines[i], "% Done") && !strstr(err_log_lines[i], "% done"); i--);
     if (i < 0) {
         mr_asprintf(command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
@@ -445 +443 @@
     if (p) {
         *p = '\0';
-    }
-    if (!p) {
+    } else {
         mr_free(lastline);
         return (0);
     }
-    *p = '\0';
-    for (p--; *p != ' ' && p != lastline; p--);
+
+    for (p--; isdigit(p) && p != lastline; p--);
     if (p != lastline) {
         p++;
     }
+    i = atoi(p);
     mr_free(lastline);
-
-    i = atoi(p);
     return (i);
 }
@@ -1214 +1210 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->image_devs
  * - @c bkpinfo->media_size
  * - @c bkpinfo->optimal_set_size
@@ -1245 +1240 @@
         scratchLL = (scratchLL * 2) / 3;
     } else if (bkpinfo->use_gzip) {
+        scratchLL = (scratchLL * 2) / 3;
+    } else if (bkpinfo->use_lzma) {
         scratchLL = (scratchLL * 2) / 3;
     } else {