Fix another giant batch of resource leaks. (Mostly memory, but there's

[u/mdw/putty] / unix / uxsftp.c

diff --git a/unix/uxsftp.c b/unix/uxsftp.c
index 8db397a..57f2841 100644 (file)
--- a/unix/uxsftp.c
+++ b/unix/uxsftp.c
@@ -18,6 +18,7 @@
 #endif
 
 #include "putty.h"
+#include "ssh.h"
 #include "psftp.h"
 #include "int64.h"
 
@@ -33,11 +34,11 @@ char *x_get_default(const char *key)
     return NULL;                      /* this is a stub */
 }
 
-void platform_get_x11_auth(char *display, int *protocol,
-                           unsigned char *data, int *datalen)
+void platform_get_x11_auth(struct X11Display *display, Conf *conf)
 {
     /* Do nothing, therefore no auth. */
 }
+const int platform_uses_x11_unix_by_default = TRUE;
 
 /*
  * Default settings that are specific to PSFTP.
@@ -52,21 +53,17 @@ int platform_default_i(const char *name, int def)
     return def;
 }
 
-FontSpec platform_default_fontspec(const char *name)
+FontSpec *platform_default_fontspec(const char *name)
 {
-    FontSpec ret;
-    *ret.name = '\0';
-    return ret;
+    return fontspec_new("");
 }
 
-Filename platform_default_filename(const char *name)
+Filename *platform_default_filename(const char *name)
 {
-    Filename ret;
     if (!strcmp(name, "LogFileName"))
-       strcpy(ret.path, "putty.log");
+       return filename_from_str("putty.log");
     else
-       *ret.path = '\0';
-    return ret;
+       return filename_from_str("");
 }
 
 char *get_ttymode(void *frontend, const char *mode) { return NULL; }
@@ -124,7 +121,8 @@ struct RFile {
 };
 
 RFile *open_existing_file(char *name, uint64 *size,
-                         unsigned long *mtime, unsigned long *atime)
+                         unsigned long *mtime, unsigned long *atime,
+                          long *perms)
 {
     int fd;
     RFile *ret;
@@ -136,27 +134,25 @@ RFile *open_existing_file(char *name, uint64 *size,
     ret = snew(RFile);
     ret->fd = fd;
 
-    if (size || mtime || atime) {
+    if (size || mtime || atime || perms) {
        struct stat statbuf;
        if (fstat(fd, &statbuf) < 0) {
            fprintf(stderr, "%s: stat: %s\n", name, strerror(errno));
            memset(&statbuf, 0, sizeof(statbuf));
        }
 
-       if (size) {
-           if (sizeof(statbuf.st_size) == 8) {
-               size->hi = statbuf.st_size >> 32;
-               size->lo = (long) statbuf.st_size;
-           } else {
-               *size = uint64_make(0, statbuf.st_size);
-           }
-       }
+       if (size)
+           *size = uint64_make((statbuf.st_size >> 16) >> 16,
+                               statbuf.st_size);
                
        if (mtime)
            *mtime = statbuf.st_mtime;
 
        if (atime)
            *atime = statbuf.st_atime;
+
+       if (perms)
+           *perms = statbuf.st_mode;
     }
 
     return ret;
@@ -178,12 +174,13 @@ struct WFile {
     char *name;
 };
 
-WFile *open_new_file(char *name)
+WFile *open_new_file(char *name, long perms)
 {
     int fd;
     WFile *ret;
 
-    fd = open(name, O_CREAT | O_TRUNC | O_WRONLY, 0666);
+    fd = open(name, O_CREAT | O_TRUNC | O_WRONLY,
+              (mode_t)(perms ? perms : 0666));
     if (fd < 0)
        return NULL;
 
@@ -206,6 +203,7 @@ WFile *open_existing_wfile(char *name, uint64 *size)
 
     ret = snew(WFile);
     ret->fd = fd;
+    ret->name = dupstr(name);
 
     if (size) {
        struct stat statbuf;
@@ -214,12 +212,8 @@ WFile *open_existing_wfile(char *name, uint64 *size)
            memset(&statbuf, 0, sizeof(statbuf));
        }
 
-       if (sizeof(statbuf.st_size) == 8) {
-           size->hi = statbuf.st_size >> 32;
-           size->lo = (long) statbuf.st_size;
-       } else {
-           *size = uint64_make(0, statbuf.st_size);
-       }
+       *size = uint64_make((statbuf.st_size >> 16) >> 16,
+                           statbuf.st_size);
     }
 
     return ret;
@@ -273,11 +267,7 @@ int seek_file(WFile *f, uint64 offset, int whence)
     off_t fileofft;
     int lseek_whence;
     
-    if (sizeof(off_t) == 8) {
-       fileofft = ((off_t) offset.hi << 32) + offset.lo;
-    } else {
-       fileofft = offset.lo;
-    }
+    fileofft = (((off_t) offset.hi << 16) << 16) + offset.lo;
 
     switch (whence) {
     case FROM_START:
@@ -303,12 +293,7 @@ uint64 get_file_posn(WFile *f)
 
     fileofft = lseek(f->fd, (off_t) 0, SEEK_CUR);
 
-    if (sizeof(off_t) == 8) {
-       ret.hi = fileofft >> 32;
-       ret.lo = (long) fileofft;
-    } else {
-       ret = uint64_make(0, fileofft);
-    }
+    ret = uint64_make((fileofft >> 16) >> 16, fileofft);
 
     return ret;
 }
@@ -458,7 +443,7 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok)
     fd_set rset, wset, xset;
     int i, fdcount, fdsize, *fdlist;
     int fd, fdstate, rwx, ret, maxfd;
-    long now = GETTICKCOUNT();
+    unsigned long now = GETTICKCOUNT();
 
     fdlist = NULL;
     fdcount = fdsize = 0;
@@ -504,13 +489,17 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok)
            FD_SET_MAX(0, maxfd, rset);
 
        do {
-           long next, ticks;
+           unsigned long next, then;
+           long ticks;
            struct timeval tv, *ptv;
 
            if (run_timers(now, &next)) {
-               ticks = next - GETTICKCOUNT();
-               if (ticks <= 0)
-                   ticks = 1;         /* just in case */
+               then = now;
+               now = GETTICKCOUNT();
+               if (now - then > next - then)
+                   ticks = 0;
+               else
+                   ticks = next - now;
                tv.tv_sec = ticks / 1000;
                tv.tv_usec = ticks % 1000 * 1000;
                ptv = &tv;
@@ -520,27 +509,8 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok)
            ret = select(maxfd, &rset, &wset, &xset, ptv);
            if (ret == 0)
                now = next;
-           else {
-               long newnow = GETTICKCOUNT();
-               /*
-                * Check to see whether the system clock has
-                * changed massively during the select.
-                */
-               if (newnow - now < 0 || newnow - now > next - now) {
-                   /*
-                    * If so, look at the elapsed time in the
-                    * select and use it to compute a new
-                    * tickcount_offset.
-                    */
-                   long othernow = now + tv.tv_sec * 1000 + tv.tv_usec / 1000;
-                   /* So we'd like GETTICKCOUNT to have returned othernow,
-                    * but instead it return newnow. Hence ... */
-                   tickcount_offset += othernow - newnow;
-                   now = othernow;
-               } else {
-                   now = newnow;
-               }
-           }
+           else
+               now = GETTICKCOUNT();
        } while (ret < 0 && errno != EINTR);
     } while (ret == 0);
 
@@ -595,6 +565,7 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
        ret = ssh_sftp_do_select(TRUE, no_fds_ok);
        if (ret < 0) {
            printf("connection died\n");
+            sfree(buf);
            return NULL;               /* woop woop */
        }
        if (ret > 0) {
@@ -605,10 +576,12 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
            ret = read(0, buf+buflen, 1);
            if (ret < 0) {
                perror("read");
+                sfree(buf);
                return NULL;
            }
            if (ret == 0) {
                /* eof on stdin; no error, but no answer either */
+                sfree(buf);
                return NULL;
            }
 
@@ -620,6 +593,8 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
     }
 }
 
+void frontend_net_error_pending(void) {}
+
 /*
  * Main program: do platform-specific initialisation and then call
  * psftp_main().