btrfs-progs: fix error checking in load_device_info

[platform/upstream/btrfs-progs.git] / cmds-restore.c

diff --git a/cmds-restore.c b/cmds-restore.c
index d7a3bb0..8fc8b2a 100644 (file)
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -1386,19 +1386,19 @@ const char * const cmd_restore_usage[] = {
        "btrfs restore [options] <device> <path> | -l <device>",
        "Try to restore files from a damaged filesystem (unmounted)",
        "",
-       "-s                   get snapshots",
-       "-x                   get extended attributes",
+       "-s|--snapshots       get snapshots",
+       "-x|--xattr           get extended attributes",
        "-m|--metadata        restore owner, mode and times",
-       "-S|--symlinks        restore symbolic links"
-       "-v                   verbose",
-       "-i                   ignore errors",
-       "-o                   overwrite",
+       "-S|--symlinks        restore symbolic links",
+       "-v|--verbose         verbose",
+       "-i|--ignore-errors   ignore errors",
+       "-o|--overwrite       overwrite",
        "-t <bytenr>          tree location",
        "-f <bytenr>          filesystem location",
-       "-u <mirror>          super mirror",
-       "-r <rootid>          root objectid",
+       "-u|--super <mirror>  super mirror",
+       "-r|--root <rootid>   root objectid",
        "-d                   find dir",
-       "-l                   list tree roots",
+       "-l|--list-roots      list tree roots",
        "-D|--dry-run         dry run (only list files that would be recovered)",
        "--path-regex <regex>",
        "                     restore only filenames matching regex,",
@@ -1433,6 +1433,14 @@ int cmd_restore(int argc, char **argv)
                        { "dry-run", no_argument, NULL, 'D'},
                        { "metadata", no_argument, NULL, 'm'},
                        { "symlinks", no_argument, NULL, 'S'},
+                       { "snapshots", no_argument, NULL, 's'},
+                       { "xattr", no_argument, NULL, 'x'},
+                       { "verbose", no_argument, NULL, 'v'},
+                       { "ignore-errors", no_argument, NULL, 'i'},
+                       { "overwrite", no_argument, NULL, 'o'},
+                       { "super", required_argument, NULL, 'u'},
+                       { "root", required_argument, NULL, 'r'},
+                       { "list-roots", no_argument, NULL, 'l'},
                        { NULL, 0, NULL, 0}
                };