--- src/usr.bin/ftp/Attic/ftp.c 2004/06/19 18:55:48 1.6 +++ src/usr.bin/ftp/Attic/ftp.c 2005/09/05 04:02:43 1.7 @@ -1,7 +1,3 @@ -/* $FreeBSD: src/usr.bin/ftp/ftp.c,v 1.28.2.5 2002/07/25 15:29:18 ume Exp $ */ -/* $DragonFly$ */ -/* $NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $ */ - /* * Copyright (c) 1985, 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -37,6 +33,7 @@ * @(#)ftp.c 8.6 (Berkeley) 10/27/94 * $NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $ * $FreeBSD: src/usr.bin/ftp/ftp.c,v 1.28.2.5 2002/07/25 15:29:18 ume Exp $ + * $DragonFly$ */ #include @@ -124,8 +121,7 @@ hookup(const char *host0, char *port) res = res0; if (res->ai_canonname) - (void) strncpy(hostnamebuf, res->ai_canonname, - sizeof(hostnamebuf)); + strncpy(hostnamebuf, res->ai_canonname, sizeof(hostnamebuf)); hostname = hostnamebuf; while (1) { /* @@ -161,7 +157,7 @@ hookup(const char *host0, char *port) { res = res->ai_next; if (res) { - (void)close(s); + close(s); continue; } warn("bind"); @@ -182,7 +178,7 @@ hookup(const char *host0, char *port) hname, sizeof(hname) - 1, NULL, 0, NI_NUMERICHOST); printf("Trying %s...\n", hname); - (void)close(s); + close(s); continue; } warn("connect"); @@ -210,9 +206,9 @@ hookup(const char *host0, char *port) if (cin == NULL || cout == NULL) { warnx("fdopen failed."); if (cin) - (void)fclose(cin); + fclose(cin); if (cout) - (void)fclose(cout); + fclose(cout); code = -1; goto bad; } @@ -220,9 +216,9 @@ hookup(const char *host0, char *port) printf("Connected to %s.\n", hostname); if (getreply(0) > 2) { /* read startup message from server */ if (cin) - (void)fclose(cin); + fclose(cin); if (cout) - (void)fclose(cout); + fclose(cout); code = -1; goto bad; } @@ -239,17 +235,16 @@ hookup(const char *host0, char *port) return (hostname); bad: - (void)close(s); + close(s); return ((char *)0); } void cmdabort(int notused) { - alarmtimer(0); putchar('\n'); - (void)fflush(stdout); + fflush(stdout); abrtflag++; if (ptflag) longjmp(ptabort, 1); @@ -274,7 +269,7 @@ command(const char *fmt, ...) vprintf(fmt, ap); va_end(ap); putchar('\n'); - (void)fflush(stdout); + fflush(stdout); } if (cout == NULL) { warnx("No control connection for command."); @@ -286,12 +281,12 @@ command(const char *fmt, ...) vfprintf(cout, fmt, ap); va_end(ap); fputs("\r\n", cout); - (void)fflush(cout); + fflush(cout); cpend = 1; r = getreply(!strcmp(fmt, "QUIT")); if (abrtflag && oldintr != SIG_IGN) (*oldintr)(SIGINT); - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); return (r); } @@ -319,13 +314,13 @@ getreply(int expecteof) case WONT: c = getc(cin); fprintf(cout, "%c%c%c", IAC, DONT, c); - (void)fflush(cout); + fflush(cout); break; case DO: case DONT: c = getc(cin); fprintf(cout, "%c%c%c", IAC, WONT, c); - (void)fflush(cout); + fflush(cout); break; default: break; @@ -335,7 +330,7 @@ getreply(int expecteof) dig++; if (c == EOF) { if (expecteof) { - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); code = 221; return (0); } @@ -343,7 +338,7 @@ getreply(int expecteof) if (verbose) { puts( "421 Service not available, remote server has closed connection."); - (void)fflush(stdout); + fflush(stdout); } code = 421; return (4); @@ -353,7 +348,7 @@ getreply(int expecteof) if (proxflag && (dig == 1 || (dig == 5 && verbose == 0))) printf("%s:", hostname); - (void)putchar(c); + putchar(c); } if (dig < 4 && isdigit((unsigned char)c)) code = code * 10 + (c - '0'); @@ -399,8 +394,8 @@ getreply(int expecteof) *cp++ = c; } if (verbose > 0 || (verbose > -1 && n == '5')) { - (void)putchar(c); - (void)fflush (stdout); + putchar(c); + fflush(stdout); } if (line == 0) { size_t len = cp - current_line; @@ -408,7 +403,7 @@ getreply(int expecteof) if (len > sizeof(reply_string)) len = sizeof(reply_string); - (void)strncpy(reply_string, current_line, len); + strncpy(reply_string, current_line, len); reply_string[len] = '\0'; } if (continuation && code != originalcode) { @@ -419,7 +414,7 @@ getreply(int expecteof) *cp = '\0'; if (n != '1') cpend = 0; - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); if (code == 421 || originalcode == 421) lostpeer(); if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN) @@ -443,12 +438,11 @@ jmp_buf sendabort; void abortsend(int notused) { - alarmtimer(0); mflag = 0; abrtflag = 0; puts("\nsend aborted\nwaiting for remote to finish abort."); - (void)fflush(stdout); + fflush(stdout); longjmp(sendabort, 1); } @@ -467,16 +461,6 @@ sendrequest(const char *cmd, const char static size_t bufsize; static char *buf; -#ifdef __GNUC__ /* XXX: to shut up gcc warnings */ - (void)&fin; - (void)&dout; - (void)&closefunc; - (void)&oldinti; - (void)&oldintr; - (void)&oldintp; - (void)&lmode; -#endif - hashbytes = mark; direction = "sent"; dout = NULL; @@ -502,18 +486,18 @@ sendrequest(const char *cmd, const char lmode = "w"; if (setjmp(sendabort)) { while (cpend) { - (void)getreply(0); + getreply(0); } if (data >= 0) { - (void)close(data); + close(data); data = -1; } if (oldintr) - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); if (oldintp) - (void)signal(SIGPIPE, oldintp); + signal(SIGPIPE, oldintp); if (oldinti) - (void)signal(SIGINFO, oldinti); + signal(SIGINFO, oldinti); code = -1; goto cleanupsend; } @@ -527,9 +511,9 @@ sendrequest(const char *cmd, const char fin = popen(local + 1, "r"); if (fin == NULL) { warn("%s", local + 1); - (void)signal(SIGINT, oldintr); - (void)signal(SIGPIPE, oldintp); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGPIPE, oldintp); + signal(SIGINFO, oldinti); code = -1; goto cleanupsend; } @@ -539,16 +523,16 @@ sendrequest(const char *cmd, const char fin = fopen(local, "r"); if (fin == NULL) { warn("local: %s", local); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); code = -1; goto cleanupsend; } closefunc = fclose; if (fstat(fileno(fin), &st) < 0 || !S_ISREG(st.st_mode)) { printf("%s: not a plain file.\n", local); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); fclose(fin); code = -1; goto cleanupsend; @@ -556,10 +540,10 @@ sendrequest(const char *cmd, const char filesize = st.st_size; } if (initconn()) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); if (oldintp) - (void)signal(SIGPIPE, oldintp); + signal(SIGPIPE, oldintp); code = -1; if (closefunc != NULL) (*closefunc)(fin); @@ -569,7 +553,7 @@ sendrequest(const char *cmd, const char st.st_blksize = BUFSIZ; if (st.st_blksize > bufsize) { if (buf) - (void)free(buf); + free(buf); buf = malloc((unsigned)st.st_blksize); if (buf == NULL) { warn("malloc"); @@ -611,20 +595,20 @@ sendrequest(const char *cmd, const char } if (remote) { if (command("%s %s", cmd, remote) != PRELIM) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); if (oldintp) - (void)signal(SIGPIPE, oldintp); + signal(SIGPIPE, oldintp); if (closefunc != NULL) (*closefunc)(fin); goto cleanupsend; } } else if (command("%s", cmd) != PRELIM) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); if (oldintp) - (void)signal(SIGPIPE, oldintp); + signal(SIGPIPE, oldintp); if (closefunc != NULL) (*closefunc)(fin); goto cleanupsend; @@ -646,17 +630,17 @@ sendrequest(const char *cmd, const char break; if (hash && (!progress || filesize < 0) ) { while (bytes >= hashbytes) { - (void)putchar('#'); + putchar('#'); hashbytes += mark; } - (void)fflush(stdout); + fflush(stdout); } } if (hash && (!progress || filesize < 0) && bytes > 0) { if (bytes < mark) - (void)putchar('#'); - (void)putchar('\n'); - (void)fflush(stdout); + putchar('#'); + putchar('\n'); + fflush(stdout); } if (c < 0) warn("local: %s", local); @@ -672,29 +656,29 @@ sendrequest(const char *cmd, const char if (c == '\n') { while (hash && (!progress || filesize < 0) && (bytes >= hashbytes)) { - (void)putchar('#'); - (void)fflush(stdout); + putchar('#'); + fflush(stdout); hashbytes += mark; } if (ferror(dout)) break; - (void)putc('\r', dout); + putc('\r', dout); bytes++; } - (void)putc(c, dout); + putc(c, dout); bytes++; #if 0 /* this violates RFC */ if (c == '\r') { - (void)putc('\0', dout); + putc('\0', dout); bytes++; } #endif } if (hash && (!progress || filesize < 0)) { if (bytes < hashbytes) - (void)putchar('#'); - (void)putchar('\n'); - (void)fflush(stdout); + putchar('#'); + putchar('\n'); + fflush(stdout); } if (ferror(fin)) warn("local: %s", local); @@ -708,31 +692,31 @@ sendrequest(const char *cmd, const char progressmeter(1); if (closefunc != NULL) (*closefunc)(fin); - (void)fclose(dout); - (void)getreply(0); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + fclose(dout); + getreply(0); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); if (oldintp) - (void)signal(SIGPIPE, oldintp); + signal(SIGPIPE, oldintp); if (bytes > 0) ptransfer(0); goto cleanupsend; abort: - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); if (oldintp) - (void)signal(SIGPIPE, oldintp); + signal(SIGPIPE, oldintp); if (!cpend) { code = -1; return; } if (data >= 0) { - (void)close(data); + close(data); data = -1; } if (dout) - (void)fclose(dout); - (void)getreply(0); + fclose(dout); + getreply(0); code = -1; if (closefunc != NULL && fin != NULL) (*closefunc)(fin); @@ -748,12 +732,11 @@ jmp_buf recvabort; void abortrecv(int notused) { - alarmtimer(0); mflag = 0; abrtflag = 0; puts("\nreceive aborted\nwaiting for remote to finish abort."); - (void)fflush(stdout); + fflush(stdout); longjmp(recvabort, 1); } @@ -775,16 +758,6 @@ recvrequest(const char *cmd, const char int oprogress; int opreserve; -#ifdef __GNUC__ /* XXX: to shut up gcc warnings */ - (void)&local; - (void)&fout; - (void)&din; - (void)&closefunc; - (void)&oldinti; - (void)&oldintr; - (void)&oldintp; -#endif - fout = NULL; din = NULL; oldinti = NULL; @@ -812,16 +785,16 @@ recvrequest(const char *cmd, const char tcrflag = !crflag && is_retr; if (setjmp(recvabort)) { while (cpend) { - (void)getreply(0); + getreply(0); } if (data >= 0) { - (void)close(data); + close(data); data = -1; } if (oldintr) - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); if (oldinti) - (void)signal(SIGINFO, oldinti); + signal(SIGINFO, oldinti); progress = oprogress; preserve = opreserve; code = -1; @@ -835,8 +808,8 @@ recvrequest(const char *cmd, const char if (errno != ENOENT && errno != EACCES) { warn("local: %s", local); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); code = -1; return; } @@ -847,30 +820,30 @@ recvrequest(const char *cmd, const char *dir = '/'; if (d < 0) { warn("local: %s", local); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); code = -1; return; } if (!runique && errno == EACCES && chmod(local, 0600) < 0) { warn("local: %s", local); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); code = -1; return; } if (runique && errno == EACCES && (local = gunique(local)) == NULL) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); code = -1; return; } } else if (runique && (local = gunique(local)) == NULL) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); code = -1; return; } @@ -884,8 +857,8 @@ recvrequest(const char *cmd, const char filesize = remotesize(remote, 0); } if (initconn()) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); code = -1; return; } @@ -896,14 +869,14 @@ recvrequest(const char *cmd, const char return; if (remote) { if (command("%s %s", cmd, remote) != PRELIM) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); return; } } else { if (command("%s", cmd) != PRELIM) { - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); return; } } @@ -936,7 +909,7 @@ recvrequest(const char *cmd, const char st.st_blksize = BUFSIZ; if (st.st_blksize > bufsize) { if (buf) - (void)free(buf); + free(buf); buf = malloc((unsigned)st.st_blksize); if (buf == NULL) { warn("malloc"); @@ -970,17 +943,17 @@ recvrequest(const char *cmd, const char bytes += c; if (hash && (!progress || filesize < 0)) { while (bytes >= hashbytes) { - (void)putchar('#'); + putchar('#'); hashbytes += mark; } - (void)fflush(stdout); + fflush(stdout); } } if (hash && (!progress || filesize < 0) && bytes > 0) { if (bytes < mark) - (void)putchar('#'); - (void)putchar('\n'); - (void)fflush(stdout); + putchar('#'); + putchar('\n'); + fflush(stdout); } if (c < 0) { if (errno != EPIPE) @@ -1025,15 +998,15 @@ done: while (c == '\r') { while (hash && (!progress || filesize < 0) && (bytes >= hashbytes)) { - (void)putchar('#'); - (void)fflush(stdout); + putchar('#'); + fflush(stdout); hashbytes += mark; } bytes++; if ((c = getc(din)) != '\n' || tcrflag) { if (ferror(fout)) goto break2; - (void)putc('\r', fout); + putc('\r', fout); if (c == '\0') { bytes++; goto contin2; @@ -1042,7 +1015,7 @@ done: goto contin2; } } - (void)putc(c, fout); + putc(c, fout); bytes++; contin2: ; } @@ -1054,9 +1027,9 @@ break2: } if (hash && (!progress || filesize < 0)) { if (bytes < hashbytes) - (void)putchar('#'); - (void)putchar('\n'); - (void)fflush(stdout); + putchar('#'); + putchar('\n'); + fflush(stdout); } if (ferror(din)) { if (errno != EPIPE) @@ -1072,20 +1045,19 @@ break2: preserve = opreserve; if (closefunc != NULL) (*closefunc)(fout); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); if (oldintp) - (void)signal(SIGPIPE, oldintp); - (void)fclose(din); - (void)getreply(0); + signal(SIGPIPE, oldintp); + fclose(din); + getreply(0); if (bytes >= 0 && is_retr) { if (bytes > 0) ptransfer(0); if (preserve && (closefunc == fclose)) { mtime = remotemodtime(remote, 0); if (mtime != -1) { - (void)gettimeofday(&tval[0], - (struct timezone *)0); + gettimeofday(&tval[0], (struct timezone *)0); tval[1].tv_sec = mtime; tval[1].tv_usec = 0; if (utimes(local, tval) == -1) { @@ -1105,29 +1077,29 @@ abort: progress = oprogress; preserve = opreserve; if (oldintp) - (void)signal(SIGPIPE, oldintp); - (void)signal(SIGINT, SIG_IGN); + signal(SIGPIPE, oldintp); + signal(SIGINT, SIG_IGN); if (!cpend) { code = -1; - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); return; } abort_remote(din); code = -1; if (data >= 0) { - (void)close(data); + close(data); data = -1; } if (closefunc != NULL && fout != NULL) (*closefunc)(fout); if (din) - (void)fclose(din); + fclose(din); if (bytes > 0) ptransfer(0); - (void)signal(SIGINT, oldintr); - (void)signal(SIGINFO, oldinti); + signal(SIGINT, oldintr); + signal(SIGINFO, oldinti); } /* @@ -1155,9 +1127,6 @@ initconn(void) #endif if (passivemode) { -#ifdef __GNUC__ /* XXX: to shut up gcc warnings */ - (void)&pasvcmd; -#endif data_addr = myctladdr; data = socket(data_addr.su_family, SOCK_STREAM, 0); if (data < 0) { @@ -1367,7 +1336,7 @@ noport: if (sendport) data_addr.su_port = 0; /* let system pick one */ if (data != -1) - (void)close(data); + close(data); data = socket(data_addr.su_family, SOCK_STREAM, 0); if (data < 0) { warn("socket"); @@ -1430,8 +1399,8 @@ noport: data_addr4.sin_len = sizeof(struct sockaddr_in); data_addr4.sin_family = AF_INET; data_addr4.sin_port = data_addr.su_port; - memcpy((caddr_t)&data_addr4.sin_addr, - (caddr_t)&data_addr.su_sin6.sin6_addr.s6_addr[12], + memcpy(&data_addr4.sin_addr, + &data_addr.su_sin6.sin6_addr.s6_addr[12], sizeof(struct in_addr)); daddr = (union sockunion *)&data_addr4; } else @@ -1511,7 +1480,7 @@ noport: #endif return (0); bad: - (void)close(data), data = -1; + close(data), data = -1; if (tmpno) sendport = 1; return (1); @@ -1531,10 +1500,10 @@ dataconn(const char *lmode) s = accept(data, (struct sockaddr *) &from, &fromlen); if (s < 0) { warn("accept"); - (void)close(data), data = -1; + close(data), data = -1; return (NULL); } - (void)close(data); + close(data); data = s; #ifdef IP_TOS if (data_addr.su_family == AF_INET) @@ -1550,7 +1519,6 @@ dataconn(const char *lmode) void psummary(int notused) { - if (bytes > 0) ptransfer(1); } @@ -1558,7 +1526,6 @@ psummary(int notused) void psabort(int notused) { - alarmtimer(0); abrtflag++; } @@ -1607,7 +1574,7 @@ pswitch(int flag) ip->connect = connected; connected = op->connect; if (hostname) { - (void)strncpy(ip->name, hostname, sizeof(ip->name) - 1); + strncpy(ip->name, hostname, sizeof(ip->name) - 1); ip->name[sizeof(ip->name) - 1] = '\0'; } else ip->name[0] = '\0'; @@ -1634,21 +1601,21 @@ pswitch(int flag) mcase = op->mcse; ip->ntflg = ntflag; ntflag = op->ntflg; - (void)strncpy(ip->nti, ntin, sizeof(ip->nti) - 1); + strncpy(ip->nti, ntin, sizeof(ip->nti) - 1); (ip->nti)[sizeof(ip->nti) - 1] = '\0'; - (void)strcpy(ntin, op->nti); - (void)strncpy(ip->nto, ntout, sizeof(ip->nto) - 1); + strcpy(ntin, op->nti); + strncpy(ip->nto, ntout, sizeof(ip->nto) - 1); (ip->nto)[sizeof(ip->nto) - 1] = '\0'; - (void)strcpy(ntout, op->nto); + strcpy(ntout, op->nto); ip->mapflg = mapflag; mapflag = op->mapflg; - (void)strncpy(ip->mi, mapin, sizeof(ip->mi) - 1); + strncpy(ip->mi, mapin, sizeof(ip->mi) - 1); (ip->mi)[sizeof(ip->mi) - 1] = '\0'; - (void)strcpy(mapin, op->mi); - (void)strncpy(ip->mo, mapout, sizeof(ip->mo) - 1); + strcpy(mapin, op->mi); + strncpy(ip->mo, mapout, sizeof(ip->mo) - 1); (ip->mo)[sizeof(ip->mo) - 1] = '\0'; - (void)strcpy(mapout, op->mo); - (void)signal(SIGINT, oldintr); + strcpy(mapout, op->mo); + signal(SIGINT, oldintr); if (abrtflag) { abrtflag = 0; (*oldintr)(SIGINT); @@ -1658,10 +1625,9 @@ pswitch(int flag) void abortpt(int notused) { - alarmtimer(0); putchar('\n'); - (void)fflush(stdout); + fflush(stdout); ptabflg++; mflag = 0; abrtflag = 0; @@ -1677,11 +1643,6 @@ proxtrans(const char *cmd, const char *l char *cmd2; fd_set mask; -#ifdef __GNUC__ /* XXX: to shut up gcc warnings */ - (void)&oldintr; - (void)&cmd2; -#endif - oldintr = NULL; secndflag = 0; if (strcmp(cmd, "RETR")) @@ -1719,7 +1680,7 @@ proxtrans(const char *cmd, const char *l goto abort; oldintr = signal(SIGINT, abortpt); if (command("%s %s", cmd, remote) != PRELIM) { - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); pswitch(1); return; } @@ -1729,16 +1690,16 @@ proxtrans(const char *cmd, const char *l if (command("%s %s", cmd2, local) != PRELIM) goto abort; ptflag++; - (void)getreply(0); + getreply(0); pswitch(0); - (void)getreply(0); - (void)signal(SIGINT, oldintr); + getreply(0); + signal(SIGINT, oldintr); pswitch(1); ptflag = 0; printf("local: %s remote: %s\n", local, remote); return; abort: - (void)signal(SIGINT, SIG_IGN); + signal(SIGINT, SIG_IGN); ptflag = 0; if (strcmp(cmd, "RETR") && !proxy) pswitch(1); @@ -1753,7 +1714,7 @@ abort: pswitch(1); if (ptabflg) code = -1; - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); return; } if (cpend) @@ -1767,7 +1728,7 @@ abort: pswitch(1); if (ptabflg) code = -1; - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); return; } } @@ -1785,15 +1746,15 @@ abort: code = -1; lostpeer(); } - (void)getreply(0); - (void)getreply(0); + getreply(0); + getreply(0); } if (proxy) pswitch(0); pswitch(1); if (ptabflg) code = -1; - (void)signal(SIGINT, oldintr); + signal(SIGINT, oldintr); } void @@ -1811,7 +1772,7 @@ reset(int argc, char **argv) lostpeer(); } else if (nfnd) { - (void)getreply(0); + getreply(0); } } } @@ -1833,7 +1794,7 @@ gunique(const char *local) warn("local: %s", local); return ((char *) 0); } - (void)strcpy(new, local); + strcpy(new, local); cp = new + strlen(new); *cp++ = '.'; while (!d) { @@ -1883,7 +1844,7 @@ abort_remote(FILE *din) if (send(fileno(cout), buf, 3, MSG_OOB) != 3) warn("abort"); fprintf(cout, "%cABOR\r\n", DM); - (void)fflush(cout); + fflush(cout); FD_ZERO(&mask); FD_SET(fileno(cin), &mask); if (din) { @@ -1903,9 +1864,9 @@ abort_remote(FILE *din) } if (getreply(0) == ERROR && code == 552) { /* 552 needed for nic style abort */ - (void)getreply(0); + getreply(0); } - (void)getreply(0); + getreply(0); } void