* Accept case insensitive boolean values.
* Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24326 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2004-2005, Axel Dörfler, [email protected]. All rights reserved.
|
* Copyright 2004-2008, Axel Dörfler, [email protected]. All rights reserved.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -42,8 +42,9 @@ get_safemode_boolean(const char *parameter, bool defaultValue)
|
|||||||
if (get_safemode_option(parameter, value, &length) != B_OK)
|
if (get_safemode_option(parameter, value, &length) != B_OK)
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
|
|
||||||
return !strcmp(value, "on") || !strcmp(value, "true") || !strcmp(value, "1")
|
return !strcasecmp(value, "on") || !strcasecmp(value, "true")
|
||||||
|| !strcmp(value, "yes") || !strcmp(value, "enabled");
|
|| !strcmp(value, "1") || !strcasecmp(value, "yes")
|
||||||
|
|| !strcasecmp(value, "enabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -51,7 +52,8 @@ get_safemode_boolean(const char *parameter, bool defaultValue)
|
|||||||
|
|
||||||
|
|
||||||
extern "C" status_t
|
extern "C" status_t
|
||||||
_user_get_safemode_option(const char *userParameter, char *userBuffer, size_t *_userBufferSize)
|
_user_get_safemode_option(const char *userParameter, char *userBuffer,
|
||||||
|
size_t *_userBufferSize)
|
||||||
{
|
{
|
||||||
char parameter[B_FILE_NAME_LENGTH];
|
char parameter[B_FILE_NAME_LENGTH];
|
||||||
char buffer[B_PATH_NAME_LENGTH];
|
char buffer[B_PATH_NAME_LENGTH];
|
||||||
@@ -71,7 +73,8 @@ _user_get_safemode_option(const char *userParameter, char *userBuffer, size_t *_
|
|||||||
|
|
||||||
if (status == B_OK
|
if (status == B_OK
|
||||||
&& (user_strlcpy(userBuffer, buffer, originalBufferSize) < B_OK
|
&& (user_strlcpy(userBuffer, buffer, originalBufferSize) < B_OK
|
||||||
|| user_memcpy(_userBufferSize, &bufferSize, sizeof(size_t)) < B_OK))
|
|| user_memcpy(_userBufferSize, &bufferSize, sizeof(size_t))
|
||||||
|
< B_OK))
|
||||||
return B_BAD_ADDRESS;
|
return B_BAD_ADDRESS;
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
|
|||||||
Reference in New Issue
Block a user