f2fs-tools: Fix various compilation warnings
Avoid various compilation warnings due to strncpy:
libf2fs.c:590:33: warning: ‘snprintf’ output may be truncated before
the last format character [-Wformat-truncation=]
snprintf(rootdev, ret, "/dev/%s", buf);
../include/f2fs_fs.h:1384:2: warning: ‘strncpy’ specified bound
depends on the length of the source argument [-Wstringop-overflow=]
strncpy(buf, features, strlen(features) + 1);
f2fstat.c:243:3: warning: ‘strncpy’ output truncated before
terminating nul copying as many bytes from a string as its length
[-Wstringop-truncation]
strncpy(ptr_buf, name[i], strlen(name[i]));
This patch does not change any functionality.
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index 8d1490c..02b500e 100644
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -1381,9 +1381,9 @@
{
char *buf, *sub, *next;
- buf = calloc(strlen(features) + 1, sizeof(char));
- ASSERT(buf);
- strncpy(buf, features, strlen(features) + 1);
+ buf = strdup(features);
+ if (!buf)
+ return -1;
for (sub = buf; sub && *sub; sub = next ? next + 1 : NULL) {
/* Skip the beginning blanks */
diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index c692bf2..60b84e0 100644
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -587,7 +587,7 @@
return NULL;
rootdev[ret] = '\0';
- snprintf(rootdev, ret, "/dev/%s", buf);
+ snprintf(rootdev, ret + 1, "/dev/%s", buf);
return rootdev;
#endif
}
diff --git a/tools/f2fstat.c b/tools/f2fstat.c
index e0b1677..5b4d683 100644
--- a/tools/f2fstat.c
+++ b/tools/f2fstat.c
@@ -240,7 +240,7 @@
for (i = 0; i < 20; i++) {
ptr = (i == 0) ? strtok(res, " ") : strtok(NULL, " ");
- strncpy(ptr_buf, name[i], strlen(name[i]));
+ strcpy(ptr_buf, name[i]);
if (i == 1) {
prev_index = ptr_buf - buf - 1;
} else if (i == 7) {
