aboutsummaryrefslogtreecommitdiff
path: root/libbb/lineedit.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-04-21 11:09:40 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-04-21 11:09:40 +0000
commit5e34ff29bcc870936ab18172f438a34d042d4e03 (patch)
treea5e7a528f2f916eb883f1161eadceacdf2dca4be /libbb/lineedit.c
parent8b814b4a349e2262c0ad25793b05206a14651ebb (diff)
downloadbusybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz
busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.bz2
busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.zip
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially badly named. It was not skipping anything!
Diffstat (limited to 'libbb/lineedit.c')
-rw-r--r--libbb/lineedit.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 7bcdb954c..e0ab73250 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -62,10 +62,10 @@
62 62
63#define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR \ 63#define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR \
64 (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT) 64 (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT)
65#define USE_FEATURE_GETUSERNAME_AND_HOMEDIR(...) 65#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...)
66#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR 66#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
67#undef USE_FEATURE_GETUSERNAME_AND_HOMEDIR 67#undef IF_FEATURE_GETUSERNAME_AND_HOMEDIR
68#define USE_FEATURE_GETUSERNAME_AND_HOMEDIR(...) __VA_ARGS__ 68#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...) __VA_ARGS__
69#endif 69#endif
70 70
71enum { 71enum {
@@ -152,8 +152,8 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
152 (*(struct lineedit_statics**)&lineedit_ptr_to_statics) = xzalloc(sizeof(S)); \ 152 (*(struct lineedit_statics**)&lineedit_ptr_to_statics) = xzalloc(sizeof(S)); \
153 barrier(); \ 153 barrier(); \
154 cmdedit_termw = 80; \ 154 cmdedit_termw = 80; \
155 USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \ 155 IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
156 USE_FEATURE_GETUSERNAME_AND_HOMEDIR(home_pwd_buf = (char*)null_str;) \ 156 IF_FEATURE_GETUSERNAME_AND_HOMEDIR(home_pwd_buf = (char*)null_str;) \
157} while (0) 157} while (0)
158static void deinit_S(void) 158static void deinit_S(void)
159{ 159{
@@ -1160,7 +1160,7 @@ static void remember_in_history(char *str)
1160 if ((state->flags & SAVE_HISTORY) && state->hist_file) 1160 if ((state->flags & SAVE_HISTORY) && state->hist_file)
1161 save_history(str); 1161 save_history(str);
1162#endif 1162#endif
1163 USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;) 1163 IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;)
1164} 1164}
1165 1165
1166#else /* MAX_HISTORY == 0 */ 1166#else /* MAX_HISTORY == 0 */
@@ -1442,7 +1442,7 @@ static void win_changed(int nsig)
1442 1442
1443/* leave out the "vi-mode"-only case labels if vi editing isn't 1443/* leave out the "vi-mode"-only case labels if vi editing isn't
1444 * configured. */ 1444 * configured. */
1445#define vi_case(caselabel) USE_FEATURE_EDITING(case caselabel) 1445#define vi_case(caselabel) IF_FEATURE_EDITING(case caselabel)
1446 1446
1447/* convert uppercase ascii to equivalent control char, for readability */ 1447/* convert uppercase ascii to equivalent control char, for readability */
1448#undef CTRL 1448#undef CTRL