btrfs-progs: introduce test_issubvolname() for simplicity

PATCH Superseded Satoru Takeuchi 2 participants 2 messages Jul 30, 2014 Btrfs file system

lore

Share & tools

lore

Satoru Takeuchi

author

2014-07-30 03:25 UTC #0 lore raw

PATCH v2 1/1 btrfs-progs: introduce test_issubvolname() for simplicity

From: Satoru Takeuchi <[email protected]>

There are many duplicated codes to check if the given string is correct subvolume name. Introduce test_issubvolname() for this purpose for simplicity.

Signed-off-by Satoru Takeuchi <[email protected]>

Cc David Sterba <[email protected]>

---
changelog:
v2: Move test_issubvolname() to utils.c.
Change the target branch to integ-20140729.

---
 cmds-subvolume.c |  9 +++------
 utils.c          | 12 ++++++++++++
 utils.h          |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

cmds-subvolume.c +3 -6

index 8bdc447..c075fb2 100644
@@ -127,8 +127,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;

@@ -302,8 +301,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;

@@ -711,8 +709,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;

utils.c +12 -0

index d61cbec..e2a2acd 100644
@@ -2685,3 +2685,15 @@ int btrfs_read_sysfs(char path[PATH_MAX])
 	close(fd);
 	return atoi((const char *)&val);
 }
+
+/*
+ * 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(char *name)
+{
+	return name[0] != '\0' && !strchr(name, '/') &&
+		strcmp(name, ".") && strcmp(name, "..");
+}

utils.h +1 -0

index 0c9b65f..d635c84 100644
@@ -133,6 +133,7 @@ int get_fslist(struct btrfs_ioctl_fslist **out_fslist, u64 *out_count);
 int fsid_to_mntpt(__u8 *fsid, char *mntpt, int *mnt_cnt);
 
 int test_minimum_size(const char *file, u32 leafsize);
+int test_issubvolname(char *name);
 
 /*
  * Btrfs minimum size calculation is complicated, it should include at least:

Signature · 1 line

1.9.3

Mike Fleetwood

2014-07-30 07:19 UTC #1 lore raw

Quoted 59 lines · Satoru Takeuchi

From: Satoru Takeuchi <[email protected]>

There are many duplicated codes to check if the given string is correct subvolume name. Introduce test_issubvolname() for this purpose for simplicity.

Signed-off-by Satoru Takeuchi <[email protected]>

Cc David Sterba <[email protected]>

---
changelog:
v2: Move test_issubvolname() to utils.c.
Change the target branch to integ-20140729.

---
 cmds-subvolume.c |  9 +++------
 utils.c          | 12 ++++++++++++
 utils.h          |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

cmds-subvolume.c +3 -6

index 8bdc447..c075fb2 100644
@@ -127,8 +127,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;

@@ -302,8 +301,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;

@@ -711,8 +709,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;

utils.c +0 -0

index d61cbec..e2a2acd 100644
@@ -2685,3 +2685,15 @@ int btrfs_read_sysfs(char path[PATH_MAX])
        close(fd);

utils.c int btrfs_read_sysfs(char path[PATH_MAX]) · line 2695

Quoted 10 lines

utils.c +8 -0

        return atoi((const char *)&val);
 }
+
+/*
+ * 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(char *name)

(const char *name) please. The string is not modified by the function.

utils.h int get_fslist(struct btrfs_ioctl_fslist **out_fslist, u64 *out_count); · line 136

Quoted 13 lines

utils.c +4 -0

+{
+       return name[0] != '\0' && !strchr(name, '/') &&
+               strcmp(name, ".") && strcmp(name, "..");
+}

utils.h +1 -0

index 0c9b65f..d635c84 100644
@@ -133,6 +133,7 @@ int get_fslist(struct btrfs_ioctl_fslist **out_fslist, u64 *out_count);
 int fsid_to_mntpt(__u8 *fsid, char *mntpt, int *mnt_cnt);
 
 int test_minimum_size(const char *file, u32 leafsize);
+int test_issubvolname(char *name);

And in the prototype to match.

Quoted 5 lines

utils.h +0 -1

 /*
  * Btrfs minimum size calculation is complicated, it should include at least:
--

1.9.3

Thanks,
Mike