Changeset 948 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Nov 19, 2006, 1:27:46 AM (17 years ago)

Author:

Bruno Cornec

Message:

• mondoarchive does not backup acl+xattr by default anymore
• Add -z option to mondoarchive to support acl+xattr backup
• small mindi fix
• this may break mondo compatibility so tests are required before distributing that version.
• this is still incomplete as that aprameter should be passed for mondorestore to know what to do.

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (10 diffs)

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

@@ -234 +234 @@
 extern bool g_cd_recovery;
 extern char *g_serial_string;
+
+extern char *g_getfacl;
+extern char *g_getfattr;
+
+
 
 /**
@@ -1112 +1117 @@
     char *archiving_filelist_fname;
     char *archiving_afioball_fname;
-    char *curr_xattr_list_fname;
+    char *curr_xattr_list_fname = NULL;
     char *curr_acl_list_fname;
 
@@ -1185 +1190 @@
         log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
-        sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+        if (g_getfattr) {
+            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, archiving_set_no);
-        sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+            get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
+        }
+        if (g_getfacl) {
+            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, archiving_set_no);
-        get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
-        get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
+            get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
+        }
 
         log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
@@ -1589 +1598 @@
     int noof_threads;
     int i;
-    char *curr_xattr_list_fname;
+    char *curr_xattr_list_fname = NULL;
     char *curr_acl_list_fname;
     int misc_counter_that_is_not_important = 0;
@@ -1676 +1685 @@
             sprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
                     bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
-            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+            if (g_getfattr) {
+                sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                     bkpinfo->tmpdir, storing_set_no);
-            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+            }
+            if (g_getfacl) {
+                sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                     bkpinfo->tmpdir, storing_set_no);
+            }
 
             log_msg(2, "Storing set %d", storing_set_no);
@@ -1707 +1720 @@
                                          NULL);
             } else {
-                res =
-                    move_files_to_cd(bkpinfo, storing_filelist_fname,
+                if (g_getfacl) {
+                    if (g_getfattr) {
+                        res = move_files_to_cd(bkpinfo, storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
                                      storing_afioball_fname, NULL);
+                    } else {
+                        res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                                    curr_acl_list_fname,
+                                    storing_afioball_fname, NULL);
+                    }
+                } else {
+                    if (g_getfattr) {
+                            res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                                    curr_xattr_list_fname,
+                                    storing_afioball_fname, NULL);
+                    } else {
+                            res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                                    storing_afioball_fname, NULL);
+                    }
+                }
             }
             retval += res;
@@ -2370 +2399 @@
 
         log_msg(1, "EXAT'g set %ld", curr_set_no);
-        sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+        if (g_getfattr) {
+            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, curr_set_no);
-        sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+            get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
+        }
+        if (g_getfacl) {
+            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, curr_set_no);
-        get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
-        get_acl_list(curr_filelist_fname, curr_acl_list_fname);
+            get_acl_list(curr_filelist_fname, curr_acl_list_fname);
+        }
 
         log_msg(1, "Archiving set %ld", curr_set_no);
@@ -2404 +2437 @@
             res = move_files_to_stream(bkpinfo, curr_afioball_fname, NULL);
         } else {
-            res =
-                move_files_to_cd(bkpinfo, curr_filelist_fname,
-                                 curr_xattr_list_fname,
-                                 curr_acl_list_fname, curr_afioball_fname,
-                                 NULL);
+                if (g_getfacl) {
+                    if (g_getfattr) {
+                        res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                                     curr_xattr_list_fname,
+                                     curr_acl_list_fname,
+                                     curr_afioball_fname, NULL);
+                    } else {
+                        res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                                    curr_acl_list_fname,
+                                    curr_afioball_fname, NULL);
+                    }
+                } else {
+                    if (g_getfattr) {
+                            res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                                    curr_xattr_list_fname,
+                                    curr_afioball_fname, NULL);
+                    } else {
+                            res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                                    curr_afioball_fname, NULL);
+                    }
+                }
         }
         retval += res;
@@ -2520 +2569 @@
                         "Archiving large files to media           ");
     sprintf(biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
-    sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    if (g_getfattr) {
+        sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    if (g_getfacl) {
+        sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
 
     sprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
@@ -2533 +2586 @@
     }
 
-    get_fattr_list(biggielist, xattr_fname);
-    get_acl_list(biggielist, acl_fname);
-    sprintf(command, "cp %s %s/archives/", xattr_fname,
+    if (g_getfattr) {
+        get_fattr_list(biggielist, xattr_fname);
+        sprintf(command, "cp %s %s/archives/", xattr_fname,
             bkpinfo->scratchdir);
-    paranoid_system(command);
-    sprintf(command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
-    paranoid_system(command);
+        paranoid_system(command);
+    }
+    if (g_getfacl) {
+        get_acl_list(biggielist, acl_fname);
+        sprintf(command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
+        paranoid_system(command);
+    }
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {