Changeset 300 in MondoRescue for trunk/mondo/mondo/common/libmondo-archive.c

Timestamp:

Jan 11, 2006, 2:20:38 PM (18 years ago)

Author:

bcornec

Message:

merge -r295:299 $SVN_M/branches/2.06

File:

• trunk/mondo/mondo/common/libmondo-archive.c (modified) (12 diffs)

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

@@ -1968 +1968 @@
     char *bigfile_fname = NULL;
     char *sz_devfile;
-    char *partimagehack_fifo = NULL;
+    char *ntfsprog_fifo = NULL;
     /*@ long *********************************************** */
     long biggie_file_number = 0;
@@ -1981 +1981 @@
     FILE *ftmp = NULL;
     bool delete_when_done;
-    bool use_partimagehack;
+    bool use_ntfsprog;
     /*@ long long ****************************************** */
     long long biggie_fsize;
@@ -2015 +2015 @@
     for (getline(&bigfile_fname, &n, fin); !feof(fin);
          getline(&bigfile_fname, &n, fin), biggie_file_number++) {
-        use_partimagehack = FALSE;
+        use_ntfsprog = FALSE;
         if (bigfile_fname[strlen(bigfile_fname) - 1] < 32) {
             bigfile_fname[strlen(bigfile_fname) - 1] = '\0';
@@ -2029 +2029 @@
             delete_when_done = TRUE;
         } else {
-            // Call partimagehack if it's a /dev entry (i.e. a partition to be imaged)
+            // Call ntfsclone (formerly partimagehack) if it's a /dev entry (i.e. a partition to be imaged)
             log_msg(2, "bigfile_fname = %s", bigfile_fname);
-            use_partimagehack = FALSE;
+            use_ntfsprog = FALSE;
             if (!strncmp(bigfile_fname, "/dev/", 5)
                 && is_dev_an_NTFS_dev(bigfile_fname)) {
-                use_partimagehack = TRUE;
+                use_ntfsprog = TRUE;
                 log_msg(2,
-                        "Calling partimagehack in background because %s is an NTFS partition",
+                        "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
                 asprintf(&sz_devfile, "/tmp/%d.%d.000",
@@ -2042 +2042 @@
                          (int) (random() % 32768));
                 mkfifo(sz_devfile, 0x770);
-                partimagehack_fifo = sz_devfile;
+                ntfsprog_fifo = sz_devfile;
                 switch (pid = fork()) {
                 case -1:
@@ -2048 +2048 @@
                 case 0:
                     log_msg(2,
-                            "CHILD - fip - calling feed_into_partimage(%s, %s)",
+                            "CHILD - fip - calling feed_into_ntfsprog(%s, %s)",
                             bigfile_fname, sz_devfile);
-                    res = feed_into_partimage(bigfile_fname, sz_devfile);
+                    res = feed_into_ntfsprog(bigfile_fname, sz_devfile);
                     exit(res);
                     break;
                 default:
                     log_msg(2,
-                            "feed_into_partimage() called in background --- pid=%ld",
+                            "feed_into_ntfsprog() called in background --- pid=%ld",
                             (long int) (pid));
 
@@ -2063 +2063 @@
             // Otherwise, use good old 'dd' and 'bzip2'
             else {
-                partimagehack_fifo = NULL;
+                ntfsprog_fifo = NULL;
             }
 
@@ -2072 +2072 @@
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 write_header_block_to_stream(biggie_fsize, bigfile_fname,
-                                             use_partimagehack ?
+                                             use_ntfsprog ?
                                              BLK_START_A_PIHBIGGIE :
                                              BLK_START_A_NORMBIGGIE);
             }
-            res = slice_up_file_etc(bkpinfo, bigfile_fname,
-                                    partimagehack_fifo, biggie_file_number,
-                                    noof_biggie_files, use_partimagehack);
+            res =
+                slice_up_file_etc(bkpinfo, bigfile_fname,
+                                  ntfsprog_fifo, biggie_file_number,
+                                  noof_biggie_files, use_ntfsprog);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 tmp = calc_checksum_of_file(bigfile_fname);
@@ -2996 +2997 @@
  *
  * @param biggie_filename The file to chop up.
- * @param partimagehack_fifo The FIFO to partimagehack if this is an imagedev, NULL otherwise.
+ * @param ntfsprog_fifo The FIFO to ntfsclone if this is an imagedev, NULL otherwise.
  * @param biggie_file_number The sequence number of this biggie file (starting from 0).
  * @param noof_biggie_files The number of biggie files there are total.
@@ -3005 +3006 @@
 int
 slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
-                  char *partimagehack_fifo, long biggie_file_number,
-                  long noof_biggie_files, bool use_partimagehack)
+                  char *ntfsprog_fifo, long biggie_file_number,
+                  long noof_biggie_files, bool use_ntfsprog)
 {
 
@@ -3049 +3050 @@
 
     biggiestruct.for_backward_compatibility = '\n';
-    biggiestruct.use_partimagehack = use_partimagehack;
+    biggiestruct.use_ntfsprog = use_ntfsprog;
     optimal_set_size = bkpinfo->optimal_set_size;
     if (is_this_file_compressed(biggie_filename)
@@ -3064 +3065 @@
         fatal_error("bkpinfo->optimal_set_size is insanely small");
     }
-    if (partimagehack_fifo) {
-        file_to_openin = partimagehack_fifo;
+    if (ntfsprog_fifo) {
+        file_to_openin = ntfsprog_fifo;
         asprintf(&checksum_line, "IGNORE");
         log_msg(2,
                 "Not calculating checksum for %s: it would take too long",
                 biggie_filename);
-        totallength = get_phys_size_of_drive(biggie_filename)*1024*1024LL;
+        if ( !find_home_of_exe("ntfsresize")) {
+            fatal_error("ntfsresize not found");
+        }
+        sprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
+        log_it("command = %s", command);
+        strcpy (tmp, call_program_and_get_last_line_of_output(command));
+        log_it("res of it = %s", tmp); 
+        totallength = atoll(tmp);
     } else {
         file_to_openin = biggie_filename;