diff options
Diffstat (limited to 'Src/Modules/zftp.c')
| -rw-r--r-- | Src/Modules/zftp.c | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 45e04d4f8..c150f8b62 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -582,7 +582,7 @@ zfgetline(char *ln, int lnsize, int tmout) if (setjmp(zfalrmbuf)) { alarm(0); - zwarnnam("zftp", "timeout getting response", NULL, 0); + zwarnnam("zftp", "timeout getting response"); return 6; } zfalarm(tmout); @@ -792,7 +792,7 @@ zfgetmsg(void) zcfinish = 2; /* don't need to tell server */ zfclose(0); /* unexpected, so tell user */ - zwarnnam("zftp", "remote server has closed connection", NULL, 0); + zwarnnam("zftp", "remote server has closed connection"); return 6; } if (lastcode == 530) { @@ -805,7 +805,7 @@ zfgetmsg(void) * It means we just hang around waiting for another reply. */ if (lastcode == 120) { - zwarnnam("zftp", "delay expected, waiting: %s", lastmsg, 0); + zwarnnam("zftp", "delay expected, waiting: %s", lastmsg); return zfgetmsg(); } @@ -836,7 +836,7 @@ zfsendcmd(char *cmd) tmout = getiparam("ZFTP_TMOUT"); if (setjmp(zfalrmbuf)) { alarm(0); - zwarnnam("zftp", "timeout sending message", NULL, 0); + zwarnnam("zftp", "timeout sending message"); return 6; } zfalarm(tmout); @@ -844,8 +844,7 @@ zfsendcmd(char *cmd) alarm(0); if (ret <= 0) { - zwarnnam("zftp send", "failure sending control message: %e", - NULL, errno); + zwarnnam("zftp send", "failure sending control message: %e", errno); return 6; } @@ -860,12 +859,12 @@ static int zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) { if (!(zfprefs & (ZFPF_SNDP|ZFPF_PASV))) { - zwarnnam(name, "Must set preference S or P to transfer data", NULL, 0); + zwarnnam(name, "Must set preference S or P to transfer data"); return 1; } zfsess->dfd = socket(zfsess->control->peer.a.sa_family, SOCK_STREAM, 0); if (zfsess->dfd < 0) { - zwarnnam(name, "can't get data socket: %e", NULL, errno); + zwarnnam(name, "can't get data socket: %e", errno); return 1; } @@ -900,7 +899,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) ptr = strchr(lastmsg, '('); if(!ptr) { bad_epsv: - zwarnnam(name, "bad response to EPSV: %s", lastmsg, 0); + zwarnnam(name, "bad response to EPSV: %s", lastmsg); zfclosedata(); return 1; } @@ -940,7 +939,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) break; if (sscanf(ptr, "%d,%d,%d,%d,%d,%d", nums, nums+1, nums+2, nums+3, nums+4, nums+5) != 6) { - zwarnnam(name, "bad response to PASV: %s", lastmsg, 0); + zwarnnam(name, "bad response to PASV: %s", lastmsg); zfclosedata(); return 1; } @@ -960,7 +959,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) } while (err && errno == EINTR && !errflag); if (err) { - zwarnnam(name, "connect failed: %e", NULL, errno); + zwarnnam(name, "connect failed: %e", errno); zfclosedata(); return 1; } @@ -976,7 +975,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) int ret; if (!(zfprefs & ZFPF_SNDP)) { - zwarnnam(name, "only sendport mode available for data", NULL, 0); + zwarnnam(name, "only sendport mode available for data"); return 1; } @@ -1027,7 +1026,7 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep) addr[0],addr[1],addr[2],addr[3],port[0],port[1]); } if (zfsendcmd(portcmd) >= 5) { - zwarnnam(name, "port command failed", NULL, 0); + zwarnnam(name, "port command failed"); zfclosedata(); return 1; } @@ -1129,7 +1128,7 @@ zfgetdata(char *name, char *rest, char *cmd, int getsize) newfd = zfmovefd(accept(zfsess->dfd, (struct sockaddr *)&zdsock, &len)); if (newfd < 0) - zwarnnam(name, "unable to accept data: %e", NULL, errno); + zwarnnam(name, "unable to accept data: %e", errno); zfclosedata(); if (newfd < 0) return 1; @@ -1320,7 +1319,7 @@ zfread(int fd, char *bf, off_t sz, int tmout) if (setjmp(zfalrmbuf)) { alarm(0); - zwarnnam("zftp", "timeout on network read", NULL, 0); + zwarnnam("zftp", "timeout on network read"); return -1; } zfalarm(tmout); @@ -1345,7 +1344,7 @@ zfwrite(int fd, char *bf, off_t sz, int tmout) if (setjmp(zfalrmbuf)) { alarm(0); - zwarnnam("zftp", "timeout on network write", NULL, 0); + zwarnnam("zftp", "timeout on network write"); return -1; } zfalarm(tmout); @@ -1375,7 +1374,7 @@ zfread_block(int fd, char *bf, off_t sz, int tmout) n = zfread(fd, (char *)&hdr, sizeof(hdr), tmout); } while (n < 0 && errno == EINTR); if (n != 3 && !zfdrrrring) { - zwarnnam("zftp", "failure reading FTP block header", NULL, 0); + zwarnnam("zftp", "failure reading FTP block header"); return n; } /* size is stored in network byte order */ @@ -1386,7 +1385,7 @@ zfread_block(int fd, char *bf, off_t sz, int tmout) /* * See comments in file headers */ - zwarnnam("zftp", "block too large to handle", NULL, 0); + zwarnnam("zftp", "block too large to handle"); errno = EIO; return -1; } @@ -1403,7 +1402,7 @@ zfread_block(int fd, char *bf, off_t sz, int tmout) break; } if (cnt) { - zwarnnam("zftp", "short data block", NULL, 0); + zwarnnam("zftp", "short data block"); errno = EIO; return -1; } @@ -1429,7 +1428,7 @@ zfwrite_block(int fd, char *bf, off_t sz, int tmout) n = zfwrite(fd, (char *)&hdr, sizeof(hdr), tmout); } while (n < 0 && errno == EINTR); if (n != 3 && !zfdrrrring) { - zwarnnam("zftp", "failure writing FTP block header", NULL, 0); + zwarnnam("zftp", "failure writing FTP block header"); return n; } bfptr = bf; @@ -1586,7 +1585,7 @@ zfsenddata(char *name, int recv, int progress, off_t startat) if (!zfdrrrring && (!interact || (!errflag && errno != EPIPE))) { ret = recv ? 2 : 1; - zwarnnam(name, "write failed: %e", NULL, errno); + zwarnnam(name, "write failed: %e", errno); } else ret = recv ? 3 : 1; break; @@ -1601,7 +1600,7 @@ zfsenddata(char *name, int recv, int progress, off_t startat) if (!zfdrrrring && (!interact || (!errflag && errno != EPIPE))) { ret = recv ? 1 : 2; - zwarnnam(name, "read failed: %e", NULL, errno); + zwarnnam(name, "read failed: %e", errno); } else ret = recv ? 1 : 3; break; @@ -1649,7 +1648,7 @@ zfsenddata(char *name, int recv, int progress, off_t startat) unsigned char msg[4] = { IAC, IP, IAC, SYNCH }; if (ret == 2) - zwarnnam(name, "aborting data transfer...", NULL, 0); + zwarnnam(name, "aborting data transfer..."); holdintr(); @@ -1709,7 +1708,7 @@ zftp_open(char *name, char **args, int flags) if (zfsess->userparams) args = zfsess->userparams; else { - zwarnnam(name, "no host specified", NULL, 0); + zwarnnam(name, "no host specified"); return 1; } } @@ -1731,7 +1730,7 @@ zftp_open(char *name, char **args, int flags) hostnam++; hostsuffix = strchr(hostnam, ']'); if (!hostsuffix || (hostsuffix[1] && hostsuffix[1] != ':')) { - zwarnnam(name, "Invalid host format: %s", hostnam, 0); + zwarnnam(name, "Invalid host format: %s", hostnam); return 1; } *hostsuffix++ = '\0'; @@ -1761,8 +1760,7 @@ zftp_open(char *name, char **args, int flags) /* this is going to give 0. why bother? */ zprotop = getprotobyname("tcp"); if (!zprotop) { - zwarnnam(name, "Can't find protocol TCP (is your network functional)?", - NULL, 0); + zwarnnam(name, "Can't find protocol TCP (is your network functional)?"); return 1; } if (port < 0) @@ -1771,7 +1769,7 @@ zftp_open(char *name, char **args, int flags) zservp = getservbyport(port, "tcp"); if (!zprotop || !zservp) { - zwarnnam(name, "Can't find port for service `%s'", portnam, 0); + zwarnnam(name, "Can't find port for service `%s'", portnam); return 1; } @@ -1788,9 +1786,9 @@ zftp_open(char *name, char **args, int flags) alarm(0); queue_signals(); if ((hname = getsparam("ZFTP_HOST")) && *hname) - zwarnnam(name, "timeout connecting to %s", hname, 0); + zwarnnam(name, "timeout connecting to %s", hname); else - zwarnnam(name, "timeout on host name lookup", NULL, 0); + zwarnnam(name, "timeout on host name lookup"); unqueue_signals(); zfclose(0); return 1; @@ -1818,7 +1816,7 @@ zftp_open(char *name, char **args, int flags) * on the other hand, herror() is obsolete */ FAILED(); - zwarnnam(name, "host not found: %s", hostnam, 0); + zwarnnam(name, "host not found: %s", hostnam); alarm(0); return 1; } @@ -1851,7 +1849,7 @@ zftp_open(char *name, char **args, int flags) zfunsetparam("ZFTP_HOST"); zfunsetparam("ZFTP_PORT"); FAILED(); - zwarnnam(name, "socket failed: %e", NULL, errno); + zwarnnam(name, "socket failed: %e", errno); alarm(0); return 1; } @@ -1868,7 +1866,7 @@ zftp_open(char *name, char **args, int flags) /* try all possible IP's */ for (addrp = zhostp->h_addr_list; err && *addrp; addrp++) { if(hlen != zhostp->h_length) - zwarnnam(name, "address length mismatch", NULL, 0); + zwarnnam(name, "address length mismatch"); do { err = tcp_connect(zfsess->control, *addrp, zhostp, zservp->s_port); } while (err && errno == EINTR && !errflag); @@ -1879,7 +1877,7 @@ zftp_open(char *name, char **args, int flags) freehostent(zhostp); zfclose(0); FAILED(); - zwarnnam(name, "connect failed: %e", NULL, errno); + zwarnnam(name, "connect failed: %e", errno); alarm(0); return 1; } @@ -1914,7 +1912,7 @@ zftp_open(char *name, char **args, int flags) len = sizeof(zfsess->control->sock); if (getsockname(zfsess->control->fd, (struct sockaddr *)&zfsess->control->sock, &len) < 0) { - zwarnnam(name, "getsockname failed: %e", NULL, errno); + zwarnnam(name, "getsockname failed: %e", errno); zfclose(0); return 1; } @@ -1941,7 +1939,7 @@ zftp_open(char *name, char **args, int flags) zfsess->cin = fdopen(zfsess->control->fd, "r"); if (!zfsess->cin) { - zwarnnam(name, "file handling error", NULL, 0); + zwarnnam(name, "file handling error"); zfclose(0); return 1; } @@ -2190,7 +2188,7 @@ zftp_login(char *name, char **args, UNUSED(int flags)) if (!zfsess->control) return 1; if (stopit == 2 || (lastcode != 230 && lastcode != 202)) { - zwarnnam(name, "login failed", NULL, 0); + zwarnnam(name, "login failed"); return 1; } @@ -2198,7 +2196,7 @@ zftp_login(char *name, char **args, UNUSED(int flags)) int cnt; for (cnt = 0; *args; args++) cnt++; - zwarnnam(name, "warning: %d comand arguments not used\n", NULL, cnt); + zwarnnam(name, "warning: %d comand arguments not used\n", cnt); } zfstatusp[zfsessno] |= ZFST_LOGI; zfsetparam("ZFTP_USER", ztrdup(user), ZFPM_READONLY); @@ -2299,7 +2297,7 @@ zftp_test(UNUSED(char *name), UNUSED(char **args), UNUSED(int flags)) /* if we have no zfsess->control, then we've just been dumped out. */ return zfsess->control ? 0 : 2; #else - zfwarnnam(name, "not supported on this system.", NULL, 0); + zfwarnnam(name, "not supported on this system."); return 3; #endif /* defined(HAVE_POLL) || defined(HAVE_SELECT) */ } @@ -2451,7 +2449,7 @@ zftp_type(char *name, char **args, int flags) * ones we know what to do with. */ if (str[1] || (nt != 'A' && nt != 'B' && nt != 'I')) { - zwarnnam(name, "transfer type %s not recognised", str, 0); + zwarnnam(name, "transfer type %s not recognised", str); return 1; } @@ -2481,7 +2479,7 @@ zftp_mode(char *name, char **args, UNUSED(int flags)) } nt = str[0] = toupper(STOUC(*str)); if (str[1] || (nt != 'S' && nt != 'B')) { - zwarnnam(name, "transfer mode %s not recognised", str, 0); + zwarnnam(name, "transfer mode %s not recognised", str); return 1; } cmd[5] = (char) nt; @@ -3017,7 +3015,7 @@ bin_zftp(char *name, char **args, UNUSED(Options ops), UNUSED(int func)) break; if (!zptr->nam) { - zwarnnam(name, "no such subcommand: %s", cnam, 0); + zwarnnam(name, "no such subcommand: %s", cnam); return 1; } @@ -3025,7 +3023,7 @@ bin_zftp(char *name, char **args, UNUSED(Options ops), UNUSED(int func)) for (n = 0; args[n]; n++) ; if (n < zptr->min || (zptr->max != -1 && n > zptr->max)) { - zwarnnam(name, "wrong no. of arguments for %s", cnam, 0); + zwarnnam(name, "wrong no. of arguments for %s", cnam); return 1; } @@ -3072,7 +3070,7 @@ bin_zftp(char *name, char **args, UNUSED(Options ops), UNUSED(int func)) * with ret == 2, we just got dumped out in the test, * so enough messages already. */ - zwarnnam(fullname, "not connected.", NULL, 0); + zwarnnam(fullname, "not connected."); } return 1; } @@ -3103,7 +3101,7 @@ bin_zftp(char *name, char **args, UNUSED(Options ops), UNUSED(int func)) break; default: - zwarnnam(name, "preference %c not recognized", NULL, *ptr); + zwarnnam(name, "preference %c not recognized", *ptr); break; } } |