git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched, time: Define nsecs_to_jiffies()
[safe/jmp/linux-2.6]
/
kernel
/
params.c
diff --git
a/kernel/params.c
b/kernel/params.c
index
b4660dc
..
d656c27
100644
(file)
--- a/
kernel/params.c
+++ b/
kernel/params.c
@@
-23,6
+23,7
@@
#include <linux/device.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/device.h>
#include <linux/err.h>
#include <linux/slab.h>
+#include <linux/ctype.h>
#if 0
#define DEBUGP printk
#if 0
#define DEBUGP printk
@@
-87,7
+88,7
@@
static char *next_arg(char *args, char **param, char **val)
}
for (i = 0; args[i]; i++) {
}
for (i = 0; args[i]; i++) {
- if (
args[i] == ' '
&& !in_quote)
+ if (
isspace(args[i])
&& !in_quote)
break;
if (equals == 0) {
if (args[i] == '=')
break;
if (equals == 0) {
if (args[i] == '=')
@@
-121,7
+122,7
@@
static char *next_arg(char *args, char **param, char **val)
next = args + i;
/* Chew up trailing spaces. */
next = args + i;
/* Chew up trailing spaces. */
- while (
*next == ' '
)
+ while (
isspace(*next)
)
next++;
return next;
}
next++;
return next;
}
@@
-138,7
+139,7
@@
int parse_args(const char *name,
DEBUGP("Parsing ARGS: %s\n", args);
/* Chew leading spaces */
DEBUGP("Parsing ARGS: %s\n", args);
/* Chew leading spaces */
- while (
*args == ' '
)
+ while (
isspace(*args)
)
args++;
while (*args) {
args++;
while (*args) {
@@
-217,15
+218,11
@@
int param_set_charp(const char *val, struct kernel_param *kp)
return -ENOSPC;
}
return -ENOSPC;
}
- if (kp->flags & KPARAM_KMALLOCED)
- kfree(*(char **)kp->arg);
-
/* This is a hack. We can't need to strdup in early boot, and we
* don't need to; this mangled commandline is preserved. */
if (slab_is_available()) {
/* This is a hack. We can't need to strdup in early boot, and we
* don't need to; this mangled commandline is preserved. */
if (slab_is_available()) {
- kp->flags |= KPARAM_KMALLOCED;
*(char **)kp->arg = kstrdup(val, GFP_KERNEL);
*(char **)kp->arg = kstrdup(val, GFP_KERNEL);
- if (!kp->arg)
+ if (!
*(char **)
kp->arg)
return -ENOMEM;
} else
*(const char **)kp->arg = val;
return -ENOMEM;
} else
*(const char **)kp->arg = val;
@@
-238,35
+235,54
@@
int param_get_charp(char *buffer, struct kernel_param *kp)
return sprintf(buffer, "%s", *((char **)kp->arg));
}
return sprintf(buffer, "%s", *((char **)kp->arg));
}
+/* Actually could be a bool or an int, for historical reasons. */
int param_set_bool(const char *val, struct kernel_param *kp)
{
int param_set_bool(const char *val, struct kernel_param *kp)
{
+ bool v;
+
/* No equals means "set"... */
if (!val) val = "1";
/* One of =[yYnN01] */
switch (val[0]) {
case 'y': case 'Y': case '1':
/* No equals means "set"... */
if (!val) val = "1";
/* One of =[yYnN01] */
switch (val[0]) {
case 'y': case 'Y': case '1':
-
*(int *)kp->arg = 1
;
-
return 0
;
+
v = true
;
+
break
;
case 'n': case 'N': case '0':
case 'n': case 'N': case '0':
- *(int *)kp->arg = 0;
- return 0;
+ v = false;
+ break;
+ default:
+ return -EINVAL;
}
}
- return -EINVAL;
+
+ if (kp->flags & KPARAM_ISBOOL)
+ *(bool *)kp->arg = v;
+ else
+ *(int *)kp->arg = v;
+ return 0;
}
int param_get_bool(char *buffer, struct kernel_param *kp)
{
}
int param_get_bool(char *buffer, struct kernel_param *kp)
{
+ bool val;
+ if (kp->flags & KPARAM_ISBOOL)
+ val = *(bool *)kp->arg;
+ else
+ val = *(int *)kp->arg;
+
/* Y and N chosen as being relatively non-coder friendly */
/* Y and N chosen as being relatively non-coder friendly */
- return sprintf(buffer, "%c",
(*(int *)kp->arg)
? 'Y' : 'N');
+ return sprintf(buffer, "%c",
val
? 'Y' : 'N');
}
}
+/* This one must be bool. */
int param_set_invbool(const char *val, struct kernel_param *kp)
{
int param_set_invbool(const char *val, struct kernel_param *kp)
{
- int boolval, ret;
+ int ret;
+ bool boolval;
struct kernel_param dummy;
dummy.arg = &boolval;
struct kernel_param dummy;
dummy.arg = &boolval;
+ dummy.flags = KPARAM_ISBOOL;
ret = param_set_bool(val, &dummy);
if (ret == 0)
*(bool *)kp->arg = !boolval;
ret = param_set_bool(val, &dummy);
if (ret == 0)
*(bool *)kp->arg = !boolval;
@@
-284,6
+300,7
@@
static int param_array(const char *name,
unsigned int min, unsigned int max,
void *elem, int elemsize,
int (*set)(const char *, struct kernel_param *kp),
unsigned int min, unsigned int max,
void *elem, int elemsize,
int (*set)(const char *, struct kernel_param *kp),
+ u16 flags,
unsigned int *num)
{
int ret;
unsigned int *num)
{
int ret;
@@
-293,6
+310,7
@@
static int param_array(const char *name,
/* Get the name right for errors. */
kp.name = name;
kp.arg = elem;
/* Get the name right for errors. */
kp.name = name;
kp.arg = elem;
+ kp.flags = flags;
/* No equals sign? */
if (!val) {
/* No equals sign? */
if (!val) {
@@
-338,7
+356,8
@@
int param_array_set(const char *val, struct kernel_param *kp)
unsigned int temp_num;
return param_array(kp->name, val, 1, arr->max, arr->elem,
unsigned int temp_num;
return param_array(kp->name, val, 1, arr->max, arr->elem,
- arr->elemsize, arr->set, arr->num ?: &temp_num);
+ arr->elemsize, arr->set, kp->flags,
+ arr->num ?: &temp_num);
}
int param_array_get(char *buffer, struct kernel_param *kp)
}
int param_array_get(char *buffer, struct kernel_param *kp)
@@
-585,11
+604,7
@@
void module_param_sysfs_remove(struct module *mod)
void destroy_params(const struct kernel_param *params, unsigned num)
{
void destroy_params(const struct kernel_param *params, unsigned num)
{
- unsigned int i;
-
- for (i = 0; i < num; i++)
- if (params[i].flags & KPARAM_KMALLOCED)
- kfree(*(char **)params[i].arg);
+ /* FIXME: This should free kmalloced charp parameters. It doesn't. */
}
static void __init kernel_add_sysfs_param(const char *name,
}
static void __init kernel_add_sysfs_param(const char *name,