gcc/lint fixes

SCCS-vsn: usr.bin/ftp/ftp.c 5.32

diff --git a/usr/src/usr.bin/ftp/ftp.c b/usr/src/usr.bin/ftp/ftp.c
index 7a4986b..2b2e2e0 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ftp.c      5.31 (Berkeley) %G%";
+static char sccsid[] = "@(#)ftp.c      5.32 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -45,13 +45,12 @@ struct      sockaddr_in data_addr;
 int    data = -1;
 int    abrtflag = 0;
 int    ptflag = 0;
 int    data = -1;
 int    abrtflag = 0;
 int    ptflag = 0;

-int    connected;

 struct sockaddr_in myctladdr;
 uid_t  getuid();
 sig_t  lostpeer();
 
 extern char *strerror();
 struct sockaddr_in myctladdr;
 uid_t  getuid();
 sig_t  lostpeer();
 
 extern char *strerror();

-extern int errno;
+extern int connected, errno;

 
 FILE   *cin, *cout;
 FILE   *dataconn();
 
 FILE   *cin, *cout;
 FILE   *dataconn();


@@ -149,7 +148,7 @@ hookup(host, port)
        {
        int on = 1;
 
        {
        int on = 1;
 

-       if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &on, sizeof(on))
+       if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&on, sizeof(on))

                < 0 && debug) {
                        perror("ftp: setsockopt");
                }
                < 0 && debug) {
                        perror("ftp: setsockopt");
                }


@@ -224,7 +223,7 @@ login(host)
        return (1);
 }
 
        return (1);
 }
 

-sig_t
+void

 cmdabort()
 {
        extern jmp_buf ptabort;
 cmdabort()
 {
        extern jmp_buf ptabort;


@@ -243,7 +242,8 @@ va_dcl
        va_list ap;
        char *fmt;
        int r;
        va_list ap;
        char *fmt;
        int r;

-       sig_t (*oldintr)(), cmdabort();
+       sig_t oldintr;
+       void cmdabort();

 
        abrtflag = 0;
        if (debug) {
 
        abrtflag = 0;
        if (debug) {


@@ -289,9 +289,10 @@ getreply(expecteof)
        register int dig;
        register char *cp;
        int originalcode = 0, continuation = 0;
        register int dig;
        register char *cp;
        int originalcode = 0, continuation = 0;

-       sig_t (*oldintr)(), cmdabort();
+       sig_t oldintr;

        int pflag = 0;
        char *pt = pasv;
        int pflag = 0;
        char *pt = pasv;

+       void cmdabort();

 
        oldintr = signal(SIGINT, cmdabort);
        for (;;) {
 
        oldintr = signal(SIGINT, cmdabort);
        for (;;) {


@@ -397,6 +398,7 @@ empty(mask, sec)
 
 jmp_buf        sendabort;
 
 
 jmp_buf        sendabort;
 

+void

 abortsend()
 {
 
 abortsend()
 {
 


@@ -413,16 +415,15 @@ sendrequest(cmd, local, remote, printnames)
        char *cmd, *local, *remote;
        int printnames;
 {
        char *cmd, *local, *remote;
        int printnames;
 {

+       struct stat st;
+       struct timeval start, stop;
+       register int c, d;

        FILE *fin, *dout = 0, *popen();
        int (*closefunc)(), pclose(), fclose();
        FILE *fin, *dout = 0, *popen();
        int (*closefunc)(), pclose(), fclose();

-       sig_t (*oldintr)(), (*oldintp)();
-       int abortsend();

        char buf[BUFSIZ], *bufp;
        long bytes = 0, hashbytes = HASHBYTES;
        char buf[BUFSIZ], *bufp;
        long bytes = 0, hashbytes = HASHBYTES;

-       register int c, d;
-       struct stat st;
-       struct timeval start, stop;
-       char *mode;
+       char *lmode, buf[BUFSIZ], *bufp;
+       void abortsend();

 
        if (verbose && printnames) {
                if (local && *local != '-')
 
        if (verbose && printnames) {
                if (local && *local != '-')


@@ -439,7 +440,7 @@ sendrequest(cmd, local, remote, printnames)
        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;
        closefunc = NULL;
        oldintr = NULL;
        oldintp = NULL;

-       mode = "w";
+       lmode = "w";

        if (setjmp(sendabort)) {
                while (cpend) {
                        (void) getreply(0);
        if (setjmp(sendabort)) {
                while (cpend) {
                        (void) getreply(0);


@@ -518,7 +519,7 @@ sendrequest(cmd, local, remote, printnames)
                                (*closefunc)(fin);
                        return;
                }
                                (*closefunc)(fin);
                        return;
                }

-       dout = dataconn(mode);
+       dout = dataconn(lmode);

        if (dout == NULL)
                goto abort;
        (void) gettimeofday(&start, (struct timezone *)0);
        if (dout == NULL)
                goto abort;
        (void) gettimeofday(&start, (struct timezone *)0);


@@ -634,7 +635,7 @@ abort:
 
 jmp_buf        recvabort;
 
 
 jmp_buf        recvabort;
 

-sig_t
+void

 abortrecv()
 {
 
 abortrecv()
 {
 


@@ -645,8 +646,8 @@ abortrecv()
        longjmp(recvabort, 1);
 }
 
        longjmp(recvabort, 1);
 }
 

-recvrequest(cmd, local, remote, mode, printnames)
-       char *cmd, *local, *remote, *mode;
+recvrequest(cmd, local, remote, lmode, printnames)
+       char *cmd, *local, *remote, *lmode;

 {
        FILE *fout, *din = 0, *popen();
        char *bufp, *gunique(), msg;
 {
        FILE *fout, *din = 0, *popen();
        char *bufp, *gunique(), msg;


@@ -657,7 +658,9 @@ recvrequest(cmd, local, remote, mode, printnames)
        register int c, d;
        struct timeval start, stop;
        struct stat st;
        register int c, d;
        struct timeval start, stop;
        struct stat st;

-       extern char *malloc();
+       off_t lseek();
+       void abortrecv();
+       char *malloc();

 
        is_retr = strcmp(cmd, "RETR") == 0;
        if (is_retr && verbose && printnames) {
 
        is_retr = strcmp(cmd, "RETR") == 0;
        if (is_retr && verbose && printnames) {


@@ -773,7 +776,7 @@ recvrequest(cmd, local, remote, mode, printnames)
                }
                closefunc = pclose;
        } else {
                }
                closefunc = pclose;
        } else {

-               fout = fopen(local, mode);
+               fout = fopen(local, lmode);

                if (fout == NULL) {
                        fprintf(stderr, "local: %s: %s\n", local,
                                strerror(errno));
                if (fout == NULL) {
                        fprintf(stderr, "local: %s: %s\n", local,
                                strerror(errno));


@@ -924,12 +927,9 @@ abort:
 }
 
 /*
 }
 
 /*

- * Need to start a listen on the data channel
- * before we send the command, otherwise the
- * server's connect may fail.
+ * Need to start a listen on the data channel before we send the command,
+ * otherwise the server's connect may fail.

  */
  */

-int sendport;
-

 initconn()
 {
        register char *p, *a;
 initconn()
 {
        register char *p, *a;


@@ -994,8 +994,8 @@ bad:
 }
 
 FILE *
 }
 
 FILE *

-dataconn(mode)
-       char *mode;
+dataconn(lmode)
+       char *lmode;

 {
        struct sockaddr_in from;
        int s, fromlen = sizeof (from);
 {
        struct sockaddr_in from;
        int s, fromlen = sizeof (from);


@@ -1008,7 +1008,7 @@ dataconn(mode)
        }
        (void) close(data);
        data = s;
        }
        (void) close(data);
        data = s;

-       return (fdopen(data, mode));
+       return (fdopen(data, lmode));

 }
 
 ptransfer(direction, bytes, t0, t1)
 }
 
 ptransfer(direction, bytes, t0, t1)


@@ -1049,7 +1049,7 @@ tvsub(tdiff, t1, t0)
                tdiff->tv_sec--, tdiff->tv_usec += 1000000;
 }
 
                tdiff->tv_sec--, tdiff->tv_usec += 1000000;
 }
 

-sig_t
+void

 psabort()
 {
        extern int abrtflag;
 psabort()
 {
        extern int abrtflag;


@@ -1061,7 +1061,7 @@ pswitch(flag)
        int flag;
 {
        extern int proxy, abrtflag;
        int flag;
 {
        extern int proxy, abrtflag;

-       sig_t (*oldintr)();
+       sig_t oldintr;

        static struct comvars {
                int connect;
                char name[MAXHOSTNAMELEN];
        static struct comvars {
                int connect;
                char name[MAXHOSTNAMELEN];


@@ -1153,7 +1153,7 @@ pswitch(flag)
 jmp_buf ptabort;
 int ptabflg;
 
 jmp_buf ptabort;
 int ptabflg;
 

-sig_t
+void

 abortpt()
 {
        printf("\n");
 abortpt()
 {
        printf("\n");


@@ -1167,11 +1167,12 @@ abortpt()
 proxtrans(cmd, local, remote)
        char *cmd, *local, *remote;
 {
 proxtrans(cmd, local, remote)
        char *cmd, *local, *remote;
 {

-       sig_t (*oldintr)(), abortpt();
+       sig_t oldintr;

        int secndflag = 0, prox_type, nfnd;
        extern jmp_buf ptabort;
        char *cmd2;
        struct fd_set mask;
        int secndflag = 0, prox_type, nfnd;
        extern jmp_buf ptabort;
        char *cmd2;
        struct fd_set mask;

+       void abortpt();

 
        if (strcmp(cmd, "RETR"))
                cmd2 = "RETR";
 
        if (strcmp(cmd, "RETR"))
                cmd2 = "RETR";