From: Sheng Yong <shengyong1@huawei.com>
To: chao2.yu@samsung.com, jaegeuk@kernel.org
Cc: linux-f2fs-devel@lists.sourceforge.net
Subject: [RFC PATCH V2 2/2] mkfs.f2fs: avoid dumplicate extensions
Date: Sat, 28 Nov 2015 10:19:48 +0000 [thread overview]
Message-ID: <1448705988-29484-2-git-send-email-shengyong1@huawei.com> (raw)
In-Reply-To: <1448705988-29484-1-git-send-email-shengyong1@huawei.com>
Before copying an user specified extension to extension_list, check if it
is already in the list.
Signed-off-by: Sheng Yong <shengyong1@huawei.com>
---
mkfs/f2fs_format.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 176bdea..c170985 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -118,6 +118,24 @@ const char *media_ext_lists[] = {
NULL
};
+static bool is_extension_exist(const char *name, const int len)
+{
+ int name_len, min_len;
+ int i, ret;
+
+ for (i = 0; i < F2FS_MAX_EXTENSION; i++) {
+ char *ext = (char *) sb.extension_list[i];
+ name_len = strlen(ext);
+ min_len = name_len < len ? name_len : len;
+ ret = strncmp(ext, name, min_len);
+
+ if (ret == 0 && name_len == len)
+ return 1;
+ }
+
+ return 0;
+}
+
static void configure_extension_list(void)
{
const char **extlist = media_ext_lists;
@@ -143,8 +161,14 @@ static void configure_extension_list(void)
/* add user ext list */
ue = strtok(ext_str, ",");
while (ue != NULL) {
+ strtrim(&ue);
name_len = strlen(ue);
- memcpy(sb.extension_list[i++], ue, name_len);
+ if (name_len > 7) {
+ MSG(0, "\tError: Extension '%s' too long\n", ue);
+ exit(1);
+ }
+ if (!is_extension_exist(ue, name_len))
+ memcpy(sb.extension_list[i++], ue, name_len);
ue = strtok(NULL, ",");
if (i >= F2FS_MAX_EXTENSION)
break;
--
1.9.1
------------------------------------------------------------------------------
next prev parent reply other threads:[~2015-11-28 2:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-28 10:19 [RFC PATCH V2 1/2] mkfs.f2fs: add helper strtrim() to trim string's space Sheng Yong
2015-11-28 3:53 ` Chao Yu
2015-11-28 10:19 ` Sheng Yong [this message]
2015-11-28 3:07 ` [RFC PATCH V3 2/2] mkfs.f2fs: avoid dumplicate extensions Sheng Yong
2015-11-28 4:00 ` Chao Yu
2015-11-28 4:19 ` Sheng Yong
2015-11-29 6:00 ` Jaegeuk Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448705988-29484-2-git-send-email-shengyong1@huawei.com \
--to=shengyong1@huawei.com \
--cc=chao2.yu@samsung.com \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).