mirror of
https://github.com/sheumann/hush.git
synced 2024-09-13 06:54:44 +00:00
cmdedit: reformat code a bit, no algorithm changes
This commit is contained in:
Denis Vlasenko
parent
d56b47f9a6
commit
0a8a774179
153
shell/cmdedit.c
153
shell/cmdedit.c
@ -155,12 +155,12 @@ static void win_changed(int nsig)
|
||||
|
||||
static void cmdedit_reset_term(void)
|
||||
{
|
||||
if ((handlers_sets & SET_RESET_TERM) != 0) {
|
||||
if (handlers_sets & SET_RESET_TERM) {
|
||||
/* sparc and other have broken termios support: use old termio handling. */
|
||||
setTermSettings(STDIN_FILENO, (void *) &initial_settings);
|
||||
handlers_sets &= ~SET_RESET_TERM;
|
||||
}
|
||||
if ((handlers_sets & SET_WCHG_HANDLERS) != 0) {
|
||||
if (handlers_sets & SET_WCHG_HANDLERS) {
|
||||
/* reset SIGWINCH handler to previous (default) */
|
||||
win_changed(0);
|
||||
handlers_sets &= ~SET_WCHG_HANDLERS;
|
||||
@ -172,8 +172,7 @@ static void cmdedit_reset_term(void)
|
||||
/* special for recount position for scroll and remove terminal margin effect */
|
||||
static void cmdedit_set_out_char(int next_char)
|
||||
{
|
||||
|
||||
int c = (int)((unsigned char) command_ps[cursor]);
|
||||
int c = (unsigned char)command_ps[cursor];
|
||||
|
||||
if (c == 0)
|
||||
c = ' '; /* destroy end char? */
|
||||
@ -188,7 +187,10 @@ static void cmdedit_set_out_char(int next_char)
|
||||
printf("\033[7m%c\033[0m", c);
|
||||
} else
|
||||
#endif
|
||||
if (initial_settings.c_lflag & ECHO) putchar(c);
|
||||
{
|
||||
if (initial_settings.c_lflag & ECHO)
|
||||
putchar(c);
|
||||
}
|
||||
if (++cmdedit_x >= cmdedit_termw) {
|
||||
/* terminal is scrolled down */
|
||||
cmdedit_y++;
|
||||
@ -320,7 +322,6 @@ static void parse_prompt(const char *prmt_ptr)
|
||||
strcpy(pbuf, "?");
|
||||
} else {
|
||||
char *s = strchr(pbuf, '.');
|
||||
|
||||
if (s)
|
||||
*s = 0;
|
||||
}
|
||||
@ -328,16 +329,17 @@ static void parse_prompt(const char *prmt_ptr)
|
||||
}
|
||||
break;
|
||||
case '$':
|
||||
c = my_euid == 0 ? '#' : '$';
|
||||
c = (my_euid == 0 ? '#' : '$');
|
||||
break;
|
||||
#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
|
||||
case 'w':
|
||||
pbuf = pwd_buf;
|
||||
l = strlen(home_pwd_buf);
|
||||
if (home_pwd_buf[0] != 0 &&
|
||||
strncmp(home_pwd_buf, pbuf, l) == 0 &&
|
||||
(pbuf[l]=='/' || pbuf[l]=='\0') &&
|
||||
strlen(pwd_buf+l)<PATH_MAX) {
|
||||
if (home_pwd_buf[0] != 0
|
||||
&& strncmp(home_pwd_buf, pbuf, l) == 0
|
||||
&& (pbuf[l]=='/' || pbuf[l]=='\0')
|
||||
&& strlen(pwd_buf+l)<PATH_MAX
|
||||
) {
|
||||
pbuf = buf2;
|
||||
*pbuf = '~';
|
||||
strcpy(pbuf+1, pwd_buf+l);
|
||||
@ -347,7 +349,7 @@ static void parse_prompt(const char *prmt_ptr)
|
||||
case 'W':
|
||||
pbuf = pwd_buf;
|
||||
cp = strrchr(pbuf,'/');
|
||||
if ( (cp != NULL) && (cp != pbuf) )
|
||||
if (cp != NULL && cp != pbuf)
|
||||
pbuf += (cp-pbuf) + 1;
|
||||
break;
|
||||
case '!':
|
||||
@ -504,13 +506,13 @@ static void cmdedit_setwidth(int w, int redraw_flg)
|
||||
static void cmdedit_init(void)
|
||||
{
|
||||
cmdedit_prmt_len = 0;
|
||||
if ((handlers_sets & SET_WCHG_HANDLERS) == 0) {
|
||||
if (!(handlers_sets & SET_WCHG_HANDLERS)) {
|
||||
/* emulate usage handler to set handler and call yours work */
|
||||
win_changed(-SIGWINCH);
|
||||
handlers_sets |= SET_WCHG_HANDLERS;
|
||||
}
|
||||
|
||||
if ((handlers_sets & SET_ATEXIT) == 0) {
|
||||
if (!(handlers_sets & SET_ATEXIT)) {
|
||||
#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
|
||||
struct passwd *entry;
|
||||
|
||||
@ -553,10 +555,13 @@ static void add_match(char *matched)
|
||||
/*
|
||||
static int is_execute(const struct stat *st)
|
||||
{
|
||||
if ((!my_euid && (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) ||
|
||||
(my_uid == st->st_uid && (st->st_mode & S_IXUSR)) ||
|
||||
(my_gid == st->st_gid && (st->st_mode & S_IXGRP)) ||
|
||||
(st->st_mode & S_IXOTH)) return TRUE;
|
||||
if ((!my_euid && (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
|
||||
|| (my_uid == st->st_uid && (st->st_mode & S_IXUSR))
|
||||
|| (my_gid == st->st_gid && (st->st_mode & S_IXGRP))
|
||||
|| (st->st_mode & S_IXOTH)
|
||||
) {
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
*/
|
||||
@ -629,26 +634,25 @@ static int path_parse(char ***p, int flags)
|
||||
{
|
||||
int npth;
|
||||
const char *tmp;
|
||||
const char *pth;
|
||||
const char *pth = cmdedit_path_lookup;
|
||||
|
||||
/* if not setenv PATH variable, to search cur dir "." */
|
||||
if (flags != FIND_EXE_ONLY || (pth = cmdedit_path_lookup) == 0 ||
|
||||
/* PATH=<empty> or PATH=:<empty> */
|
||||
*pth == 0 || (*pth == ':' && *(pth + 1) == 0)) {
|
||||
if (flags != FIND_EXE_ONLY)
|
||||
return 1;
|
||||
/* PATH=<empty> or PATH=:<empty> */
|
||||
if (!pth || !pth[0] || LONE_CHAR(pth, ':'))
|
||||
return 1;
|
||||
}
|
||||
|
||||
tmp = pth;
|
||||
npth = 0;
|
||||
|
||||
for (;;) {
|
||||
while (1) {
|
||||
npth++; /* count words is + 1 count ':' */
|
||||
tmp = strchr(tmp, ':');
|
||||
if (tmp) {
|
||||
if (!tmp)
|
||||
break;
|
||||
if (*++tmp == 0)
|
||||
break; /* :<empty> */
|
||||
} else
|
||||
break;
|
||||
}
|
||||
|
||||
*p = xmalloc(npth * sizeof(char *));
|
||||
@ -657,14 +661,13 @@ static int path_parse(char ***p, int flags)
|
||||
(*p)[0] = xstrdup(tmp);
|
||||
npth = 1; /* count words is + 1 count ':' */
|
||||
|
||||
for (;;) {
|
||||
while (1) {
|
||||
tmp = strchr(tmp, ':');
|
||||
if (tmp) {
|
||||
if (!tmp)
|
||||
break;
|
||||
(*p)[0][(tmp - pth)] = 0; /* ':' -> '\0' */
|
||||
if (*++tmp == 0)
|
||||
break; /* :<empty> */
|
||||
} else
|
||||
break;
|
||||
(*p)[npth++] = &(*p)[0][(tmp - pth)]; /* p[next]=p[0][&'\0'+1] */
|
||||
}
|
||||
|
||||
@ -728,6 +731,7 @@ static void exe_n_cwd_tab_completion(char *command, int type)
|
||||
continue;
|
||||
|
||||
while ((next = readdir(dir)) != NULL) {
|
||||
int len1;
|
||||
char *str_found = next->d_name;
|
||||
|
||||
/* matched? */
|
||||
@ -735,10 +739,9 @@ static void exe_n_cwd_tab_completion(char *command, int type)
|
||||
continue;
|
||||
/* not see .name without .match */
|
||||
if (*str_found == '.' && *pfind == 0) {
|
||||
if (*paths[i] == '/' && paths[i][1] == 0
|
||||
&& str_found[1] == 0) str_found = ""; /* only "/" */
|
||||
else
|
||||
if (NOT_LONE_CHAR(paths[i], '/') || str_found[1])
|
||||
continue;
|
||||
str_found = ""; /* only "/" */
|
||||
}
|
||||
found = concat_path_file(paths[i], str_found);
|
||||
/* hmm, remover in progress? */
|
||||
@ -748,7 +751,7 @@ static void exe_n_cwd_tab_completion(char *command, int type)
|
||||
if (paths[i] != dirbuf)
|
||||
strcpy(found, next->d_name); /* only name */
|
||||
|
||||
int len1 = strlen(found);
|
||||
len1 = strlen(found);
|
||||
found = xrealloc(found, len1 + 2);
|
||||
found[len1] = '\0';
|
||||
found[len1+1] = '\0';
|
||||
@ -794,7 +797,7 @@ static int find_match(char *matchBuf, int *len_with_quotes)
|
||||
|
||||
/* set to integer dimension characters and own positions */
|
||||
for (i = 0;; i++) {
|
||||
int_buf[i] = (int) ((unsigned char) matchBuf[i]);
|
||||
int_buf[i] = (unsigned char)matchBuf[i];
|
||||
if (int_buf[i] == 0) {
|
||||
pos_buf[i] = -1; /* indicator end line */
|
||||
break;
|
||||
@ -835,7 +838,7 @@ static int find_match(char *matchBuf, int *len_with_quotes)
|
||||
int_buf[i] |= QUOT;
|
||||
}
|
||||
|
||||
/* skip commands with arguments if line have commands delimiters */
|
||||
/* skip commands with arguments if line has commands delimiters */
|
||||
/* ';' ';;' '&' '|' '&&' '||' but `>&' `<&' `>|' */
|
||||
for (i = 0; int_buf[i]; i++) {
|
||||
c = int_buf[i];
|
||||
@ -907,15 +910,16 @@ static int find_match(char *matchBuf, int *len_with_quotes)
|
||||
if (int_buf[i] == ' ' || int_buf[i] == '<' || int_buf[i] == '>') {
|
||||
if (int_buf[i] == ' ' && command_mode == FIND_EXE_ONLY
|
||||
&& matchBuf[pos_buf[0]]=='c'
|
||||
&& matchBuf[pos_buf[1]]=='d' )
|
||||
&& matchBuf[pos_buf[1]]=='d'
|
||||
) {
|
||||
command_mode = FIND_DIR_ONLY;
|
||||
else {
|
||||
} else {
|
||||
command_mode = FIND_FILE_ONLY;
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* "strlen" */
|
||||
for (i = 0; int_buf[i]; i++);
|
||||
for (i = 0; int_buf[i]; i++)
|
||||
/* "strlen" */;
|
||||
/* find last word */
|
||||
for (--i; i >= 0; i--) {
|
||||
c = int_buf[i];
|
||||
@ -925,11 +929,12 @@ static int find_match(char *matchBuf, int *len_with_quotes)
|
||||
}
|
||||
}
|
||||
/* skip first not quoted '\'' or '"' */
|
||||
for (i = 0; int_buf[i] == '\'' || int_buf[i] == '"'; i++);
|
||||
for (i = 0; int_buf[i] == '\'' || int_buf[i] == '"'; i++)
|
||||
/*skip*/;
|
||||
/* collapse quote or unquote // or /~ */
|
||||
while ((int_buf[i] & ~QUOT) == '/' &&
|
||||
((int_buf[i + 1] & ~QUOT) == '/'
|
||||
|| (int_buf[i + 1] & ~QUOT) == '~')) {
|
||||
while ((int_buf[i] & ~QUOT) == '/'
|
||||
&& ((int_buf[i+1] & ~QUOT) == '/' || (int_buf[i+1] & ~QUOT) == '~')
|
||||
) {
|
||||
i++;
|
||||
}
|
||||
|
||||
@ -1155,8 +1160,8 @@ void load_history ( const char *fromfile )
|
||||
free(history[hi]);
|
||||
}
|
||||
|
||||
if (( fp = fopen ( fromfile, "r" ))) {
|
||||
|
||||
fp = fopen(fromfile, "r");
|
||||
if (fp) {
|
||||
for (hi = 0; hi < MAX_HISTORY;) {
|
||||
char * hl = xmalloc_getline(fp);
|
||||
int l;
|
||||
@ -1239,13 +1244,11 @@ static void
|
||||
vi_word_motion(char *command, int eat)
|
||||
{
|
||||
if (isalnum(command[cursor]) || command[cursor] == '_') {
|
||||
while (cursor < len &&
|
||||
(isalnum(command[cursor+1]) ||
|
||||
command[cursor+1] == '_'))
|
||||
while (cursor < len
|
||||
&& (isalnum(command[cursor+1]) || command[cursor+1] == '_'))
|
||||
input_forward();
|
||||
} else if (ispunct(command[cursor])) {
|
||||
while (cursor < len &&
|
||||
(ispunct(command[cursor+1])))
|
||||
while (cursor < len && ispunct(command[cursor+1]))
|
||||
input_forward();
|
||||
}
|
||||
|
||||
@ -1278,13 +1281,13 @@ vi_end_motion(char *command)
|
||||
if (cursor >= len-1)
|
||||
return;
|
||||
if (isalnum(command[cursor]) || command[cursor] == '_') {
|
||||
while (cursor < len-1 &&
|
||||
(isalnum(command[cursor+1]) ||
|
||||
command[cursor+1] == '_'))
|
||||
while (cursor < len-1
|
||||
&& (isalnum(command[cursor+1]) || command[cursor+1] == '_')
|
||||
) {
|
||||
input_forward();
|
||||
}
|
||||
} else if (ispunct(command[cursor])) {
|
||||
while (cursor < len-1 &&
|
||||
(ispunct(command[cursor+1])))
|
||||
while (cursor < len-1 && ispunct(command[cursor+1]))
|
||||
input_forward();
|
||||
}
|
||||
}
|
||||
@ -1309,13 +1312,13 @@ vi_back_motion(char *command)
|
||||
if (cursor <= 0)
|
||||
return;
|
||||
if (isalnum(command[cursor]) || command[cursor] == '_') {
|
||||
while (cursor > 0 &&
|
||||
(isalnum(command[cursor-1]) ||
|
||||
command[cursor-1] == '_'))
|
||||
while (cursor > 0
|
||||
&& (isalnum(command[cursor-1]) || command[cursor-1] == '_')
|
||||
) {
|
||||
input_backward(1);
|
||||
}
|
||||
} else if (ispunct(command[cursor])) {
|
||||
while (cursor > 0 &&
|
||||
(ispunct(command[cursor-1])))
|
||||
while (cursor > 0 && ispunct(command[cursor-1]))
|
||||
input_backward(1);
|
||||
}
|
||||
}
|
||||
@ -1341,7 +1344,6 @@ vi_back_motion(char *command)
|
||||
|
||||
int cmdedit_read_input(char *prompt, char command[BUFSIZ])
|
||||
{
|
||||
|
||||
int break_out = 0;
|
||||
int lastWasTab = FALSE;
|
||||
unsigned char c;
|
||||
@ -1379,7 +1381,6 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
|
||||
parse_prompt(prompt);
|
||||
|
||||
while (1) {
|
||||
|
||||
fflush(stdout); /* buffered out to fast */
|
||||
|
||||
if (safe_read(0, &c, 1) < 1)
|
||||
@ -1393,8 +1394,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
|
||||
if (vi_cmdmode)
|
||||
ic |= vbit;
|
||||
#endif
|
||||
switch (ic)
|
||||
{
|
||||
switch (ic) {
|
||||
case '\n':
|
||||
case '\r':
|
||||
vi_case( case '\n'|vbit: )
|
||||
@ -1472,7 +1472,7 @@ prepare_to_die:
|
||||
break;
|
||||
case CNTRL('K'):
|
||||
/* Control-k -- clear to end of line */
|
||||
*(command + cursor) = 0;
|
||||
command[cursor] = 0;
|
||||
len = cursor;
|
||||
printf("\033[J");
|
||||
break;
|
||||
@ -1570,8 +1570,7 @@ prepare_to_die:
|
||||
case 'c'|vbit:
|
||||
vi_cmdmode = 0;
|
||||
/* fall through */
|
||||
case 'd'|vbit:
|
||||
{
|
||||
case 'd'|vbit: {
|
||||
int nc, sc;
|
||||
sc = cursor;
|
||||
prevc = ic;
|
||||
@ -1627,8 +1626,8 @@ prepare_to_die:
|
||||
input_delete(1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'p'|vbit:
|
||||
input_forward();
|
||||
/* fallthrough */
|
||||
@ -1802,7 +1801,7 @@ rewrite_line:
|
||||
/* After max history, remove the oldest command */
|
||||
if (i >= MAX_HISTORY) {
|
||||
free(history[0]);
|
||||
for(i = 0; i < (MAX_HISTORY-1); i++)
|
||||
for(i = 0; i < MAX_HISTORY-1; i++)
|
||||
history[i] = history[i+1];
|
||||
}
|
||||
history[i++] = xstrdup(command);
|
||||
@ -1849,9 +1848,9 @@ int main(int argc, char **argv)
|
||||
char buff[BUFSIZ];
|
||||
char *prompt =
|
||||
#if ENABLE_FEATURE_SH_FANCY_PROMPT
|
||||
"\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\
|
||||
\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \
|
||||
\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
|
||||
"\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:"
|
||||
"\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] "
|
||||
"\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
|
||||
#else
|
||||
"% ";
|
||||
#endif
|
||||
@ -1862,12 +1861,10 @@ int main(int argc, char **argv)
|
||||
while (1) {
|
||||
int l;
|
||||
l = cmdedit_read_input(prompt, buff);
|
||||
if (l > 0 && buff[l-1] == '\n') {
|
||||
if (l <= 0 || buff[l-1] != '\n')
|
||||
break;
|
||||
buff[l-1] = 0;
|
||||
printf("*** cmdedit_read_input() returned line =%s=\n", buff);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
printf("*** cmdedit_read_input() detect ^D\n");
|
||||
return 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user