From 266f413a32d774c68f41f488bb79fac6ad63e930 Mon Sep 17 00:00:00 2001 From: Peter Stuge Date: Fri, 25 Nov 2011 01:03:57 +0100 Subject: [PATCH 22/35] restore: Split output directory and btrfs-local path search_dir() parameters search_dir() recurses down the btrfs tree, and used to take the output path for every item (i.e. in the running system, output root directory concatenated with btrfs-local pathname) passed as the only path parameter. Moving the output root directory to a separate parameter and passing the btrfs-local pathname for each file and directory separately allows easy filtering based on the btrfs-local pathname. Signed-off-by: Peter Stuge Signed-off-by: Josef Bacik --- restore.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/restore.c b/restore.c index 389b107..0b92ed5 100644 --- a/restore.c +++ b/restore.c @@ -35,6 +35,7 @@ #include "volumes.h" #include "utils.h" +static char fs_name[4096]; static char path_name[4096]; static int get_snaps = 0; static int verbose = 0; @@ -450,7 +451,7 @@ set_size: } static int search_dir(struct btrfs_root *root, struct btrfs_key *key, - const char *dir) + const char *output_rootdir, const char *dir) { struct btrfs_path *path; struct extent_buffer *leaf; @@ -554,8 +555,11 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, type = btrfs_dir_type(leaf, dir_item); btrfs_dir_item_key_to_cpu(leaf, dir_item, &location); - snprintf(path_name, 4096, "%s/%s", dir, filename); + /* full path from root of btrfs being restored */ + snprintf(fs_name, 4096, "%s/%s", dir, filename); + /* full path from system root */ + snprintf(path_name, 4096, "%s%s", output_rootdir, fs_name); /* * At this point we're only going to restore directories and @@ -603,7 +607,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, } } else if (type == BTRFS_FT_DIR) { struct btrfs_root *search_root = root; - char *dir = strdup(path_name); + char *dir = strdup(fs_name); if (!dir) { fprintf(stderr, "Ran out of memory\n"); @@ -664,7 +668,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, return -1; } loops = 0; - ret = search_dir(search_root, &location, dir); + ret = search_dir(search_root, &location, + output_rootdir, dir); free(dir); if (ret) { if (ignore_errors) @@ -901,7 +906,7 @@ int main(int argc, char **argv) key.objectid = BTRFS_FIRST_FREE_OBJECTID; } - ret = search_dir(root, &key, dir_name); + ret = search_dir(root, &key, dir_name, ""); out: close_ctree(root); -- 1.7.6.233.gd79bc