diff options
| -rw-r--r-- | cmds-subvolume.c | 9 | ||||
| -rw-r--r-- | utils.c | 12 | ||||
| -rw-r--r-- | utils.h | 1 |
3 files changed, 16 insertions, 6 deletions
diff --git a/cmds-subvolume.c b/cmds-subvolume.c index c5892847..29ded126 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -126,8 +126,7 @@ static int cmd_subvol_create(int argc, char **argv) dupdir = strdup(dst); dstdir = dirname(dupdir); - if (!strcmp(newname, ".") || !strcmp(newname, "..") || - strchr(newname, '/') ){ + if (!test_issubvolname(newname)) { fprintf(stderr, "ERROR: incorrect subvolume name '%s'\n", newname); goto out; @@ -301,8 +300,7 @@ again: vname = basename(dupvname); free(cpath); - if (!strcmp(vname, ".") || !strcmp(vname, "..") || - strchr(vname, '/')) { + if (!test_issubvolname(vname)) { fprintf(stderr, "ERROR: incorrect subvolume name '%s'\n", vname); ret = 1; @@ -672,8 +670,7 @@ static int cmd_snapshot(int argc, char **argv) dstdir = dirname(dupdir); } - if (!strcmp(newname, ".") || !strcmp(newname, "..") || - strchr(newname, '/') ){ + if (!test_issubvolname(newname)) { fprintf(stderr, "ERROR: incorrect snapshot name '%s'\n", newname); goto out; @@ -2405,3 +2405,15 @@ int test_minimum_size(const char *file, u32 leafsize) close(fd); return 0; } + +/* + * test if name is a correct subvolume name + * this function return + * 0-> name is not a correct subvolume name + * 1-> name is a correct subvolume name + */ +int test_issubvolname(const char *name) +{ + return name[0] != '\0' && !strchr(name, '/') && + strcmp(name, ".") && strcmp(name, ".."); +} @@ -116,6 +116,7 @@ int get_device_info(int fd, u64 devid, int test_uuid_unique(char *fs_uuid); int test_minimum_size(const char *file, u32 leafsize); +int test_issubvolname(const char *name); /* * Btrfs minimum size calculation is complicated, it should include at least: |