summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQu Wenruo <quwenruo@cn.fujitsu.com>2015-01-05 14:24:27 +0800
committerDavid Sterba <dsterba@suse.cz>2015-01-09 18:34:10 +0100
commit73cc83d08e9413c33d21aece1f5d2425b3c3099d (patch)
tree9586eb30359f48e0a52222e5ba45498e68df0211
parent1f7ea87871d9bd743d31618f96e1a3f2dd5bde91 (diff)
downloadbtrfs-progs-73cc83d08e9413c33d21aece1f5d2425b3c3099d.tar.gz
btrfs-progs: Allow debug-tree to be executed on regular file.
The commit 1bad43fbe002 ("btrfs-progs: refine btrfs-debug-tree error prompt when a mount point given") add judgement on btrfs-debug-tree to restrict only block device to be executed on, but the command can also be used on regular file, so add regular file support for the judgement. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r--btrfs-debug-tree.c5
-rw-r--r--utils.c21
-rw-r--r--utils.h1
3 files changed, 21 insertions, 6 deletions
diff --git a/btrfs-debug-tree.c b/btrfs-debug-tree.c
index 9cdb35f..0815fe1 100644
--- a/btrfs-debug-tree.c
+++ b/btrfs-debug-tree.c
@@ -180,8 +180,9 @@ int main(int ac, char **av)
print_usage();
ret = check_arg_type(av[optind]);
- if (ret != BTRFS_ARG_BLKDEV) {
- fprintf(stderr, "'%s' is not a block device\n", av[optind]);
+ if (ret != BTRFS_ARG_BLKDEV && ret != BTRFS_ARG_REG) {
+ fprintf(stderr, "'%s' is not a block device or regular file\n",
+ av[optind]);
exit(1);
}
diff --git a/utils.c b/utils.c
index effacd1..868b15e 100644
--- a/utils.c
+++ b/utils.c
@@ -854,13 +854,23 @@ int is_mount_point(const char *path)
return ret;
}
+static int is_reg_file(const char *path)
+{
+ struct stat statbuf;
+
+ if (stat(path, &statbuf) < 0)
+ return -errno;
+ return S_ISREG(statbuf.st_mode);
+}
+
/*
* This function checks if the given input parameter is
* an uuid or a path
- * return -1: some error in the given input
- * return 0: unknow input
- * return 1: given input is uuid
- * return 2: given input is path
+ * return <0 : some error in the given input
+ * return BTRFS_ARG_UNKNOWN: unknown input
+ * return BTRFS_ARG_UUID: given input is uuid
+ * return BTRFS_ARG_MNTPOINT: given input is path
+ * return BTRFS_ARG_REG: given input is regular file
*/
int check_arg_type(const char *input)
{
@@ -877,6 +887,9 @@ int check_arg_type(const char *input)
if (is_mount_point(path) == 1)
return BTRFS_ARG_MNTPOINT;
+ if (is_reg_file(path))
+ return BTRFS_ARG_REG;
+
return BTRFS_ARG_UNKNOWN;
}
diff --git a/utils.h b/utils.h
index 3950491..142f3f9 100644
--- a/utils.h
+++ b/utils.h
@@ -35,6 +35,7 @@
#define BTRFS_ARG_MNTPOINT 1
#define BTRFS_ARG_UUID 2
#define BTRFS_ARG_BLKDEV 3
+#define BTRFS_ARG_REG 4
#define BTRFS_UUID_UNPARSED_SIZE 37