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

vi: code shrink

Browse Source 
function                                             old     new   delta
get_one_char                                         108     103      -5
edit_file                                            651     644      -7
do_cmd                                              4696    4688      -8
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-20)             Total: -20 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-04-01 16:15:51 +02:00
parent 6ce60b9cca
commit 2a57608f67
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
editors/vi.c
View File

@ -1029,43 +1029,41 @@ static int readit(void) // read (maybe cursor) key from stdin
return c; return c;
} }
#if ENABLE_FEATURE_VI_DOT_CMD
static int get_one_char(void) static int get_one_char(void)
{ {
int c; int c;
#if ENABLE_FEATURE_VI_DOT_CMD
if (!adding2q) { if (!adding2q) {
// we are not adding to the q. // we are not adding to the q.
// but, we may be reading from a q // but, we may be reading from a saved q.
if (ioq == 0) { // (checking "ioq" for NULL is wrong, it's not reset to NULL
// there is no current q, read from STDIN // when done - "ioq_start" is reset instead).
c = readit(); // get the users input if (ioq_start != NULL) {
} else { // there is a queue to get chars from.
// there is a queue to get chars from first
// careful with correct sign expansion! // careful with correct sign expansion!
c = (unsigned char)*ioq++; c = (unsigned char)*ioq++;
if (c == '\0') { if (c != '\0')
// the end of the q, read from STDIN return c;
// the end of the q
free(ioq_start); free(ioq_start);
ioq_start = ioq = 0; ioq_start = NULL;
c = readit(); // get the users input // read from STDIN:
} }
return readit();
} }
} else { // we are adding STDIN chars to q.
// adding STDIN chars to q c = readit();
c = readit(); // get the users input
if (lmc_len >= MAX_INPUT_LEN - 1) { if (lmc_len >= MAX_INPUT_LEN - 1) {
status_line_bold("last_modifying_cmd overrun"); status_line_bold("last_modifying_cmd overrun");
} else { } else {
// add new char to q
last_modifying_cmd[lmc_len++] = c; last_modifying_cmd[lmc_len++] = c;
} }
}
#else
c = readit(); // get the users input
#endif /* FEATURE_VI_DOT_CMD */
return c; return c;
} }
#else
# define get_one_char() readit()
#endif
// Get input line (uses "status line" area) // Get input line (uses "status line" area)
static char *get_input_line(const char *prompt) static char *get_input_line(const char *prompt)
@ -1781,7 +1779,7 @@ static void start_new_cmd_q(char c)
// get buffer for new cmd // get buffer for new cmd
// if there is a current cmd count put it in the buffer first // if there is a current cmd count put it in the buffer first
if (cmdcnt > 0) { if (cmdcnt > 0) {
lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c); lmc_len = sprintf(last_modifying_cmd, "%u%c", cmdcnt, c);
} else { // just save char c onto queue } else { // just save char c onto queue
last_modifying_cmd[0] = c; last_modifying_cmd[0] = c;
lmc_len = 1; lmc_len = 1;
@ -3415,9 +3413,8 @@ static void do_cmd(int c)
case '.': // .- repeat the last modifying command case '.': // .- repeat the last modifying command
// Stuff the last_modifying_cmd back into stdin // Stuff the last_modifying_cmd back into stdin
// and let it be re-executed. // and let it be re-executed.
if (lmc_len > 0) { if (lmc_len != 0) {
last_modifying_cmd[lmc_len] = 0; ioq = ioq_start = xstrndup(last_modifying_cmd, lmc_len);
ioq = ioq_start = xstrdup(last_modifying_cmd);
} }
break; break;
#endif #endif
@ -4221,7 +4218,7 @@ static void edit_file(char *fn)
c = '\0'; c = '\0';
#if ENABLE_FEATURE_VI_DOT_CMD #if ENABLE_FEATURE_VI_DOT_CMD
free(ioq_start); free(ioq_start);
ioq = ioq_start = NULL; ioq_start = NULL;
lmc_len = 0; lmc_len = 0;
adding2q = 0; adding2q = 0;
#endif #endif
@ -4273,7 +4270,8 @@ static void edit_file(char *fn)
#if ENABLE_FEATURE_VI_DOT_CMD #if ENABLE_FEATURE_VI_DOT_CMD
// These are commands that change text[]. // These are commands that change text[].
// Remember the input for the "." command // Remember the input for the "." command
if (!adding2q && ioq_start == NULL if (!adding2q
&& ioq_start == NULL
&& cmd_mode == 0 // command mode && cmd_mode == 0 // command mode
&& c > '\0' // exclude NUL and non-ASCII chars && c > '\0' // exclude NUL and non-ASCII chars
&& c < 0x7f // (Unicode and such) && c < 0x7f // (Unicode and such)