Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-27 21:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix ORCA/C compatibility problems in libbb/lineedit.c.

Browse Source
This commit is contained in:
Stephen Heumann 2014-11-02 22:40:28 -06:00
parent 051b79efc1
commit 9b98d32e66
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libbb/lineedit.c
View File

@ -67,10 +67,10 @@
#define ENABLE_USERNAME_OR_HOMEDIR \ #define ENABLE_USERNAME_OR_HOMEDIR \
(ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT) (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT)
#define IF_USERNAME_OR_HOMEDIR(...) #define IF_USERNAME_OR_HOMEDIR(x)
#if ENABLE_USERNAME_OR_HOMEDIR #if ENABLE_USERNAME_OR_HOMEDIR
# undef IF_USERNAME_OR_HOMEDIR # undef IF_USERNAME_OR_HOMEDIR
# define IF_USERNAME_OR_HOMEDIR(...) __VA_ARGS__ # define IF_USERNAME_OR_HOMEDIR(x) x
#endif #endif
@ -697,7 +697,7 @@ static NOINLINE unsigned complete_username(const char *ud)
enum { enum {
FIND_EXE_ONLY = 0, FIND_EXE_ONLY = 0,
FIND_DIR_ONLY = 1, FIND_DIR_ONLY = 1,
FIND_FILE_ONLY = 2, FIND_FILE_ONLY = 2
}; };
static int path_parse(char ***p) static int path_parse(char ***p)
@ -1795,7 +1795,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
cbuf[1] = '\0'; /* never changes */ cbuf[1] = '\0'; /* never changes */
while (*prmt_ptr) { while (*prmt_ptr) {
char timebuf[sizeof("HH:MM:SS")]; char timebuf[9 /*sizeof("HH:MM:SS")*/];
char *free_me = NULL; char *free_me = NULL;
char *pbuf; char *pbuf;
char c; char c;
@ -1990,7 +1990,7 @@ static void win_changed(int nsig)
static int lineedit_read_key(char *read_key_buffer, int timeout) static int lineedit_read_key(char *read_key_buffer, int timeout)
{ {
int64_t ic; int32_t ic;
#if ENABLE_UNICODE_SUPPORT #if ENABLE_UNICODE_SUPPORT
char unicode_buf[MB_CUR_MAX + 1]; char unicode_buf[MB_CUR_MAX + 1];
int unicode_idx = 0; int unicode_idx = 0;
@ -2097,10 +2097,8 @@ static int isrtl_str(void)
#undef CTRL #undef CTRL
#define CTRL(a) ((a) & ~0x40) #define CTRL(a) ((a) & ~0x40)
enum { #define VI_CMDMODE_BIT 0x40000000
VI_CMDMODE_BIT = 0x40000000,
/* 0x80000000 bit flags KEYCODE_xxx */ /* 0x80000000 bit flags KEYCODE_xxx */
};
#if ENABLE_FEATURE_REVERSE_SEARCH #if ENABLE_FEATURE_REVERSE_SEARCH
/* Mimic readline Ctrl-R reverse history search. /* Mimic readline Ctrl-R reverse history search.