diff options
| -rw-r--r-- | src/calcurse.c | 6 | ||||
| -rw-r--r-- | src/calcurse.h | 2 | ||||
| -rw-r--r-- | src/dmon.c | 4 | ||||
| -rw-r--r-- | src/io.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/calcurse.c b/src/calcurse.c index 00181b7..2588721 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -507,7 +507,7 @@ static inline void key_generic_cmd(void) topic_res = "intro"; snprintf(path, BUFSIZ, DOCDIR "/%s.txt", topic_res); - if (!io_file_exist(path) && keys_str2int(topic_res) > 0 && + if (!io_file_exists(path) && keys_str2int(topic_res) > 0 && keys_get_action(keys_str2int(topic_res)) > 0) { int ch = keys_str2int(topic_res); enum key action = keys_get_action(ch); @@ -515,7 +515,7 @@ static inline void key_generic_cmd(void) snprintf(path, BUFSIZ, DOCDIR "/%s.txt", topic_res); } - if (!io_file_exist(path)) { + if (!io_file_exists(path)) { if (!strcmp(topic_res, "generic-credits")) topic_res = "credits"; else if (!strcmp(topic_res, "generic-help")) @@ -598,7 +598,7 @@ static inline void key_generic_cmd(void) } - if (io_file_exist(path)) { + if (io_file_exists(path)) { wins_launch_external(path, conf.pager); } else { char error_msg[BUFSIZ]; diff --git a/src/calcurse.h b/src/calcurse.h index c595cdb..a433361 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -754,7 +754,7 @@ void io_load_app(void); void io_load_todo(void); void io_load_keys(const char *); int io_check_dir(const char *); -unsigned io_file_exist(const char *); +unsigned io_file_exists(const char *); int io_check_file(const char *); int io_check_data_files(void); void io_startup_screen(int); @@ -152,12 +152,12 @@ void dmon_start(int parent_exit_status) if (!io_dump_pid(path_dpid)) DMON_ABRT(_("Could not set lock file\n")); - if (!io_file_exist(path_conf)) + if (!io_file_exists(path_conf)) DMON_ABRT(_("Could not access \"%s\": %s\n"), path_conf, strerror(errno)); config_load(); - if (!io_file_exist(path_apts)) + if (!io_file_exists(path_apts)) DMON_ABRT(_("Could not access \"%s\": %s\n"), path_apts, strerror(errno)); apoint_llist_init(); @@ -872,7 +872,7 @@ int io_check_dir(const char *dir) } } -unsigned io_file_exist(const char *file) +unsigned io_file_exists(const char *file) { FILE *fd; @@ -890,7 +890,7 @@ int io_check_file(const char *file) return -1; errno = 0; - if (io_file_exist(file)) { + if (io_file_exists(file)) { return 1; } else { FILE *fd; |