Skip to content
Snippets Groups Projects
Commit cc56fd5e authored by rswindell's avatar rswindell
Browse files

Send ZFIN, even after failed sends.

parent c5552cdf
No related branches found
No related tags found
No related merge requests found
...@@ -764,8 +764,6 @@ static int send_files(char** fname, uint fnames) ...@@ -764,8 +764,6 @@ static int send_files(char** fname, uint fnames)
xm.sent_bytes+=fsize; xm.sent_bytes+=fsize;
lprintf(LOG_INFO,"Successful - Time: %lu:%02lu CPS: %lu" lprintf(LOG_INFO,"Successful - Time: %lu:%02lu CPS: %lu"
,t/60,t%60,cps); ,t/60,t%60,cps);
} else
lprintf(LOG_WARNING,"File Transfer Failure");
if(xm.total_files-xm.sent_files) if(xm.total_files-xm.sent_files)
lprintf(LOG_INFO,"Remaining - Time: %lu:%02lu Files: %u KBytes: %lu" lprintf(LOG_INFO,"Remaining - Time: %lu:%02lu Files: %u KBytes: %lu"
...@@ -774,6 +772,8 @@ static int send_files(char** fname, uint fnames) ...@@ -774,6 +772,8 @@ static int send_files(char** fname, uint fnames)
,xm.total_files-xm.sent_files ,xm.total_files-xm.sent_files
,(xm.total_bytes-xm.sent_bytes)/1024 ,(xm.total_bytes-xm.sent_bytes)/1024
); );
} else
lprintf(LOG_WARNING,"File Transfer Failure");
/* DSZLOG entry */ /* DSZLOG entry */
if(logfp) { if(logfp) {
...@@ -798,6 +798,10 @@ static int send_files(char** fname, uint fnames) ...@@ -798,6 +798,10 @@ static int send_files(char** fname, uint fnames)
if(gi<(int)g.gl_pathc)/* error occurred */ if(gi<(int)g.gl_pathc)/* error occurred */
break; break;
} }
if(mode&ZMODEM && !zm.cancelled)
zmodem_get_zfin(&zm);
if(fnum<fnames) /* error occurred */ if(fnum<fnames) /* error occurred */
return(-1); return(-1);
...@@ -806,9 +810,7 @@ static int send_files(char** fname, uint fnames) ...@@ -806,9 +810,7 @@ static int send_files(char** fname, uint fnames)
if(mode&XMODEM) if(mode&XMODEM)
return(0); return(0);
if(mode&ZMODEM) if(mode&YMODEM) {
zmodem_get_zfin(&zm);
else { /* YMODEM */
if(xmodem_get_mode(&xm)) { if(xmodem_get_mode(&xm)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment