mirror of
https://github.com/sheumann/hush.git
synced 2024-12-21 23:29:34 +00:00
lineedit: add missing #if/#endif
init: fix warnings
This commit is contained in:
parent
4921b54f37
commit
e968fcd562
@ -727,20 +727,19 @@ static void exec_signal(int sig ATTRIBUTE_UNUSED)
|
||||
|
||||
static void shutdown_signal(int sig)
|
||||
{
|
||||
char *m;
|
||||
const char *m;
|
||||
int rb;
|
||||
|
||||
shutdown_system();
|
||||
|
||||
m = "halt";
|
||||
rb = RB_HALT_SYSTEM;
|
||||
if (sig == SIGTERM) {
|
||||
m = "reboot";
|
||||
rb = RB_AUTOBOOT;
|
||||
} else if (sig == SIGUSR2) {
|
||||
m = "poweroff";
|
||||
rb = RB_POWER_OFF;
|
||||
} else {
|
||||
m = "halt";
|
||||
rb = RB_HALT_SYSTEM;
|
||||
}
|
||||
message(CONSOLE | LOG, "Requesting system %s.", m);
|
||||
sync();
|
||||
@ -775,7 +774,7 @@ static void cont_handler(int sig ATTRIBUTE_UNUSED)
|
||||
got_cont = 1;
|
||||
}
|
||||
|
||||
#endif /* ! ENABLE_DEBUG_INIT */
|
||||
#endif /* !ENABLE_DEBUG_INIT */
|
||||
|
||||
static void new_init_action(int action, const char *command, const char *cons)
|
||||
{
|
||||
|
@ -1269,8 +1269,10 @@ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t
|
||||
|
||||
/* With null flags, no other fields are ever used */
|
||||
state = st ? st : (line_input_t*) &const_int_0;
|
||||
#if ENABLE_FEATURE_EDITING_SAVEHISTORY
|
||||
if (state->flags & SAVE_HISTORY)
|
||||
load_history(state->hist_file);
|
||||
#endif
|
||||
|
||||
/* prepare before init handlers */
|
||||
cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
|
||||
|
Loading…
Reference in New Issue
Block a user