#include <regex.h>
#include <getopt.h>
#include <sys/types.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
#include "ctree.h"
#include "disk-io.h"
static int ignore_errors = 0;
static int overwrite = 0;
static int get_xattrs = 0;
+static int dry_run = 0;
#define LZO_LEN 4
#define PAGE_CACHE_SIZE 4096
while (tot_in < tot_len) {
in_len = read_compress_length(inbuf);
+
+ if ((tot_in + LZO_LEN + in_len) > tot_len) {
+ fprintf(stderr, "bad compress length %lu\n",
+ (unsigned long)in_len);
+ return -1;
+ }
+
inbuf += LZO_LEN;
tot_in += LZO_LEN;
fi = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_file_extent_item);
ptr = btrfs_file_extent_inline_start(fi);
- len = btrfs_file_extent_inline_item_len(leaf,
- btrfs_item_nr(path->slots[0]));
+ len = btrfs_file_extent_inline_len(leaf, path->slots[0], fi);
read_extent_buffer(leaf, buf, ptr, len);
compress = btrfs_file_extent_compression(leaf, fi);
ram_size = btrfs_file_extent_ram_bytes(leaf, fi);
offset = btrfs_file_extent_offset(leaf, fi);
num_bytes = btrfs_file_extent_num_bytes(leaf, fi);
- size_left = num_bytes;
- bytenr += offset;
+ size_left = disk_size;
+ if (compress == BTRFS_COMPRESS_NONE)
+ bytenr += offset;
if (offset)
printf("offset is %Lu\n", offset);
goto out;
}
- ret = decompress(inbuf, outbuf, num_bytes, &ram_size, compress);
+ ret = decompress(inbuf, outbuf, disk_size, &ram_size, compress);
if (ret) {
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
bytenr, length);
goto again;
}
- while (total < ram_size) {
- done = pwrite(fd, outbuf+total, ram_size-total, pos+total);
+ while (total < num_bytes) {
+ done = pwrite(fd, outbuf + offset + total,
+ num_bytes - total,
+ pos + total);
if (done < 0) {
ret = -1;
goto out;
return ret;
}
-static int ask_to_continue(const char *file)
+enum loop_response {
+ LOOP_STOP,
+ LOOP_CONTINUE,
+ LOOP_DONTASK
+};
+
+static enum loop_response ask_to_continue(const char *file)
{
char buf[2];
char *ret;
printf("We seem to be looping a lot on %s, do you want to keep going "
- "on ? (y/N): ", file);
+ "on ? (y/N/a): ", file);
again:
ret = fgets(buf, 2, stdin);
if (*ret == '\n' || tolower(*ret) == 'n')
- return 1;
+ return LOOP_STOP;
+ if (tolower(*ret) == 'a')
+ return LOOP_DONTASK;
if (tolower(*ret) != 'y') {
- printf("Please enter either 'y' or 'n': ");
+ printf("Please enter one of 'y', 'n', or 'a': ");
goto again;
}
- return 0;
+ return LOOP_CONTINUE;
}
}
while (1) {
- if (loops++ >= 1024) {
- ret = ask_to_continue(file);
- if (ret)
+ if (loops >= 0 && loops++ >= 1024) {
+ enum loop_response resp;
+
+ resp = ask_to_continue(file);
+ if (resp == LOOP_STOP)
break;
- loops = 0;
+ else if (resp == LOOP_CONTINUE)
+ loops = 0;
+ else if (resp == LOOP_DONTASK)
+ loops = -1;
}
if (path->slots[0] >= btrfs_header_nritems(leaf)) {
do {
}
if (verbose)
printf("Restoring %s\n", path_name);
+ if (dry_run)
+ goto next;
fd = open(path_name, O_CREAT|O_WRONLY, 0644);
if (fd < 0) {
fprintf(stderr, "Error creating %s: %d\n",
printf("Restoring %s\n", path_name);
errno = 0;
- ret = mkdir(path_name, 0755);
+ if (dry_run)
+ ret = 0;
+ else
+ ret = mkdir(path_name, 0755);
if (ret && errno != EEXIST) {
free(dir);
fprintf(stderr, "Error mkdiring %s: %d\n",
for (i = super_mirror; i < BTRFS_SUPER_MIRROR_MAX; i++) {
bytenr = btrfs_sb_offset(i);
- fs_info = open_ctree_fs_info(dev, bytenr, root_location, 0, 1);
+ fs_info = open_ctree_fs_info(dev, bytenr, root_location,
+ OPEN_CTREE_PARTIAL);
if (fs_info)
break;
fprintf(stderr, "Could not open root, trying backup super\n");
static struct option long_options[] = {
{ "path-regex", 1, NULL, 256},
+ { "dry-run", 0, NULL, 'D'},
{ NULL, 0, NULL, 0}
};
"-v verbose",
"-i ignore errors",
"-o overwrite",
- "-t <location> tree location",
- "-f <offset> filesystem location",
- "-u <block> super mirror",
- "-r <rootid> root objectid",
+ "-t <bytenr> tree location",
+ "-f <bytenr> filesystem location",
+ "-u <mirror> super mirror",
+ "-r <rootid> root objectid",
"-d find dir",
"-l list tree roots",
+ "-D|--dry-run dry run (only list files that would be recovered)",
"--path-regex <regex>",
" restore only filenames matching regex,",
" you have to use following syntax (possibly quoted):",
" ^/(|home(|/username(|/Desktop(|/.*))))$",
+ "-c ignore case (--path-regrex only)",
NULL
};
regex_t match_reg, *mreg = NULL;
char reg_err[256];
- while ((opt = getopt_long(argc, argv, "sxviot:u:df:r:lc", long_options,
+ while ((opt = getopt_long(argc, argv, "sxviot:u:df:r:lDc", long_options,
&option_index)) != -1) {
switch (opt) {
overwrite = 1;
break;
case 't':
- errno = 0;
- tree_location = (u64)strtoll(optarg, NULL, 10);
- if (errno != 0) {
- fprintf(stderr, "Tree location not valid\n");
- exit(1);
- }
+ tree_location = arg_strtou64(optarg);
break;
case 'f':
- errno = 0;
- fs_location = (u64)strtoll(optarg, NULL, 10);
- if (errno != 0) {
- fprintf(stderr, "Fs location not valid\n");
- exit(1);
- }
+ fs_location = arg_strtou64(optarg);
break;
case 'u':
- errno = 0;
- super_mirror = (int)strtol(optarg, NULL, 10);
- if (errno != 0 ||
- super_mirror >= BTRFS_SUPER_MIRROR_MAX) {
+ super_mirror = arg_strtou64(optarg);
+ if (super_mirror >= BTRFS_SUPER_MIRROR_MAX) {
fprintf(stderr, "Super mirror not "
"valid\n");
exit(1);
find_dir = 1;
break;
case 'r':
- errno = 0;
- root_objectid = (u64)strtoll(optarg, NULL, 10);
- if (errno != 0) {
- fprintf(stderr, "Root objectid not valid\n");
+ root_objectid = arg_strtou64(optarg);
+ if (!is_fstree(root_objectid)) {
+ fprintf(stderr, "objectid %llu is not a valid fs/file tree\n",
+ root_objectid);
exit(1);
}
break;
case 'l':
list_roots = 1;
break;
+ case 'D':
+ dry_run = 1;
+ break;
case 'c':
match_cflags |= REG_ICASE;
break;
}
}
- if (!list_roots && optind + 1 >= argc)
+ set_argv0(argv);
+ if (!list_roots && check_argc_min(argc - optind, 2))
usage(cmd_restore_usage);
- else if (list_roots && optind >= argc)
+ else if (list_roots && check_argc_min(argc - optind, 1))
usage(cmd_restore_usage);
+ if (fs_location && root_objectid) {
+ fprintf(stderr, "don't use -f and -r at the same time.\n");
+ return 1;
+ }
+
if ((ret = check_mounted(argv[optind])) < 0) {
fprintf(stderr, "Could not check mount status: %s\n",
strerror(-ret));
root->node = read_tree_block(root, fs_location, root->leafsize, 0);
if (!root->node) {
fprintf(stderr, "Failed to read fs location\n");
+ ret = 1;
goto out;
}
}
key.offset = (u64)-1;
root = btrfs_read_fs_root(orig_root->fs_info, &key);
if (IS_ERR(root)) {
- fprintf(stderr, "Error reading root\n");
+ fprintf(stderr, "fail to read root %llu: %s\n",
+ root_objectid, strerror(-PTR_ERR(root)));
root = orig_root;
ret = 1;
goto out;
mreg = &match_reg;
}
+ if (dry_run)
+ printf("This is a dry-run, no files are going to be restored\n");
+
ret = search_dir(root, &key, dir_name, "", mreg);
out:
projects / platform / upstream / btrfs-progs.git / blobdiff