diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:20 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:20 +0200 |
commit | 735c570e5ad87a562dd9a50208a087e105eaecf6 (patch) | |
tree | dc224ef613a3111284fa5f809e9de8de304a7576 /lib | |
parent | f037355761e79736bef67df1c17c1049e91c52c0 (diff) | |
parent | 179b75aaca4767901a8e6527b509307f7e5d7259 (diff) | |
download | barebox-735c570e5ad87a562dd9a50208a087e105eaecf6.tar.gz barebox-735c570e5ad87a562dd9a50208a087e105eaecf6.tar.xz |
Merge branch 'for-next/state'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/parameter.c | 2 | ||||
-rw-r--r-- | lib/xfuncs.c | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/lib/parameter.c b/lib/parameter.c index 60642f001b..b23885958b 100644 --- a/lib/parameter.c +++ b/lib/parameter.c @@ -233,7 +233,7 @@ static int param_string_set(struct device_d *dev, struct param_d *p, const char char *value_save = *ps->value; if (!val) - return -EINVAL; + val = ""; *ps->value = xstrdup(val); diff --git a/lib/xfuncs.c b/lib/xfuncs.c index 0e78b670a5..f0219c43a5 100644 --- a/lib/xfuncs.c +++ b/lib/xfuncs.c @@ -63,6 +63,28 @@ char *xstrdup(const char *s) } EXPORT_SYMBOL(xstrdup); +char *xstrndup(const char *s, size_t n) +{ + int m; + char *t; + + /* We can just xmalloc(n+1) and strncpy into it, */ + /* but think about xstrndup("abc", 10000) wastage! */ + m = n; + t = (char*) s; + while (m) { + if (!*t) break; + m--; + t++; + } + n -= m; + t = xmalloc(n + 1); + t[n] = '\0'; + + return memcpy(t, s, n); +} +EXPORT_SYMBOL(xstrndup); + void* xmemalign(size_t alignment, size_t bytes) { void *p = memalign(alignment, bytes); |