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

fix : parser no longer allows blank lines for keys or command

Browse Source
This commit is contained in:
Alessandro Mauri 2020-07-29 22:07:53 +02:00
parent d110948129
commit 1b7af99723
1 changed files with 18 additions and 3 deletions

21
hkd.c
View File

@ -35,11 +35,9 @@
#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) {fputs(ANSI_COLOR_RED, stderr); perror(str); fputs(ANSI_COLOR_RESET, stderr); exit(errno);}
#define die(str) {perror(red(str)); exit(errno);} #define die(str) {perror(red(str)); 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])))
#define parse_failure(str, line) {fprintf(stderr, "Error in config file at line %d: " str "\n", line); exit(EXIT_FAILURE);}
#define EVENT_SIZE (sizeof(struct inotify_event)) #define EVENT_SIZE (sizeof(struct inotify_event))
#define EVENT_BUF_LEN (1024*(EVENT_SIZE+16)) #define EVENT_BUF_LEN (1024*(EVENT_SIZE+16))
@ -226,6 +224,7 @@ void parse_config_file (void);
void update_descriptors_list (int **, int *); void update_descriptors_list (int **, int *);
int prepare_epoll (int *, int, int); int prepare_epoll (int *, int, int);
unsigned short key_to_code (char *); unsigned short key_to_code (char *);
int is_empty (const char *s);
/* hotkey list operations */ /* hotkey list operations */
void hotkey_list_add (struct hotkey_list_e *, struct key_buffer *, char *, int); void hotkey_list_add (struct hotkey_list_e *, struct key_buffer *, char *, int);
void hotkey_list_destroy (struct hotkey_list_e *); void hotkey_list_destroy (struct hotkey_list_e *);
@ -690,7 +689,6 @@ void parse_config_file (void)
keys = strtok(line, ":"); keys = strtok(line, ":");
command = strtok(NULL, ":"); command = strtok(NULL, ":");
if (!command || !keys) { if (!command || !keys) {
parse_failure("No command or keys specified", linenum);
fprintf(stderr, "Error at line %d:" fprintf(stderr, "Error at line %d:"
"No command or keys specified\n", linenum); "No command or keys specified\n", linenum);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -714,6 +712,13 @@ void parse_config_file (void)
while (isspace(command[tmp])) while (isspace(command[tmp]))
command[tmp--] = '\0'; command[tmp--] = '\0';
// Check if keys and command are not blank
if (is_empty(keys) || is_empty(command)) {
fprintf(stderr, red("Error at line %d: "
"command or keys not present\n"), linenum);
exit(EXIT_FAILURE);
}
key_buffer_reset(&kb); key_buffer_reset(&kb);
char *k = strtok(keys, ","); char *k = strtok(keys, ",");
unsigned short kc; unsigned short kc;
@ -739,3 +744,13 @@ unsigned short key_to_code (char *key)
} }
return 0; return 0;
} }
int is_empty (const char *s)
{
while (*s != '\0') {
if (!isspace((unsigned char)*s))
return 0;
s++;
}
return 1;
}