@@ -51,7 +51,6 @@ static char fs_name[PATH_MAX];
static char path_name[PATH_MAX];
static char symlink_target[PATH_MAX];
static int get_snaps = 0;
-static int verbose = 0;
static int restore_metadata = 0;
static int restore_symlinks = 0;
static int ignore_errors = 0;
@@ -375,8 +374,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
if (compress == BTRFS_COMPRESS_NONE)
bytenr += offset;
- if (verbose && offset)
- printf("offset is %Lu\n", offset);
+ pr_verbose(offset ? 1 : 0, "offset is %Lu\n", offset);
/* we found a hole */
if (disk_size == 0)
return 0;
@@ -832,11 +830,13 @@ static int overwrite_ok(const char * path)
if (overwrite)
return 2;
- if (verbose || !warn)
- printf("Skipping existing file"
- " %s\n", path);
- if (!warn)
+ if (!warn) {
+ printf("Skipping existing file %s\n", path);
printf("If you wish to overwrite use -o\n");
+ } else {
+ pr_verbose(1, "Skipping existing file %s\n", path);
+ }
+
warn = 1;
return 0;
}
@@ -987,9 +987,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
leaf = path.nodes[0];
while (!leaf) {
- if (verbose > 1)
- printf("No leaf after search, looking for the next "
- "leaf\n");
+ pr_verbose(2,
+ "No leaf after search, looking for the next leaf\n");
ret = next_leaf(root, &path);
if (ret < 0) {
fprintf(stderr, "Error getting next leaf %d\n",
@@ -997,9 +996,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
goto out;
} else if (ret > 0) {
/* No more leaves to search */
- if (verbose)
- printf("Reached the end of the tree looking "
- "for the directory\n");
+ pr_verbose(1,
+ "Reached the end of the tree looking for the directory\n");
ret = 0;
goto out;
}
@@ -1023,10 +1021,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
goto out;
} else if (ret > 0) {
/* No more leaves to search */
- if (verbose)
- printf("Reached the end of "
- "the tree searching the"
- " directory\n");
+ pr_verbose(1,
+ "Reached the end of the tree searching the directory\n");
ret = 0;
goto out;
}
@@ -1036,14 +1032,12 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
}
btrfs_item_key_to_cpu(leaf, &found_key, path.slots[0]);
if (found_key.objectid != key->objectid) {
- if (verbose > 1)
- printf("Found objectid=%Lu, key=%Lu\n",
- found_key.objectid, key->objectid);
+ pr_verbose(2, "Found objectid=%Lu, key=%Lu\n",
+ found_key.objectid, key->objectid);
break;
}
if (found_key.type != key->type) {
- if (verbose > 1)
- printf("Found type=%u, want=%u\n",
+ pr_verbose(2, "Found type=%u, want=%u\n",
found_key.type, key->type);
break;
}
@@ -1072,8 +1066,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
if (!overwrite_ok(path_name))
goto next;
- if (verbose)
- printf("Restoring %s\n", path_name);
+ pr_verbose(1, "Restoring %s\n", path_name);
if (dry_run)
goto next;
fd = open(path_name, O_CREAT|O_WRONLY, 0644);
@@ -1145,8 +1138,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
location.objectid = BTRFS_FIRST_FREE_OBJECTID;
}
- if (verbose)
- printf("Restoring %s\n", path_name);
+ pr_verbose(1, "Restoring %s\n", path_name);
errno = 0;
if (dry_run)
@@ -1209,8 +1201,7 @@ next:
}
}
- if (verbose)
- printf("Done searching %s\n", in_dir);
+ pr_verbose(1, "Done searching %s\n", in_dir);
out:
btrfs_release_path(&path);
return ret;
@@ -1420,6 +1411,8 @@ static const char * const cmd_restore_usage[] = {
" you have to use following syntax (possibly quoted):",
" ^/(|home(|/username(|/Desktop(|/.*))))$",
"-c ignore case (--path-regex only)",
+ HELPINFO_GLOBAL_OPTIONS_HEADER,
+ HELPINFO_INSERT_VERBOSE,
NULL
};
@@ -1441,6 +1434,10 @@ static int cmd_restore(const struct cmd_struct *cmd, int argc, char **argv)
regex_t match_reg, *mreg = NULL;
char reg_err[256];
+ /* Init global verbose if unset */
+ if (bconf.verbose < 0)
+ bconf.verbose = 0;
+
optind = 0;
while (1) {
int opt;
@@ -1472,7 +1469,7 @@ static int cmd_restore(const struct cmd_struct *cmd, int argc, char **argv)
get_snaps = 1;
break;
case 'v':
- verbose++;
+ bconf.verbose++;
break;
case 'i':
ignore_errors = 1;
Transpire global --verbose option down to the btrfs restore sub-command. Suggested-by: David Sterba <dsterba@suse.com> Signed-off-by: Anand Jain <anand.jain@oracle.com> --- cmds/restore.c | 55 ++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 29 deletions(-)