mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	lib: add "on"/"off" support to kstrtobool
Add support for "on" and "off" when converting to boolean. Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Amitkumar Karwar <akarwar@marvell.com> Cc: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Joe Perches <joe@perches.com> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nishant Sarmukadam <nishants@marvell.com> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Steve French <sfrench@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									1404297ebf
								
							
						
					
					
						commit
						a81a5a17d4
					
				
					 1 changed files with 17 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -326,9 +326,9 @@ EXPORT_SYMBOL(kstrtos8);
 | 
			
		|||
 * @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.
 | 
			
		||||
 * This routine returns 0 iff the first character is one of 'Yy1Nn0', or
 | 
			
		||||
 * [oO][NnFf] for "on" and "off". Otherwise it will return -EINVAL.  Value
 | 
			
		||||
 * pointed to by res is updated upon finding a match.
 | 
			
		||||
 */
 | 
			
		||||
int kstrtobool(const char *s, bool *res)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			@ -346,6 +346,20 @@ int kstrtobool(const char *s, bool *res)
 | 
			
		|||
	case '0':
 | 
			
		||||
		*res = false;
 | 
			
		||||
		return 0;
 | 
			
		||||
	case 'o':
 | 
			
		||||
	case 'O':
 | 
			
		||||
		switch (s[1]) {
 | 
			
		||||
		case 'n':
 | 
			
		||||
		case 'N':
 | 
			
		||||
			*res = true;
 | 
			
		||||
			return 0;
 | 
			
		||||
		case 'f':
 | 
			
		||||
		case 'F':
 | 
			
		||||
			*res = false;
 | 
			
		||||
			return 0;
 | 
			
		||||
		default:
 | 
			
		||||
			break;
 | 
			
		||||
		}
 | 
			
		||||
	default:
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue