bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle zip not installed gracefully

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STRINGS.CHANGES
View File

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

1
dist/magicka.strings vendored
View File

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

13
src/bluewave.c
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);

4
src/files.c
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: