diff options
author | Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> | 2014-08-01 11:58:00 +0900 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-08-22 15:07:04 +0200 |
commit | c2d83207bf964e6c0624ce870a01ac1b13ab165b (patch) | |
tree | 709a053bf9a72c423f37ed09dbd122d0476acf51 | |
parent | 91b33340576e9c59353a89f0edb7b72a5a60ad3f (diff) |
btrfs-progs: move test_isdir() to utils.c
Since test_isdir() is a utility function, it's better to
move it to utils.c. In addition, "const char *" is
more appropriate type as its "path" argument because
this argument is not changed in this function.
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Cc: David Sterba <dsterba@suse.cz>
Cc: Mike Fleetwood <mike.fleetwood@googlemail.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r-- | cmds-subvolume.c | 19 | ||||
-rw-r--r-- | utils.c | 19 | ||||
-rw-r--r-- | utils.h | 1 |
3 files changed, 20 insertions, 19 deletions
diff --git a/cmds-subvolume.c b/cmds-subvolume.c index 29ded126..0d4a52ea 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -41,25 +41,6 @@ static const char * const subvolume_cmd_group_usage[] = { NULL }; -/* - * test if path is a directory - * this function return - * 0-> path exists but it is not a directory - * 1-> path exists and it is a directory - * -1 -> path is unaccessible - */ -static int test_isdir(char *path) -{ - struct stat st; - int res; - - res = stat(path, &st); - if(res < 0 ) - return -1; - - return S_ISDIR(st.st_mode); -} - static const char * const cmd_subvol_create_usage[] = { "btrfs subvolume create [-i <qgroupid>] [<dest>/]<name>", "Create a subvolume", @@ -2417,3 +2417,22 @@ int test_issubvolname(const char *name) return name[0] != '\0' && !strchr(name, '/') && strcmp(name, ".") && strcmp(name, ".."); } + +/* + * test if path is a directory + * this function return + * 0-> path exists but it is not a directory + * 1-> path exists and it is a directory + * -1 -> path is unaccessible + */ +int test_isdir(const char *path) +{ + struct stat st; + int ret; + + ret = stat(path, &st); + if(ret < 0 ) + return -1; + + return S_ISDIR(st.st_mode); +} @@ -117,6 +117,7 @@ int test_uuid_unique(char *fs_uuid); int test_minimum_size(const char *file, u32 leafsize); int test_issubvolname(const char *name); +int test_isdir(const char *path); /* * Btrfs minimum size calculation is complicated, it should include at least: |