Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

lib/string.c: introduce strreplace()

Strings are sometimes sanitized by replacing a certain character (often
'/') by another (often '!'). In a few places, this is done the same way
Schlemiel the Painter would do it. Others are slightly smarter but still
do multiple strchr() calls. Introduce strreplace() to do this using a
single function call and a single pass over the string.

One would expect the return value to be one of three things: void, s, or
the number of replacements made. I chose the fourth, returning a pointer
to the end of the string. This is more likely to be useful (for example
allowing the caller to avoid a strlen call).

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Rasmus Villemoes and committed by
Linus Torvalds
94df2904 9d2a8da0

+18
+1
include/linux/string.h
··· 111 111 extern void * memchr(const void *,int,__kernel_size_t); 112 112 #endif 113 113 void *memchr_inv(const void *s, int c, size_t n); 114 + char *strreplace(char *s, char old, char new); 114 115 115 116 extern void kfree_const(const void *x); 116 117
+17
lib/string.c
··· 849 849 return check_bytes8(start, value, bytes % 8); 850 850 } 851 851 EXPORT_SYMBOL(memchr_inv); 852 + 853 + /** 854 + * strreplace - Replace all occurrences of character in string. 855 + * @s: The string to operate on. 856 + * @old: The character being replaced. 857 + * @new: The character @old is replaced with. 858 + * 859 + * Returns pointer to the nul byte at the end of @s. 860 + */ 861 + char *strreplace(char *s, char old, char new) 862 + { 863 + for (; *s; ++s) 864 + if (*s == old) 865 + *s = new; 866 + return s; 867 + } 868 + EXPORT_SYMBOL(strreplace);