[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-7d85c434214ea0b3416f7a62f76a0785b00d8797@git.kernel.org>
Date: Mon, 23 Nov 2015 08:04:53 -0800
From: tip-bot for Wang Nan <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: mingo@...nel.org, ast@...nel.org, acme@...hat.com, hpa@...or.com,
tglx@...utronix.de, masami.hiramatsu.pt@...achi.com,
linux-kernel@...r.kernel.org, wangnan0@...wei.com,
lizefan@...wei.com, jic23@....ac.uk
Subject: [tip:perf/core] tools: Clone the kernel's strtobool function
Commit-ID: 7d85c434214ea0b3416f7a62f76a0785b00d8797
Gitweb: http://git.kernel.org/tip/7d85c434214ea0b3416f7a62f76a0785b00d8797
Author: Wang Nan <wangnan0@...wei.com>
AuthorDate: Mon, 16 Nov 2015 11:42:05 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Wed, 18 Nov 2015 17:51:02 -0300
tools: Clone the kernel's strtobool function
Copying it to tools/lib/string.c, the counterpart to the kernel's
lib/string.c.
This is preparation for enhancing BPF program configuration, which will
allow config string like 'inlines=yes'.
Signed-off-by: Wang Nan <wangnan0@...wei.com>
Cc: Alexei Starovoitov <ast@...nel.org>
Cc: Jonathan Cameron <jic23@....ac.uk>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
Cc: Zefan Li <lizefan@...wei.com>
Cc: pi3orama@....com
Link: http://lkml.kernel.org/r/1447675815-166222-6-git-send-email-wangnan0@huawei.com
[ Copied it to tools/lib/string.c instead, to make it usable by other tools/ ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/include/linux/string.h | 2 ++
tools/lib/string.c | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h
index f3a6db6..2e2f736 100644
--- a/tools/include/linux/string.h
+++ b/tools/include/linux/string.h
@@ -6,4 +6,6 @@
void *memdup(const void *src, size_t len);
+int strtobool(const char *s, bool *res);
+
#endif /* _LINUX_STRING_H_ */
diff --git a/tools/lib/string.c b/tools/lib/string.c
index ecfd43a..065e54f 100644
--- a/tools/lib/string.c
+++ b/tools/lib/string.c
@@ -1,5 +1,20 @@
+/*
+ * linux/tools/lib/string.c
+ *
+ * Copied from linux/lib/string.c, where it is:
+ *
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ *
+ * More specifically, the first copied function was strtobool, which
+ * was introduced by:
+ *
+ * d0f1fed29e6e ("Add a strtobool function matching semantics of existing in kernel equivalents")
+ * Author: Jonathan Cameron <jic23@....ac.uk>
+ */
+
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include <linux/string.h>
/**
@@ -17,3 +32,31 @@ void *memdup(const void *src, size_t len)
return p;
}
+
+/**
+ * strtobool - convert common user inputs into boolean values
+ * @s: input string
+ * @res: result
+ *
+ * This routine returns 0 iff the first character is one of 'Yy1Nn0'.
+ * Otherwise it will return -EINVAL. Value pointed to by res is
+ * updated upon finding a match.
+ */
+int strtobool(const char *s, bool *res)
+{
+ switch (s[0]) {
+ case 'y':
+ case 'Y':
+ case '1':
+ *res = true;
+ break;
+ case 'n':
+ case 'N':
+ case '0':
+ *res = false;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists