added watt32 headers and brought the DOS version up to parity with UNIX

[oftp] / src / ftp.c

diff --git a/src/ftp.c b/src/ftp.c
index 0a0c721..cf76a6b 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -6,6 +6,8 @@
 #include <ctype.h>
 #include <time.h>
 #include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/swap.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -18,6 +20,16 @@
 #include <fcntl.h>
 #define closesocket            close
 #define fcntlsocket            fcntl
+#else
+#define select select_s
+
+#ifndef O_NONBLOCK
+#define O_NONBLOCK     0x2000
+#endif
+#ifndef F_SETFL
+#define F_GETFL        101
+#define F_SETFL        102
+#endif
 #endif
 
 #define TIMEOUT        15
@@ -49,8 +61,7 @@ struct ftp *ftp_alloc(void)
        ftp->ctl = ftp->data = ftp->lis = -1;
        ftp->passive = 1;
 
-       ftp->dirent[0] = darr_alloc(0, sizeof *ftp->dirent[0]);
-       ftp->dirent[1] = darr_alloc(0, sizeof *ftp->dirent[1]);
+       ftp->dirent = darr_alloc(0, sizeof *ftp->dirent);
        return ftp;
 }
 
@@ -62,8 +73,7 @@ void ftp_free(struct ftp *ftp)
                ftp_close(ftp);
        }
 
-       free_dir(ftp->dirent[0]);
-       free_dir(ftp->dirent[1]);
+       free_dir(ftp->dirent);
 }
 
 static void free_dir(struct ftp_dirent *dir)
@@ -238,7 +248,7 @@ int ftp_queue(struct ftp *ftp, int op, const char *arg)
        return 0;
 }
 
-int ftp_waitresp(struct ftp *ftp, time_t timeout)
+int ftp_waitresp(struct ftp *ftp, long timeout)
 {
        fd_set rdset;
        struct timeval tv;
@@ -282,7 +292,7 @@ int ftp_waitresp(struct ftp *ftp, time_t timeout)
 static int ftp_active(struct ftp *ftp)
 {
        struct sockaddr_in sa = {0};
-       socklen_t len;
+       int len;
        unsigned long addr;
        unsigned short port;
 
@@ -694,8 +704,8 @@ static int cproc_pasv(struct ftp *ftp, int code, const char *buf, void *cls)
                goto nopasv;
        }
        port = (addr[4] << 8) | addr[5];
-       ipaddr = ((uint32_t)addr[0] << 24) | ((uint32_t)addr[1] << 16) |
-               ((uint32_t)addr[2] << 8) | addr[3];
+       ipaddr = ((unsigned int)addr[0] << 24) | ((unsigned int)addr[1] << 16) |
+               ((unsigned int)addr[2] << 8) | addr[3];
 
        if((ftp->data = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
                fprintf(stderr, "ftp_passive: failed to allocate socket\n");
@@ -711,7 +721,7 @@ static int cproc_pasv(struct ftp *ftp, int code, const char *buf, void *cls)
 
        if(connect(ftp->data, (struct sockaddr*)&sa, sizeof sa) == -1) {
                errmsg("ftp_passive: failed to connect to %s:%p\n", inet_ntoa(sa.sin_addr), port);
-               close(ftp->data);
+               closesocket(ftp->data);
                ftp->data = -1;
                goto nopasv;
        }
@@ -740,9 +750,9 @@ static int cproc_pwd(struct ftp *ftp, int code, const char *buf, void *cls)
                return -1;
        }
 
-       free(ftp->curdir[FTP_REMOTE]);
-       ftp->curdir[FTP_REMOTE] = strdup_nf(dirname);
-       ftp->modified = FTP_MOD_REMDIR;
+       free(ftp->curdir);
+       ftp->curdir = strdup_nf(dirname);
+       ftp->modified = FTP_MOD_DIR;
        return 0;
 }
 
@@ -816,7 +826,7 @@ static int parse_dirent(struct ftp_dirent *ent, const char *line)
        return 0;
 }
 
-static int direntcmp(const void *a, const void *b)
+int ftp_direntcmp(const void *a, const void *b)
 {
        const struct ftp_dirent *da = a, *db = b;
 
@@ -837,23 +847,23 @@ static void dproc_list(struct ftp *ftp, const char *buf, int sz, void *cls)
                char *end = rbuf->buf + rbuf->size;
                struct ftp_dirent ent;
 
-               darr_clear(ftp->dirent[FTP_REMOTE]);
+               darr_clear(ftp->dirent);
 
                while(ptr < end) {
                        if(parse_dirent(&ent, ptr) != -1) {
-                               darr_push(ftp->dirent[FTP_REMOTE], &ent);
+                               darr_push(ftp->dirent, &ent);
                        }
                        while(ptr < end && *ptr != '\n' && *ptr != '\r') ptr++;
                        while(ptr < end && (*ptr == '\r' || *ptr == '\n')) ptr++;
                }
-               ftp->modified |= FTP_MOD_REMDIR;
+               ftp->modified |= FTP_MOD_DIR;
 
                free(rbuf->buf);
                free(rbuf);
                ftp->dproc = 0;
 
-               num = darr_size(ftp->dirent[FTP_REMOTE]);
-               qsort(ftp->dirent[FTP_REMOTE], num, sizeof *ftp->dirent[FTP_REMOTE], direntcmp);
+               num = darr_size(ftp->dirent);
+               qsort(ftp->dirent, num, sizeof *ftp->dirent, ftp_direntcmp);
                return;
        }
 
@@ -873,17 +883,17 @@ static void dproc_list(struct ftp *ftp, const char *buf, int sz, void *cls)
        rbuf->size += sz;
 }
 
-const char *ftp_curdir(struct ftp *ftp, int whichdir)
+const char *ftp_curdir(struct ftp *ftp)
 {
-       return ftp->curdir[whichdir];
+       return ftp->curdir;
 }
 
-int ftp_num_dirent(struct ftp *ftp, int whichdir)
+int ftp_num_dirent(struct ftp *ftp)
 {
-       return darr_size(ftp->dirent[whichdir]);
+       return darr_size(ftp->dirent);
 }
 
-struct ftp_dirent *ftp_dirent(struct ftp *ftp, int whichdir, int idx)
+struct ftp_dirent *ftp_dirent(struct ftp *ftp, int idx)
 {
-       return ftp->dirent[whichdir] + idx;
+       return ftp->dirent + idx;
 }