diff --git a/STRINGS.CHANGES b/STRINGS.CHANGES index fff2b32..0c8b7ad 100644 --- a/STRINGS.CHANGES +++ b/STRINGS.CHANGES @@ -4,6 +4,12 @@ If you are using your own custom strings file, you will need to add / modify the new string on the line specified. Be sure to remove the start and end quotation marks. +Changes from v0.9-alpha -> v0.10-alpha +-------------------------------------------------------------- + +LINE: 275 NEW +OLDSTRING: (NONE) +NEWSTRING: \r\n\e[1;31mError executing archiver.\r\n\e[0m Changes from v0.8-alpha -> v0.9-alpha -------------------------------------------------------------- diff --git a/dist/magicka.strings b/dist/magicka.strings index 5b7b778..9131aa4 100644 --- a/dist/magicka.strings +++ b/dist/magicka.strings @@ -272,3 +272,4 @@ File exists!\r\n \e[24;1H\e[1;37;44mUp / Down to Select, A to Add, D to Delete, Q to Quit\e[K \e[8;28H\e[1;31;40mNo BBSes in the list! \e[10;22H\e[1;37mPress \e[1;33mA \e[1;37m to Add yours or \e[1;33mQ \e[1;37mto Quit\e[0m +\r\n\e[1;31mError executing archiver.\r\n\e[0m diff --git a/src/bluewave.c b/src/bluewave.c index 0e2274a..185fabd 100644 --- a/src/bluewave.c +++ b/src/bluewave.c @@ -313,7 +313,8 @@ void bwave_create_packet() { FILE *inf_file; int tot_areas = 0; int totmsgs = 0; - + int ret; + for (i=0;imail_area_count;j++) { if (msgbase_is_subscribed(i, j)) { @@ -528,7 +529,8 @@ void bwave_create_packet() { dup2(bbs_stderr, STDERR_FILENO); dup2(bbs_stdin, STDIN_FILENO); } - system(buffer); + + ret = system(buffer); if (sshBBS) { @@ -541,8 +543,11 @@ void bwave_create_packet() { close(sterr); } - - do_download(gUser, archive); + if (ret != -1 && ret >> 8 != 127) { + do_download(gUser, archive); + } else { + s_printf(get_string(274)); + } snprintf(buffer, 1024, "%s/node%d/bwave", conf.bbs_path, mynode); recursive_delete(buffer); diff --git a/src/files.c b/src/files.c index 2c313b8..f110028 100644 --- a/src/files.c +++ b/src/files.c @@ -846,11 +846,11 @@ void download_zmodem(struct user_record *user, char *filename) { break ; case ZmErrCantOpen: - dolog("cannot open file \"%s\": %s\n", filename, strerror(errno)) ; + dolog("cannot open file \"%s\": %s", filename, strerror(errno)) ; return; case ZmFileTooLong: - dolog("filename \"%s\" too long, skipping...\n", filename) ; + dolog("filename \"%s\" too long, skipping...", filename) ; return; case ZmDone: