alema/hkd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

die() is now a function

Browse Source
This commit is contained in:
Alessandro Mauri 2020-09-06 15:25:43 +02:00
parent 4a4eaf93e6
commit 6bad3614d7
1 changed files with 63 additions and 54 deletions

117
hkd.c
View File

@ -17,6 +17,7 @@
#include <wordexp.h> #include <wordexp.h>
#include <ctype.h> #include <ctype.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdarg.h>
/* Value defines */ /* Value defines */
#define FILE_NAME_MAX_LENGTH 255 #define FILE_NAME_MAX_LENGTH 255
@ -37,7 +38,6 @@
#define green(str) (ANSI_COLOR_GREEN str ANSI_COLOR_RESET) #define green(str) (ANSI_COLOR_GREEN str ANSI_COLOR_RESET)
#define red(str) (ANSI_COLOR_RED str ANSI_COLOR_RESET) #define red(str) (ANSI_COLOR_RED str ANSI_COLOR_RESET)
#define test_bit(yalv, abs_b) ((((char *)abs_b)[yalv/8] & (1<<yalv%8)) > 0) #define test_bit(yalv, abs_b) ((((char *)abs_b)[yalv/8] & (1<<yalv%8)) > 0)
#define die(str) {perror(ANSI_COLOR_RED str); fputs(ANSI_COLOR_RESET, stderr); exit(errno);}
#define array_size(val) (val ? sizeof(val)/sizeof(val[0]) : 0) #define array_size(val) (val ? sizeof(val)/sizeof(val[0]) : 0)
#define array_size_const(val) ((int)(sizeof(val)/sizeof(val[0]))) #define array_size_const(val) ((int)(sizeof(val)/sizeof(val[0])))
@ -226,6 +226,7 @@ void exec_command (char *);
void parse_config_file (void); void parse_config_file (void);
void update_descriptors_list (int **, int *); void update_descriptors_list (int **, int *);
void remove_lock (void); void remove_lock (void);
void die (const char *, ...);
int prepare_epoll (int *, int, int); int prepare_epoll (int *, int, int);
unsigned short key_to_code (char *); unsigned short key_to_code (char *);
/* hotkey list operations */ /* hotkey list operations */
@ -249,7 +250,7 @@ int main (int argc, char *argv[])
/* Check if hkd is already running */ /* Check if hkd is already running */
lock_file_descriptor = open(LOCK_FILE, O_RDWR | O_CREAT, 0600); lock_file_descriptor = open(LOCK_FILE, O_RDWR | O_CREAT, 0600);
if (lock_file_descriptor < 0) if (lock_file_descriptor < 0)
die("can't open lock file"); die("Can't open lock file:");
fl.l_start = 0; fl.l_start = 0;
fl.l_len = 0; fl.l_len = 0;
fl.l_type = F_WRLCK; fl.l_type = F_WRLCK;
@ -273,7 +274,7 @@ int main (int argc, char *argv[])
case 'c': case 'c':
ext_config_file = malloc(strlen(optarg) + 1); ext_config_file = malloc(strlen(optarg) + 1);
if (!ext_config_file) if (!ext_config_file)
die("malloc in main()"); die("malloc in main():");
strcpy(ext_config_file, optarg); strcpy(ext_config_file, optarg);
break; break;
} }
@ -287,9 +288,9 @@ int main (int argc, char *argv[])
/* Prepare directory update watcher */ /* Prepare directory update watcher */
if (event_watcher < 0) if (event_watcher < 0)
die("could not call inotify_init"); die("Could not call inotify_init:");
if (inotify_add_watch(event_watcher, EVDEV_ROOT_DIR, IN_CREATE | IN_DELETE) < 0) if (inotify_add_watch(event_watcher, EVDEV_ROOT_DIR, IN_CREATE | IN_DELETE) < 0)
die("could not add /dev/input to the watch list"); die("Could not add /dev/input to the watch list:");
/* Prepare epoll list */ /* Prepare epoll list */
ev_fd = prepare_epoll(fds, fd_num, event_watcher); ev_fd = prepare_epoll(fds, fd_num, event_watcher);
@ -314,7 +315,7 @@ int main (int argc, char *argv[])
sleep(1); // wait for devices to settle sleep(1); // wait for devices to settle
update_descriptors_list(&fds, &fd_num); update_descriptors_list(&fds, &fd_num);
if (close(ev_fd) < 0) if (close(ev_fd) < 0)
die("could not close event filedescriptors list (ev_fd)"); die("Could not close event filedescriptors list (ev_fd):");
ev_fd = prepare_epoll(fds, fd_num, event_watcher); ev_fd = prepare_epoll(fds, fd_num, event_watcher);
goto mainloop_begin; goto mainloop_begin;
} }
@ -386,7 +387,7 @@ int main (int argc, char *argv[])
close(event_watcher); close(event_watcher);
for (int i = 0; i < fd_num; i++) for (int i = 0; i < fd_num; i++)
if (close(fds[i]) == -1) if (close(fds[i]) == -1)
die("close file descriptors"); die("Error closing file descriptors:");
return 0; return 0;
} }
@ -433,10 +434,8 @@ void int_handler (int signum)
{ {
switch (signum) { switch (signum) {
case SIGINT: case SIGINT:
if (dead) { if (dead)
fprintf(stderr, red("an error occured, exiting\n")); die("An error occured, exiting");
exit(EXIT_FAILURE);
}
if (vflag) if (vflag)
printf(yellow("Received interrupt signal, exiting gracefully...\n")); printf(yellow("Received interrupt signal, exiting gracefully...\n"));
dead = 1; dead = 1;
@ -473,8 +472,7 @@ void exec_command (char *command)
case 0: case 0:
/* This is the child process, execute the command */ /* This is the child process, execute the command */
execvp(result.we_wordv[0], result.we_wordv); execvp(result.we_wordv[0], result.we_wordv);
fprintf(stderr, red("%s : %s\n"), command, strerror(errno)); die("%s:", command);
exit(errno);
break; break;
default: default:
while (waitpid(cpid, NULL, WNOHANG) == -1) {} while (waitpid(cpid, NULL, WNOHANG) == -1) {}
@ -493,7 +491,7 @@ void update_descriptors_list (int **fds, int *fd_num)
/* Open the event directory */ /* Open the event directory */
DIR *ev_dir = opendir(EVDEV_ROOT_DIR); DIR *ev_dir = opendir(EVDEV_ROOT_DIR);
if (!ev_dir) if (!ev_dir)
die("could not open /dev/input"); die("Could not open /dev/input:");
(*fd_num) = 0; (*fd_num) = 0;
@ -534,7 +532,7 @@ void update_descriptors_list (int **fds, int *fd_num)
tmp_p = realloc((*fds), sizeof(int) * ((*fd_num) + 1)); tmp_p = realloc((*fds), sizeof(int) * ((*fd_num) + 1));
if (!tmp_p) if (!tmp_p)
die("realloc file descriptors"); die("realloc file descriptors:");
(*fds) = (int *) tmp_p; (*fds) = (int *) tmp_p;
(*fds)[(*fd_num)] = tmp_fd; (*fds)[(*fd_num)] = tmp_fd;
@ -545,8 +543,7 @@ void update_descriptors_list (int **fds, int *fd_num)
if (vflag) if (vflag)
printf(green("Monitoring %d devices\n"), *fd_num); printf(green("Monitoring %d devices\n"), *fd_num);
} else { } else {
fprintf(stderr, red("Could not open any devices, exiting\n")); die("Could not open any devices, exiting");
exit(EXIT_FAILURE);
} }
} }
@ -556,12 +553,12 @@ int prepare_epoll (int *fds, int fd_num, int event_watcher)
static struct epoll_event epoll_read_ev; static struct epoll_event epoll_read_ev;
epoll_read_ev.events = EPOLLIN; epoll_read_ev.events = EPOLLIN;
if (ev_fd < 0) if (ev_fd < 0)
die("failed epoll_create"); die("epoll_create failed in prepare_epoll:");
if (epoll_ctl(ev_fd, EPOLL_CTL_ADD, event_watcher, &epoll_read_ev) < 0) if (epoll_ctl(ev_fd, EPOLL_CTL_ADD, event_watcher, &epoll_read_ev) < 0)
die("could not add file descriptor to the epoll list"); die("Could not add file descriptor to the epoll list:");
for (int i = 0; i < fd_num; i++) for (int i = 0; i < fd_num; i++)
if (epoll_ctl(ev_fd, EPOLL_CTL_ADD, fds[i], &epoll_read_ev) < 0) if (epoll_ctl(ev_fd, EPOLL_CTL_ADD, fds[i], &epoll_read_ev) < 0)
die("could not add file descriptor to the epoll list"); die("Could not add file descriptor to the epoll list:");
return ev_fd; return ev_fd;
} }
@ -611,9 +608,9 @@ void hotkey_list_add (struct hotkey_list_e *head, struct key_buffer *kb, char *c
if (!(size = strlen(cmd))) if (!(size = strlen(cmd)))
return; return;
if (!(tmp = malloc(sizeof(struct hotkey_list_e)))) if (!(tmp = malloc(sizeof(struct hotkey_list_e))))
die("memory allocation failed in hotkey_list_add()"); die("Memory allocation failed in hotkey_list_add():");
if (!(tmp->command = malloc(size + 1))) if (!(tmp->command = malloc(size + 1)))
die("memory allocation failed in hotkey_list_add()"); die("Memory allocation failed in hotkey_list_add():");
strcpy(tmp->command, cmd); strcpy(tmp->command, cmd);
tmp->kb = *kb; tmp->kb = *kb;
tmp->fuzzy = f; tmp->fuzzy = f;
@ -653,16 +650,15 @@ void parse_config_file (void)
/* If the error was WRDE_NOSPACE, /* If the error was WRDE_NOSPACE,
* then perhaps part of the result was allocated */ * then perhaps part of the result was allocated */
wordfree (&result); wordfree (&result);
die("not enough space") die("Not enough space:");
default: default:
/* Some other error */ die("Path not valid:");
die("path not valid");
} }
fd = fopen(result.we_wordv[0], "r"); fd = fopen(result.we_wordv[0], "r");
wordfree(&result); wordfree(&result);
if (!fd) if (!fd)
die("error opening config file"); die("Error opening config file:");
free(ext_config_file); free(ext_config_file);
ext_config_file = NULL; ext_config_file = NULL;
} else { } else {
@ -674,10 +670,9 @@ void parse_config_file (void)
/* If the error was WRDE_NOSPACE, /* If the error was WRDE_NOSPACE,
* then perhaps part of the result was allocated */ * then perhaps part of the result was allocated */
wordfree (&result); wordfree (&result);
die("not enough space") die("Not enough space:");
default: default:
/* Some other error */ die("Path not valid:");
die("path not valid");
} }
fd = fopen(result.we_wordv[0], "r"); fd = fopen(result.we_wordv[0], "r");
@ -688,7 +683,7 @@ void parse_config_file (void)
printf(yellow("config file not found at %s\n"), config_paths[i]); printf(yellow("config file not found at %s\n"), config_paths[i]);
} }
if (!fd) if (!fd)
die("could not open any config files, check the log for more details"); die("Could not open any config files, check the log for more details");
} }
while (!done) { while (!done) {
memset(block, 0, BLOCK_SIZE); memset(block, 0, BLOCK_SIZE);
@ -739,10 +734,9 @@ void parse_config_file (void)
fuzzy = 1; fuzzy = 1;
break; break;
default: default:
fprintf(stderr, red("Error at line %d: " die("Error at line %d: "
"hotkey definition must start with '-' or '*'\n"), "hotkey definition must start with '-' or '*'",
linenum); linenum);
exit(-1);
break; break;
} }
bb++, remaining--; bb++, remaining--;
@ -752,12 +746,12 @@ void parse_config_file (void)
case 3: case 3:
if (!keys) { if (!keys) {
if (!(keys = malloc(alloc_size = (sizeof(char) * 64)))) if (!(keys = malloc(alloc_size = (sizeof(char) * 64))))
die("malloc for keys in parse_config_file()"); die("malloc for keys in parse_config_file():");
memset(keys, 0, alloc_size); memset(keys, 0, alloc_size);
alloc_tmp = 0; alloc_tmp = 0;
} else if (alloc_tmp >= alloc_size) { } else if (alloc_tmp >= alloc_size) {
if (!(keys = realloc(keys, alloc_size *= 2))) if (!(keys = realloc(keys, alloc_size *= 2)))
die("realloc for keys in parse_config_file()"); die("realloc for keys in parse_config_file():");
memset(&keys[alloc_size / 2], 0, alloc_size / 2); memset(&keys[alloc_size / 2], 0, alloc_size / 2);
} }
@ -777,22 +771,21 @@ void parse_config_file (void)
state = 4; state = 4;
break; break;
} else { } else {
fprintf(stderr, red("Error at line %d: " die("Error at line %d: "
"no command specified, missing ':' after keys\n"), "no command specified, missing ':' after keys",
linenum); linenum);
exit(-1);
} }
break; break;
// Get command // Get command
case 4: case 4:
if (!cmd) { if (!cmd) {
if (!(cmd = malloc(alloc_size = (sizeof(char) * 128)))) if (!(cmd = malloc(alloc_size = (sizeof(char) * 128))))
die("malloc for cmd in parse_config_file()"); die("malloc for cmd in parse_config_file():");
memset(cmd, 0, alloc_size); memset(cmd, 0, alloc_size);
alloc_tmp = 0; alloc_tmp = 0;
} else if (alloc_tmp >= alloc_size) { } else if (alloc_tmp >= alloc_size) {
if (!(cmd = realloc(cmd, alloc_size *= 2))) if (!(cmd = realloc(cmd, alloc_size *= 2)))
die("realloc for cmd in parse_config_file()"); die("realloc for cmd in parse_config_file():");
memset(&cmd[alloc_size / 2], 0, alloc_size / 2); memset(&cmd[alloc_size / 2], 0, alloc_size / 2);
} }
@ -824,17 +817,15 @@ void parse_config_file (void)
} }
} }
cp_tmp = strtok(keys, ","); cp_tmp = strtok(keys, ",");
if(!cp_tmp) { if(!cp_tmp)
fprintf(stderr, red("Error at line %d: " die("Error at line %d: "
"keys not present\n"), linenum - 1); "keys not present", linenum - 1);
exit(-1);
}
do { do {
if (!(us_tmp = key_to_code(cp_tmp))) { if (!(us_tmp = key_to_code(cp_tmp))) {
fprintf(stderr, red("Error at line %d: " die("Error at line %d: "
"%s is not a valid key\n"), "%s is not a valid key",
linenum - 1, cp_tmp); linenum - 1, cp_tmp);
exit(-1);
} }
if (key_buffer_add(&kb, us_tmp)) if (key_buffer_add(&kb, us_tmp))
die("Too many keys"); die("Too many keys");
@ -843,11 +834,9 @@ void parse_config_file (void)
cp_tmp = cmd; cp_tmp = cmd;
while (isblank(*cp_tmp)) while (isblank(*cp_tmp))
cp_tmp++; cp_tmp++;
if (*cp_tmp == '\0') { if (*cp_tmp == '\0')
fprintf(stderr, red("Error at line %d: " die("Error at line %d: "
"command not present\n"), linenum - 1); "command not present", linenum - 1);
exit(-1);
}
hotkey_list_add(hotkey_list, &kb, cp_tmp, fuzzy); hotkey_list_add(hotkey_list, &kb, cp_tmp, fuzzy);
hotkey_size_mask |= 1 << (kb.size - 1); hotkey_size_mask |= 1 << (kb.size - 1);
@ -860,7 +849,7 @@ void parse_config_file (void)
i_tmp = state = 0; i_tmp = state = 0;
break; break;
default: default:
die("unknown state in parse_config_file"); die("Unknown state in parse_config_file");
break; break;
} }
@ -881,3 +870,23 @@ void remove_lock (void)
{ {
unlink(LOCK_FILE); unlink(LOCK_FILE);
} }
void die(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
fputs(ANSI_COLOR_RED, stderr);
vfprintf(stderr, fmt, ap);
if (fmt[0] && fmt[strlen(fmt) - 1] == ':') {
fputc(' ', stderr);
perror(NULL);
} else {
fputc('\n', stderr);
}
fputs(ANSI_COLOR_RESET, stderr);
va_end(ap);
exit(errno ? errno : 1);
}