浏览代码

Replace multiple if with switch

master
Arun Prakash Jana 7 年前
父节点
当前提交
74a0dc0a97
找不到此签名对应的密钥 GPG 密钥 ID: A75979F35C080412
共有 1 个文件被更改,包括 13 次插入21 次删除
  1. +13
    -21
      nnn.c

+ 13
- 21
nnn.c 查看文件

@@ -1213,35 +1213,30 @@ xreadline(char *fname, char *prompt)


if ((r = get_wch(ch)) != ERR) { if ((r = get_wch(ch)) != ERR) {
if (r == OK) { if (r == OK) {
if (*ch == KEY_ENTER || *ch == '\n' || *ch == '\r')
break;

if (*ch == '\b') {
switch (*ch) {
case KEY_ENTER: //fallthrough
case '\n': //fallthrough
case '\r':
goto END;
case '\b': /* some old curses (e.g. rhel25) still send '\b' for backspace */
if (pos > 0) { if (pos > 0) {
memmove(buf + pos - 1, buf + pos, (len - pos) << 2); memmove(buf + pos - 1, buf + pos, (len - pos) << 2);
--len, --pos; --len, --pos;
}
} //fallthrough
case '\t': /* TAB breaks cursor position, ignore it */
continue; continue;
}

if (*ch == CONTROL('L')) {
case CONTROL('L'):
clearprompt(); clearprompt();
printprompt(prompt); printprompt(prompt);
len = pos = 0; len = pos = 0;
continue; continue;
}

if (*ch == CONTROL('A')) {
case CONTROL('A'):
pos = 0; pos = 0;
continue; continue;
}

if (*ch == CONTROL('E')) {
case CONTROL('E'):
pos = len; pos = len;
continue; continue;
}

if (*ch == CONTROL('U')) {
case CONTROL('U'):
clearprompt(); clearprompt();
printprompt(prompt); printprompt(prompt);
memmove(buf, buf + pos, (len - pos) << 2); memmove(buf, buf + pos, (len - pos) << 2);
@@ -1254,10 +1249,6 @@ xreadline(char *fname, char *prompt)
if (keyname(*ch)[0] == '^') if (keyname(*ch)[0] == '^')
continue; continue;


/* TAB breaks cursor position, ignore it */
if (*ch == '\t')
continue;

if (pos < NAME_MAX - 1) { if (pos < NAME_MAX - 1) {
memmove(buf + pos + 1, buf + pos, (len - pos) << 2); memmove(buf + pos + 1, buf + pos, (len - pos) << 2);
buf[pos] = *ch; buf[pos] = *ch;
@@ -1293,6 +1284,7 @@ xreadline(char *fname, char *prompt)
} }
} }


END:
buf[len] = '\0'; buf[len] = '\0';
if (old_curs != ERR) if (old_curs != ERR)
curs_set(old_curs); curs_set(old_curs);


正在加载...
取消
保存