diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
| commit | b9a2512aaa22086dc84db3f55a0d912b206c11e3 (patch) | |
| tree | 38cfaccf38003f10032808354fce63d1b369c9e2 /lib | |
| parent | b1ebbe76eb48b56ccd804636edcb5fb0b49da98a (diff) | |
| parent | 0295088d53cd605aaf2a2accfd65c19c0f8a0cf0 (diff) | |
| download | barebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.gz barebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootstrap/devfs.c | 2 | ||||
| -rw-r--r-- | lib/bootstrap/disk.c | 4 | ||||
| -rw-r--r-- | lib/readline.c | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/bootstrap/devfs.c b/lib/bootstrap/devfs.c index 5a64477eed..6a3dd76cdd 100644 --- a/lib/bootstrap/devfs.c +++ b/lib/bootstrap/devfs.c @@ -80,7 +80,7 @@ static unsigned int get_image_size(void *head) } #endif -void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, +void* bootstrap_read_devfs(const char *devname, bool use_bb, int offset, int default_size, int max_size) { int ret; diff --git a/lib/bootstrap/disk.c b/lib/bootstrap/disk.c index ebf9ee5a98..a55d5d77f4 100644 --- a/lib/bootstrap/disk.c +++ b/lib/bootstrap/disk.c @@ -14,12 +14,12 @@ #include <libfile.h> #include <bootstrap.h> -void* bootstrap_read_disk(char *dev, char *fstype) +void* bootstrap_read_disk(const char *dev, const char *fstype) { int ret; void *buf; int len; - char *path = "/"; + const char *path = "/"; ret = mount(dev, fstype, path, NULL); if (ret) { diff --git a/lib/readline.c b/lib/readline.c index c007e10f50..cac967005f 100644 --- a/lib/readline.c +++ b/lib/readline.c @@ -1,6 +1,7 @@ #include <common.h> #include <readkey.h> #include <init.h> +#include <libbb.h> #include <xfuncs.h> #include <complete.h> #include <linux/ctype.h> @@ -150,7 +151,7 @@ static void cread_add_char(char ichar, int insert, unsigned long *num, /* room ??? */ if (insert || *num == *eol_num) { - if (*eol_num > len - 1) { + if (*eol_num > len - 2) { getcmd_cbeep(); return; } @@ -321,7 +322,7 @@ int readline(const char *prompt, char *buf, int len) ERASE_TO_EOL(); /* copy new line into place and display */ - strcpy(buf, hline); + safe_strncpy(buf, hline, len); eol_num = strlen(buf); REFRESH_TO_EOL(); continue; |