diff options
author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2020-11-03 19:28:19 +0100 |
---|---|---|
committer | Lukas Fleischer <lfleischer@calcurse.org> | 2020-11-07 19:50:23 -0500 |
commit | 97df01b534ac5616f39c1a1ffff8fc8e3e7927f9 (patch) | |
tree | 327ca724f3aac97de14180ce63f522b1371d5199 /src/args.c | |
parent | d126696999966ebb2456603b047c3950fa4a4eac (diff) | |
download | calcurse-97df01b534ac5616f39c1a1ffff8fc8e3e7927f9.tar.gz calcurse-97df01b534ac5616f39c1a1ffff8fc8e3e7927f9.zip |
Return failure if import skips any item
Other items may have been imported succesfully.
Adresses Github issue #323, last part.
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src/args.c')
-rw-r--r-- | src/args.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -428,7 +428,7 @@ int parse_args(int argc, char **argv) const char *cfile = NULL, *confdir = NULL; char *ifile = NULL; - int non_interactive = 1; + int ret, non_interactive = 1; int ch, cpid, type; regex_t reg; char buf[BUFSIZ]; @@ -963,10 +963,12 @@ int parse_args(int argc, char **argv) fmt_apt = fmt_rapt = fmt_ev = fmt_rev = NULL; fmt_todo = NULL; } - io_import_data(IO_IMPORT_ICAL, ifile, fmt_ev, fmt_rev, fmt_apt, - fmt_rapt, fmt_todo); + ret = io_import_data(IO_IMPORT_ICAL, ifile, fmt_ev, fmt_rev, + fmt_apt, fmt_rapt, fmt_todo); io_save_apts(path_apts); io_save_todo(path_todo); + if (!ret) + exit_calcurse(EXIT_FAILURE); } else if (export) { io_check_file(path_apts); io_check_file(path_todo); |