From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751938AbbKWQFY (ORCPT ); Mon, 23 Nov 2015 11:05:24 -0500 Received: from terminus.zytor.com ([198.137.202.10]:43652 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750954AbbKWQFT (ORCPT ); Mon, 23 Nov 2015 11:05:19 -0500 Date: Mon, 23 Nov 2015 08:04:53 -0800 From: tip-bot for Wang Nan Message-ID: Cc: mingo@kernel.org, ast@kernel.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, lizefan@huawei.com, jic23@cam.ac.uk Reply-To: jic23@cam.ac.uk, lizefan@huawei.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, ast@kernel.org, mingo@kernel.org In-Reply-To: <1447675815-166222-6-git-send-email-wangnan0@huawei.com> References: <1447675815-166222-6-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Clone the kernel's strtobool function Git-Commit-ID: 7d85c434214ea0b3416f7a62f76a0785b00d8797 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7d85c434214ea0b3416f7a62f76a0785b00d8797 Gitweb: http://git.kernel.org/tip/7d85c434214ea0b3416f7a62f76a0785b00d8797 Author: Wang Nan AuthorDate: Mon, 16 Nov 2015 11:42:05 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Alexei Starovoitov Cc: Jonathan Cameron Cc: Masami Hiramatsu Cc: Zefan Li Cc: pi3orama@163.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 --- 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 + */ + #include #include +#include #include /** @@ -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; +}