path: root/cmds-filesystem.c
diff options
authorEric Sandeen <>2013-01-25 13:27:47 -0600
committerZach Brown <>2013-02-05 16:09:41 -0800
commitbcb2b73358f1c05e6b5c48cfd19e3762cc69c677 (patch)
tree0527a68a1c20f3777f1c5f3559e29c424fb4dde4 /cmds-filesystem.c
parent7ced17b07f9524c999395240458a46e403036d6b (diff)
btrfs-progs: simplify ioctl name copy and null termination
In the places where we copy a string into the name member of btrfs_ioctl_vol_args or btrfs_ioctl_vol_args_v2, we use strncopy (to not overflow the name array) and then set the last position to the null character. Howver, in both cases the arrays are defined with: char name[MAX+1]; hence the last array position is name[MAX]. In most cases, we now insert the null at name[MAX-1] which deprives us of one useful character. Even the above isn't consistent through the code, so make some helper code to make it simple, i.e. strncpy_null(dest, src) which automatically does the right thing based on the size of dest. Thanks to Zach Brown for the macro suggestion. Signed-off-by: Eric Sandeen <>
Diffstat (limited to 'cmds-filesystem.c')
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 045c896f..295592b0 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -478,8 +478,7 @@ static int cmd_resize(int argc, char **argv)
printf("Resize '%s' of '%s'\n", path, amount);
- strncpy(, amount, BTRFS_PATH_NAME_MAX);
+ strncpy_null(, amount);
res = ioctl(fd, BTRFS_IOC_RESIZE, &args);
e = errno;