Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc fixes and improvements #223

Merged
merged 4 commits into from
Jun 7, 2024
Merged

Misc fixes and improvements #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9f2243
clipmenud: no need to use volatile sig_atomic_t
N-R-K Jun 7, 2024
5d54cc7
clipmenud: don't silently ignore arguments
N-R-K Jun 7, 2024
a31fade
config: range check parsed integers
N-R-K Jun 7, 2024
bd97120
clipmenud: correct cast to size_t
N-R-K Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/clipmenud.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static struct clip_store cs;
static struct config cfg;
static Window win;

static volatile sig_atomic_t enabled = 1;
static int enabled = 1;
static int sig_fd;

static struct cm_selections sels[CM_SEL_MAX];
Expand Down Expand Up @@ -191,8 +191,7 @@ static void maybe_trim(void) {
uint64_t cur_clips;
expect(cs_len(&cs, &cur_clips) == 0);
if ((int)cur_clips > cfg.max_clips_batch) {
expect(cs_trim(&cs, CS_ITER_NEWEST_FIRST, (uint64_t)cfg.max_clips) ==
0);
expect(cs_trim(&cs, CS_ITER_NEWEST_FIRST, (size_t)cfg.max_clips) == 0);
}
}

Expand Down Expand Up @@ -380,7 +379,9 @@ static int _noreturn_ run(int evt_base) {
}

#ifndef UNIT_TEST
int main(void) {
int main(int argc, char *argv[]) {
(void)argv;
die_on(argc != 1, "clipmenud doesn't accept any arguments\n");
int evt_base;

cfg = setup("clipmenud");
Expand Down
11 changes: 6 additions & 5 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ int convert_bool(const char *str, void *output) {
return -EINVAL;
}

int convert_int(const char *str, void *output) {
int convert_positive_int(const char *str, void *output) {
char *end;
long val = strtol(str, &end, 10);
if (*end != '\0' || end == str) {
if (*end != '\0' || end == str || val < 0 || val > INT_MAX) {
return -EINVAL;
}
*(int *)output = (int)val;
Expand Down Expand Up @@ -264,10 +264,11 @@ static int config_apply_default_values(struct config_entry entries[],
*/
int config_setup_internal(FILE *file, struct config *cfg) {
struct config_entry entries[] = {
{"max_clips", "CM_MAX_CLIPS", &cfg->max_clips, convert_int, "1000", 0},
{"max_clips", "CM_MAX_CLIPS", &cfg->max_clips, convert_positive_int,
"1000", 0},
{"max_clips_batch", "CM_MAX_CLIPS_BATCH", &cfg->max_clips_batch,
convert_int, "100", 0},
{"oneshot", "CM_ONESHOT", &cfg->oneshot, convert_int, "0", 0},
convert_positive_int, "100", 0},
{"oneshot", "CM_ONESHOT", &cfg->oneshot, convert_positive_int, "0", 0},
{"own_clipboard", "CM_OWN_CLIPBOARD", &cfg->own_clipboard, convert_bool,
"0", 0},
{"selections", "CM_SELECTIONS", &cfg->selections, convert_selections,
Expand Down
2 changes: 1 addition & 1 deletion src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ enum selection_type _nonnull_
storage_atom_to_selection_type(Atom atom, struct cm_selections *sels);

int convert_bool(const char *str, void *output);
int convert_int(const char *str, void *output);
int convert_positive_int(const char *str, void *output);
int convert_ignore_window(const char *str, void *output);
int config_setup_internal(FILE *file, struct config *cfg);
void config_free(struct config *cfg);
Expand Down
Loading