Handle zip not installed gracefully

This commit is contained in:
Andrew Pamment
2018-02-09 19:35:14 +10:00
parent aa0c3234ae
commit c2b956c13a
4 changed files with 18 additions and 6 deletions

View File

@@ -313,7 +313,8 @@ void bwave_create_packet() {
FILE *inf_file;
int tot_areas = 0;
int totmsgs = 0;
int ret;
for (i=0;i<conf.mail_conference_count;i++) {
for (j=0;j<conf.mail_conferences[i]->mail_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);

View File

@@ -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: