From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Mayer Subject: [PATCH v5 1/7] lib: string: add functions to case-convert strings Date: Wed, 10 Aug 2016 14:04:51 -0700 Message-ID: <1470863097-21138-2-git-send-email-mmayer@broadcom.com> References: <1470863097-21138-1-git-send-email-mmayer@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1470863097-21138-1-git-send-email-mmayer-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Andrew Morton , Al Viro , Rasmus Villemoes , Chris Metcalf , Kees Cook Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b@public.gmane.org, linux-scsi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, speakup-UPO/6gOIxNZglr+F8WMZYdi2O/JbrIOy@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, target-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-acpi@vger.kernel.org QWRkIGEgY29sbGVjdGlvbiBvZiBnZW5lcmljIGZ1bmN0aW9ucyB0byBjb252ZXJ0IHN0cmluZ3Mg dG8gbG93ZXJjYXNlCm9yIHVwcGVyY2FzZS4KCkNoYW5naW5nIHRoZSBjYXNlIG9mIGEgc3RyaW5n ICh3aXRoIG9yIHdpdGhvdXQgY29weWluZyBpdCBmaXJzdCkgc2VlbXMKdG8gYmUgYSByZWN1cnJp bmcgcmVxdWlyZW1lbnQgaW4gdGhlIGtlcm5lbCB0aGF0IGlzIGN1cnJlbnRseSBiZWluZwpzb2x2 ZWQgYnkgc2V2ZXJhbCBkdXBsaWNhdGVkIGltcGxlbWVudGF0aW9ucyBkb2luZyB0aGUgc2FtZSB0 aGluZy4gVGhpcwpjaGFuZ2UgYWltcyBhdCByZWR1Y2luZyB0aGlzIGNvZGUgZHVwbGljYXRpb24u CgpUaGUgbmV3IGZ1bmN0aW9ucyBhcmUKICAgIGludCBzdHJsY3B5dG91cHBlcihjaGFyICpkc3Qs IGNvbnN0IGNoYXIgKnNyYywgc2l6ZV90IGxlbik7CiAgICBpbnQgc3RybGNweXRvbG93ZXIoY2hh ciAqZHN0LCBjb25zdCBjaGFyICpzcmMsIHNpemVfdCBsZW4pOwogICAgdm9pZCBzdHJjcHl0b3Vw cGVyKGNoYXIgKmRzdCwgY29uc3QgY2hhciAqc3JjKTsKICAgIHZvaWQgc3RyY3B5dG9sb3dlcihj aGFyICpkc3QsIGNvbnN0IGNoYXIgKnNyYyk7CiAgICB2b2lkIHN0cnRvdXBwZXIoY2hhciAqcyk7 CiAgICB2b2lkIHN0cnRvbG93ZXIoY2hhciAqcyk7CgpUaGUgInN0cltsXWNweXRvKiIgdmVyc2lv bnMgb2YgdGhlIGZ1bmN0aW9uIHRha2UgYSBkZXN0aW5hdGlvbiBzdHJpbmcKYW5kIGEgc291cmNl IHN0cmluZyBhcyBhcmd1bWVudHMuIFRoZSAic3RybGNweXRvKiIgdmVyc2lvbnMgYWRkaXRpb25h bGx5CnRha2UgYSBsZW5ndGggYXJndW1lbnQgbGlrZSBzdHJsY3B5KCkgaXRzZWxmLiBMYXN0bHks IHRoZSBzdHJ0byoKZnVuY3Rpb25zIHRha2UgYSBzaW5nbGUgc3RyaW5nIGFyZ3VtZW50IGFuZCBt b2RpZnkgdGhlIHBhc3NlZC1pbiBzdHJpbmcuCgpzdHJsY3B5dG91cHBlcigpIGFuZCBzdHJsY3B5 dG9sb3dlcigpIHJldHVybiB0aGUgbnVtYmVyIG9mIGNoYXJhY3RlcnMKY29waWVkIG9yIC1FMkJJ RyBpZiB0aGUgZGVzdGluYXRpb24gc3RyaW5nIHdhcyB0cnVuY2F0ZWQuCgpMaWtlIHN0cmxjcHko KSwgYW5kIHVubGlrZSBzdHJuY3B5KCksIHRoZSBmdW5jdGlvbnMgZ3VhcmFudGVlIE5VTEwKdGVy bWluYXRpb24gb2YgdGhlIGRlc3RpbmF0aW9uIHN0cmluZy4KClNpZ25lZC1vZmYtYnk6IE1hcmt1 cyBNYXllciA8bW1heWVyQGJyb2FkY29tLmNvbT4KLS0tCiBpbmNsdWRlL2xpbnV4L3N0cmluZy5o IHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogbGliL3N0cmlu Zy5jICAgICAgICAgICB8IDQ2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgODYgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBh L2luY2x1ZGUvbGludXgvc3RyaW5nLmggYi9pbmNsdWRlL2xpbnV4L3N0cmluZy5oCmluZGV4IDI2 YjZmNmEuLjI1N2Q3OTcgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvc3RyaW5nLmgKKysrIGIv aW5jbHVkZS9saW51eC9zdHJpbmcuaApAQCAtMTE2LDYgKzExNiw4IEBAIGV4dGVybiB2b2lkICog bWVtY2hyKGNvbnN0IHZvaWQgKixpbnQsX19rZXJuZWxfc2l6ZV90KTsKICNlbmRpZgogdm9pZCAq bWVtY2hyX2ludihjb25zdCB2b2lkICpzLCBpbnQgYywgc2l6ZV90IG4pOwogY2hhciAqc3RycmVw bGFjZShjaGFyICpzLCBjaGFyIG9sZCwgY2hhciBuZXcpOworZXh0ZXJuIGludCBzdHJsY3B5dG91 cHBlcihjaGFyICpkc3QsIGNvbnN0IGNoYXIgKnNyYywgc2l6ZV90IGxlbik7CitleHRlcm4gaW50 IHN0cmxjcHl0b2xvd2VyKGNoYXIgKmRzdCwgY29uc3QgY2hhciAqc3JjLCBzaXplX3QgbGVuKTsK IAogZXh0ZXJuIHZvaWQga2ZyZWVfY29uc3QoY29uc3Qgdm9pZCAqeCk7CiAKQEAgLTE2OSw0ICsx NzEsNDIgQEAgc3RhdGljIGlubGluZSBjb25zdCBjaGFyICprYmFzZW5hbWUoY29uc3QgY2hhciAq cGF0aCkKIAlyZXR1cm4gdGFpbCA/IHRhaWwgKyAxIDogcGF0aDsKIH0KIAorLyoqCisgKiBzdHJj cHl0b3VwcGVyIC0gQ29weSBzdHJpbmcgYW5kIGNvbnZlcnQgdG8gdXBwZXJjYXNlLgorICogQGRz dDogVGhlIGJ1ZmZlciB0byBzdG9yZSB0aGUgcmVzdWx0LgorICogQHNyYzogVGhlIHN0cmluZyB0 byBjb252ZXJ0IHRvIHVwcGVyY2FzZS4KKyAqLworc3RhdGljIGlubGluZSB2b2lkIHN0cmNweXRv dXBwZXIoY2hhciAqZHN0LCBjb25zdCBjaGFyICpzcmMpCit7CisJc3RybGNweXRvdXBwZXIoZHN0 LCBzcmMsIH4oc2l6ZV90KTApOworfQorCisvKioKKyAqIHN0cmNweXRvbG93ZXIgLSBDb3B5IHN0 cmluZyBhbmQgY29udmVydCB0byBsb3dlcmNhc2UuCisgKiBAZHN0OiBUaGUgYnVmZmVyIHRvIHN0 b3JlIHRoZSByZXN1bHQuCisgKiBAc3JjOiBUaGUgc3RyaW5nIHRvIGNvbnZlcnQgdG8gbG93ZXJj YXNlLgorICovCitzdGF0aWMgaW5saW5lIHZvaWQgc3RyY3B5dG9sb3dlcihjaGFyICpkc3QsIGNv bnN0IGNoYXIgKnNyYykKK3sKKwlzdHJsY3B5dG9sb3dlcihkc3QsIHNyYywgfihzaXplX3QpMCk7 Cit9CisKKy8qKgorICogc3RydG91cHBlciAtIENvbnZlcnQgc3RyaW5nIHRvIHVwcGVyY2FzZS4K KyAqIEBzOiBUaGUgc3RyaW5nIHRvIG9wZXJhdGUgb24uCisgKi8KK3N0YXRpYyBpbmxpbmUgdm9p ZCBzdHJ0b3VwcGVyKGNoYXIgKnMpCit7CisJc3RybGNweXRvdXBwZXIocywgcywgfihzaXplX3Qp MCk7Cit9CisKKy8qKgorICogc3RydG9sb3dlciAtIENvbnZlcnQgc3RyaW5nIHRvIGxvd2VyY2Fz ZS4KKyAqIEBzOiBUaGUgc3RyaW5nIHRvIG9wZXJhdGUgb24uCisgKi8KK3N0YXRpYyBpbmxpbmUg dm9pZCBzdHJ0b2xvd2VyKGNoYXIgKnMpCit7CisJc3RybGNweXRvbG93ZXIocywgcywgfihzaXpl X3QpMCk7Cit9CisKICNlbmRpZiAvKiBfTElOVVhfU1RSSU5HX0hfICovCmRpZmYgLS1naXQgYS9s aWIvc3RyaW5nLmMgYi9saWIvc3RyaW5nLmMKaW5kZXggZWQ4MzU2Mi4uZDM2ZDVmYjIgMTAwNjQ0 Ci0tLSBhL2xpYi9zdHJpbmcuYworKysgYi9saWIvc3RyaW5nLmMKQEAgLTk1MiwzICs5NTIsNDkg QEAgY2hhciAqc3RycmVwbGFjZShjaGFyICpzLCBjaGFyIG9sZCwgY2hhciBuZXcpCiAJcmV0dXJu IHM7CiB9CiBFWFBPUlRfU1lNQk9MKHN0cnJlcGxhY2UpOworCisvKioKKyAqIHN0cmxjcHl0b3Vw cGVyIC0gQ29weSBhIGxlbmd0aC1saW1pdGVkIHN0cmluZyBhbmQgY29udmVydCB0byB1cHBlcmNh c2UuCisgKiBAZHN0OiBUaGUgYnVmZmVyIHRvIHN0b3JlIHRoZSByZXN1bHQuCisgKiBAc3JjOiBU aGUgc3RyaW5nIHRvIGNvbnZlcnQgdG8gdXBwZXJjYXNlLgorICogQGxlbjogTWF4aW11bSBzdHJp bmcgbGVuZ3RoLiBNYXkgYmUgU0laRV9NQVggdG8gc2V0IG5vIGxpbWl0LgorICoKKyAqIFJldHVy bnMgdGhlIG51bWJlciBvZiBjaGFyYWN0ZXJzIGNvcGllZCBvciAtRTJCSUcgaWYgQGRzdCB3YXNu J3QgYmlnIGVub3VnaC4KKyAqLworaW50IHN0cmxjcHl0b3VwcGVyKGNoYXIgKmRzdCwgY29uc3Qg Y2hhciAqc3JjLCBzaXplX3QgbGVuKQoreworCXNpemVfdCBpOworCisJaWYgKCFsZW4pCisJCXJl dHVybiAtRTJCSUc7CisKKwlmb3IgKGkgPSAwOyBpIDwgbGVuICYmIHNyY1tpXTsgKytpKQorCQlk c3RbaV0gPSB0b3VwcGVyKHNyY1tpXSk7CisJZHN0W2kgPCBsZW4gPyBpIDogaSAtIDFdID0gJ1ww JzsKKworCXJldHVybiAoaSA8IGxlbikgPyBpIDogLUUyQklHOworfQorRVhQT1JUX1NZTUJPTChz dHJsY3B5dG91cHBlcik7CisKKy8qKgorICogc3RybGNweXRvbG93ZXIgLSBDb3B5IGEgbGVuZ3Ro LWxpbWl0ZWQgc3RyaW5nIGFuZCBjb252ZXJ0IHRvIGxvd2VyY2FzZS4KKyAqIEBkc3Q6IFRoZSBi dWZmZXIgdG8gc3RvcmUgdGhlIHJlc3VsdC4KKyAqIEBzcmM6IFRoZSBzdHJpbmcgdG8gY29udmVy dCB0byBsb3dlcmNhc2UuCisgKiBAbGVuOiBNYXhpbXVtIHN0cmluZyBsZW5ndGguIE1heSBiZSBT SVpFX01BWCB0byBzZXQgbm8gbGltaXQuCisgKgorICogUmV0dXJucyB0aGUgbnVtYmVyIG9mIGNo YXJhY3RlcnMgY29waWVkIG9yIC1FMkJJRyBpZiBAZHN0IHdhc24ndCBiaWcgZW5vdWdoLgorICov CitpbnQgc3RybGNweXRvbG93ZXIoY2hhciAqZHN0LCBjb25zdCBjaGFyICpzcmMsIHNpemVfdCBs ZW4pCit7CisJc2l6ZV90IGk7CisKKwlpZiAoIWxlbikKKwkJcmV0dXJuIC1FMkJJRzsKKworCWZv ciAoaSA9IDA7IGkgPCBsZW4gJiYgc3JjW2ldOyArK2kpCisJCWRzdFtpXSA9IHRvbG93ZXIoc3Jj W2ldKTsKKwlkc3RbaSA8IGxlbiA/IGkgOiBpIC0gMV0gPSAnXDAnOworCisJcmV0dXJuIChpIDwg bGVuKSA/IGkgOiAtRTJCSUc7Cit9CitFWFBPUlRfU1lNQk9MKHN0cmxjcHl0b2xvd2VyKTsKLS0g CjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpO b3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933229AbcHJVF7 (ORCPT ); Wed, 10 Aug 2016 17:05:59 -0400 Received: from mail-qt0-f173.google.com ([209.85.216.173]:35008 "EHLO mail-qt0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932905AbcHJVFb (ORCPT ); Wed, 10 Aug 2016 17:05:31 -0400 From: Markus Mayer To: Andrew Morton , Al Viro , Rasmus Villemoes , Chris Metcalf , Kees Cook Cc: Markus Mayer , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-acpi@vger.kernel.org, speakup@linux-speakup.org, devel@driverdev.osuosl.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/7] lib: string: add functions to case-convert strings Date: Wed, 10 Aug 2016 14:04:51 -0700 Message-Id: <1470863097-21138-2-git-send-email-mmayer@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470863097-21138-1-git-send-email-mmayer@broadcom.com> References: <1470863097-21138-1-git-send-email-mmayer@broadcom.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a collection of generic functions to convert strings to lowercase or uppercase. Changing the case of a string (with or without copying it first) seems to be a recurring requirement in the kernel that is currently being solved by several duplicated implementations doing the same thing. This change aims at reducing this code duplication. The new functions are int strlcpytoupper(char *dst, const char *src, size_t len); int strlcpytolower(char *dst, const char *src, size_t len); void strcpytoupper(char *dst, const char *src); void strcpytolower(char *dst, const char *src); void strtoupper(char *s); void strtolower(char *s); The "str[l]cpyto*" versions of the function take a destination string and a source string as arguments. The "strlcpyto*" versions additionally take a length argument like strlcpy() itself. Lastly, the strto* functions take a single string argument and modify the passed-in string. strlcpytoupper() and strlcpytolower() return the number of characters copied or -E2BIG if the destination string was truncated. Like strlcpy(), and unlike strncpy(), the functions guarantee NULL termination of the destination string. Signed-off-by: Markus Mayer --- include/linux/string.h | 40 ++++++++++++++++++++++++++++++++++++++++ lib/string.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/include/linux/string.h b/include/linux/string.h index 26b6f6a..257d797 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -116,6 +116,8 @@ extern void * memchr(const void *,int,__kernel_size_t); #endif void *memchr_inv(const void *s, int c, size_t n); char *strreplace(char *s, char old, char new); +extern int strlcpytoupper(char *dst, const char *src, size_t len); +extern int strlcpytolower(char *dst, const char *src, size_t len); extern void kfree_const(const void *x); @@ -169,4 +171,42 @@ static inline const char *kbasename(const char *path) return tail ? tail + 1 : path; } +/** + * strcpytoupper - Copy string and convert to uppercase. + * @dst: The buffer to store the result. + * @src: The string to convert to uppercase. + */ +static inline void strcpytoupper(char *dst, const char *src) +{ + strlcpytoupper(dst, src, ~(size_t)0); +} + +/** + * strcpytolower - Copy string and convert to lowercase. + * @dst: The buffer to store the result. + * @src: The string to convert to lowercase. + */ +static inline void strcpytolower(char *dst, const char *src) +{ + strlcpytolower(dst, src, ~(size_t)0); +} + +/** + * strtoupper - Convert string to uppercase. + * @s: The string to operate on. + */ +static inline void strtoupper(char *s) +{ + strlcpytoupper(s, s, ~(size_t)0); +} + +/** + * strtolower - Convert string to lowercase. + * @s: The string to operate on. + */ +static inline void strtolower(char *s) +{ + strlcpytolower(s, s, ~(size_t)0); +} + #endif /* _LINUX_STRING_H_ */ diff --git a/lib/string.c b/lib/string.c index ed83562..d36d5fb2 100644 --- a/lib/string.c +++ b/lib/string.c @@ -952,3 +952,49 @@ char *strreplace(char *s, char old, char new) return s; } EXPORT_SYMBOL(strreplace); + +/** + * strlcpytoupper - Copy a length-limited string and convert to uppercase. + * @dst: The buffer to store the result. + * @src: The string to convert to uppercase. + * @len: Maximum string length. May be SIZE_MAX to set no limit. + * + * Returns the number of characters copied or -E2BIG if @dst wasn't big enough. + */ +int strlcpytoupper(char *dst, const char *src, size_t len) +{ + size_t i; + + if (!len) + return -E2BIG; + + for (i = 0; i < len && src[i]; ++i) + dst[i] = toupper(src[i]); + dst[i < len ? i : i - 1] = '\0'; + + return (i < len) ? i : -E2BIG; +} +EXPORT_SYMBOL(strlcpytoupper); + +/** + * strlcpytolower - Copy a length-limited string and convert to lowercase. + * @dst: The buffer to store the result. + * @src: The string to convert to lowercase. + * @len: Maximum string length. May be SIZE_MAX to set no limit. + * + * Returns the number of characters copied or -E2BIG if @dst wasn't big enough. + */ +int strlcpytolower(char *dst, const char *src, size_t len) +{ + size_t i; + + if (!len) + return -E2BIG; + + for (i = 0; i < len && src[i]; ++i) + dst[i] = tolower(src[i]); + dst[i < len ? i : i - 1] = '\0'; + + return (i < len) ? i : -E2BIG; +} +EXPORT_SYMBOL(strlcpytolower); -- 2.7.4