master
Sergey Dorofeev 11 years ago
parent cd74def9c6
commit 6b84f75a60

@ -977,7 +977,7 @@ case BPMSG_GET: /* Get a file from offset */
if( bstate->pi->send ) { if( bstate->pi->send ) {
DEB((D_24554, "aborting current file")); DEB((D_24554, "aborting current file"));
p_tx_fclose(bstate->pi); //p_tx_fclose(bstate->pi); may be requested again
} }
s_filehint hint; s_filehint hint;

@ -627,7 +627,7 @@ long int p_tx_readfile(char *buffer, size_t buflen, s_protinfo *pi)
pi->send->bytes_received = ftell_pos; pi->send->bytes_received = ftell_pos;
return -1; return -1;
} }
if( stat(pi->send->fname, &st) == -1 && errno == ENOENT ) if( stat(pi->send->fname, &st) == -1 && errno == ENOENT )
{ {
log("send: file not found! do you want to skip it?"); log("send: file not found! do you want to skip it?");

@ -85,6 +85,7 @@ int rx_zmodem(s_protinfo *pi, bool caller)
while(1) while(1)
{ {
DEB((D_PROT, "rx_zmodem: one more loop"));
if( timer_expired(deadtimer) ) if( timer_expired(deadtimer) )
{ {
DEB((D_PROT, "rx_zmodem: deadtimer = %ld", (long)deadtimer)); DEB((D_PROT, "rx_zmodem: deadtimer = %ld", (long)deadtimer));

@ -376,7 +376,7 @@ int call_system_modem(void)
else else
log("warning: no modem dial suffix defined"); log("warning: no modem dial suffix defined");
log("calling %s (%s, %s)", log("calling with modem %s (%s, %s)",
ftn_addrstr(abuf, state.node.addr), ftn_addrstr(abuf, state.node.addr),
(state.node.name && *state.node.name) ? state.node.name : "<none>", (state.node.name && *state.node.name) ? state.node.name : "<none>",
string_printable(dialstring)); string_printable(dialstring));
@ -516,7 +516,7 @@ defalt:
return BFERR_FATALERROR; return BFERR_FATALERROR;
} }
log("calling %s (%s, %s)", log("calling with internet %s (%s, %s)",
ftn_addrstr(abuf, state.node.addr), ftn_addrstr(abuf, state.node.addr),
(state.node.name && *state.node.name ) ? state.node.name : "<none>", (state.node.name && *state.node.name ) ? state.node.name : "<none>",
(state.node.host && *state.node.host) ? state.node.host : "<none>"); (state.node.host && *state.node.host) ? state.node.host : "<none>");

Loading…
Cancel
Save