moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

extract SIGWINCH handler

Browse Source 
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2015-11-12 18:51:15 -05:00 committed by Allan McRae
parent 4d2317dafb
commit c74495a3b2
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pacman/pacman.c
View File

@ -1107,9 +1107,12 @@ int main(int argc, char *argv[])
cleanup(1);
}
/* disable progressbar if the output is redirected */
if(!isatty(fileno(stdout))) {
/* disable progressbar if the output is redirected */
config->noprogressbar = 1;
} else {
/* install signal handler to update output width */
install_winch_handler();
}
/* Priority of options:

21
src/pacman/sighandler.c
View File

@ -61,9 +61,6 @@ static void handler(int signum)
/* a transaction is being interrupted, don't exit pacman yet. */
return;
}
} else if(signum == SIGWINCH) {
columns_cache_reset();
return;
}
/* SIGINT/SIGHUP: no committing transaction, release it now and then exit pacman */
alpm_unlock(config->handle);
@ -72,11 +69,27 @@ static void handler(int signum)
_Exit(128 + signum);
}
static void winch_handler(int signum)
{
(void)signum; /* suppress unused variable warnings */
columns_cache_reset();
}
void install_winch_handler(void)
{
struct sigaction new_action;
new_action.sa_handler = winch_handler;
sigemptyset(&new_action.sa_mask);
new_action.sa_flags = SA_RESTART;
sigaction(SIGWINCH, &new_action, NULL);
}
void install_signal_handlers(void)
{
struct sigaction new_action;
const int signals[] = { SIGHUP, SIGINT, SIGSEGV, SIGWINCH };
const int signals[] = { SIGHUP, SIGINT, SIGSEGV };
size_t i;
/* Set signal handlers */
/* Set up the structure to specify the new action. */
new_action.sa_handler = handler;

1
src/pacman/sighandler.h
View File

@ -20,6 +20,7 @@
#ifndef _PM_SIGHANDLER_H
#define _PM_SIGHANDLER_H
void install_winch_handler(void);
void install_signal_handlers(void);
#endif /* _PM_SIGHANDLER_H */