| author | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2011-07-03 01:31:55 (GMT) |
|---|---|---|
| committer | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2011-07-03 01:31:55 (GMT) |
| commit | 8340c01222156ee40b919225dab86a0a94143ea3 (patch) | |
| tree | eff827b832331c92ea6bfe8a65f1ef2f4ae8512d | |
| parent | 17c01e47b88a507c8999b8376a5c0a63e951eab1 (diff) | |
| parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
| download | busybox-8340c01222156ee40b919225dab86a0a94143ea3.zip busybox-8340c01222156ee40b919225dab86a0a94143ea3.tar.gz busybox-8340c01222156ee40b919225dab86a0a94143ea3.tar.bz2 | |
Merge branch 'busybox' into gingerbread
| -rw-r--r-- | editors/vi.c | 11 | ||||
| -rw-r--r-- | init/halt.c | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/editors/vi.c b/editors/vi.c index fe416c3..55092f9 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -161,15 +161,12 @@ //usage: ) //usage: "\n -H Short help regarding available features" +#include "libbb.h" +/* Should be after libbb.h: on some systems regex.h needs sys/types.h: */ #if ENABLE_FEATURE_VI_REGEX_SEARCH -# if defined(ANDROID) -# include <sys/types.h> /* size_t */ -# endif # include <regex.h> #endif -#include "libbb.h" - /* the CRASHME code is unmaintained, and doesn't currently build */ #define ENABLE_FEATURE_VI_CRASHME 0 @@ -187,9 +184,9 @@ /* 0x9b is Meta-ESC */ #if ENABLE_FEATURE_VI_8BIT -#define Isprint(c) ((unsigned char)(c) >= ' ' && (c) != 0x7f && (unsigned char)(c) != 0x9b) +# define Isprint(c) ((unsigned char)(c) >= ' ' && (c) != 0x7f && (unsigned char)(c) != 0x9b) #else -#define Isprint(c) ((unsigned char)(c) >= ' ' && (unsigned char)(c) < 0x7f) +# define Isprint(c) ((unsigned char)(c) >= ' ' && (unsigned char)(c) < 0x7f) #endif #endif diff --git a/init/halt.c b/init/halt.c index 8269648..e7faa67 100644 --- a/init/halt.c +++ b/init/halt.c @@ -170,11 +170,13 @@ int halt_main(int argc UNUSED_PARAM, char **argv) /* runlevels: * 0 == shutdown * 6 == reboot */ - rc = execlp(CONFIG_TELINIT_PATH, + execlp(CONFIG_TELINIT_PATH, CONFIG_TELINIT_PATH, which == 2 ? "6" : "0", (char *)NULL ); + perror_msg_and_die("can't execute '%s'", + CONFIG_TELINIT_PATH); } } } else { |