emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb/lineedit: tweak #if indenting, no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-09-25 19:36:35 +02:00
parent 56f0e886db
commit 627821e42b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libbb/lineedit.c
View File

@ -1762,7 +1762,7 @@ vi_back_motion(void)
input_backward(1); input_backward(1);
} }
} }
#endif #endif /* ENABLE_FEATURE_EDITING_VI */
/* Modelled after bash 4.0 behavior of Ctrl-<arrow> */ /* Modelled after bash 4.0 behavior of Ctrl-<arrow> */
static void ctrl_left(void) static void ctrl_left(void)
@ -1863,7 +1863,7 @@ static void ask_terminal(void)
} }
} }
#else #else
#define ask_terminal() ((void)0) # define ask_terminal() ((void)0)
#endif #endif
/* Note about multi-line PS1 (e.g. "\n\w \u@\h\n> ") and prompt redrawing: /* Note about multi-line PS1 (e.g. "\n\w \u@\h\n> ") and prompt redrawing:
@ -2057,7 +2057,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
if (c == '\n') if (c == '\n')
cmdedit_prmt_len = 0; cmdedit_prmt_len = 0;
else if (flg_not_length != ']') { else if (flg_not_length != ']') {
#if ENABLE_UNICODE_SUPPORT # if ENABLE_UNICODE_SUPPORT
if (n == 1) { if (n == 1) {
/* Only count single-byte characters and the first of multi-byte characters */ /* Only count single-byte characters and the first of multi-byte characters */
if ((unsigned char)*pbuf < 0x80 /* single byte character */ if ((unsigned char)*pbuf < 0x80 /* single byte character */
@ -2068,9 +2068,9 @@ static void parse_and_put_prompt(const char *prmt_ptr)
} else { } else {
cmdedit_prmt_len += unicode_strwidth(pbuf); cmdedit_prmt_len += unicode_strwidth(pbuf);
} }
#else # else
cmdedit_prmt_len += n; cmdedit_prmt_len += n;
#endif # endif
} }
} }
prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_size+1), pbuf); prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_size+1), pbuf);
@ -2297,7 +2297,7 @@ static int32_t reverse_i_search(int timeout)
} }
/* Append this char */ /* Append this char */
#if ENABLE_UNICODE_SUPPORT # if ENABLE_UNICODE_SUPPORT
if (unicode_status == UNICODE_ON) { if (unicode_status == UNICODE_ON) {
mbstate_t mbstate = { 0 }; mbstate_t mbstate = { 0 };
char buf[MB_CUR_MAX + 1]; char buf[MB_CUR_MAX + 1];
@ -2308,7 +2308,7 @@ static int32_t reverse_i_search(int timeout)
strcpy(match_buf + match_buf_len, buf); strcpy(match_buf + match_buf_len, buf);
} }
} else } else
#endif # endif
if (match_buf_len < sizeof(match_buf) - 1) { if (match_buf_len < sizeof(match_buf) - 1) {
match_buf[match_buf_len] = ic; match_buf[match_buf_len] = ic;
match_buf[match_buf_len + 1] = '\0'; match_buf[match_buf_len + 1] = '\0';
@ -2360,7 +2360,7 @@ static int32_t reverse_i_search(int timeout)
return ic; return ic;
} }
#endif #endif /* ENABLE_FEATURE_REVERSE_SEARCH */
#if ENABLE_FEATURE_EDITING_WINCH #if ENABLE_FEATURE_EDITING_WINCH
static void sigaction2(int sig, struct sigaction *act) static void sigaction2(int sig, struct sigaction *act)