Revamp of the local X11 connection code. We now parse X display

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

diff --git a/unix/uxsftp.c b/unix/uxsftp.c
index 9958a79..a9af614 100644 (file)
--- a/unix/uxsftp.c
+++ b/unix/uxsftp.c
@@ -13,9 +13,14 @@
 #include <errno.h>
 #include <assert.h>
 #include <glob.h>
+#ifndef HAVE_NO_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 
 #include "putty.h"
+#include "ssh.h"
 #include "psftp.h"
+#include "int64.h"
 
 /*
  * In PSFTP our selects are synchronous, so these functions are
@@ -29,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, const Config *cfg)
 {
     /* Do nothing, therefore no auth. */
 }
+const int platform_uses_x11_unix_by_default = TRUE;
 
 /*
  * Default settings that are specific to PSFTP.
@@ -65,17 +70,16 @@ Filename platform_default_filename(const char *name)
     return ret;
 }
 
-/*
- * Stubs for the GUI feedback mechanism in Windows PSCP.
- */
-void gui_update_stats(char *name, unsigned long size,
-                     int percentage, unsigned long elapsed,
-                     unsigned long done, unsigned long eta,
-                     unsigned long ratebs) {}
-void gui_send_errcount(int list, int errs) {}
-void gui_send_char(int is_stderr, int c) {}
-void gui_enable(char *arg) {}
+char *get_ttymode(void *frontend, const char *mode) { return NULL; }
 
+int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+    int ret;
+    ret = cmdline_get_passwd_input(p, in, inlen);
+    if (ret == -1)
+       ret = console_get_userpass_input(p, in, inlen);
+    return ret;
+}
 
 /*
  * Set local current directory. Returns NULL on success, or else an
@@ -120,7 +124,7 @@ struct RFile {
     int fd;
 };
 
-RFile *open_existing_file(char *name, unsigned long *size,
+RFile *open_existing_file(char *name, uint64 *size,
                          unsigned long *mtime, unsigned long *atime)
 {
     int fd;
@@ -141,8 +145,9 @@ RFile *open_existing_file(char *name, unsigned long *size,
        }
 
        if (size)
-           *size = statbuf.st_size;
-
+           *size = uint64_make((statbuf.st_size >> 16) >> 16,
+                               statbuf.st_size);
+               
        if (mtime)
            *mtime = statbuf.st_mtime;
 
@@ -185,6 +190,33 @@ WFile *open_new_file(char *name)
     return ret;
 }
 
+
+WFile *open_existing_wfile(char *name, uint64 *size)
+{
+    int fd;
+    WFile *ret;
+
+    fd = open(name, O_APPEND | O_WRONLY);
+    if (fd < 0)
+       return NULL;
+
+    ret = snew(WFile);
+    ret->fd = fd;
+
+    if (size) {
+       struct stat statbuf;
+       if (fstat(fd, &statbuf) < 0) {
+           fprintf(stderr, "%s: stat: %s\n", name, strerror(errno));
+           memset(&statbuf, 0, sizeof(statbuf));
+       }
+
+       *size = uint64_make((statbuf.st_size >> 16) >> 16,
+                           statbuf.st_size);
+    }
+
+    return ret;
+}
+
 int write_to_file(WFile *f, void *buffer, int length)
 {
     char *p = (char *)buffer;
@@ -226,6 +258,44 @@ void close_wfile(WFile *f)
     sfree(f);
 }
 
+/* Seek offset bytes through file, from whence, where whence is
+   FROM_START, FROM_CURRENT, or FROM_END */
+int seek_file(WFile *f, uint64 offset, int whence)
+{
+    off_t fileofft;
+    int lseek_whence;
+    
+    fileofft = (((off_t) offset.hi << 16) << 16) + offset.lo;
+
+    switch (whence) {
+    case FROM_START:
+       lseek_whence = SEEK_SET;
+       break;
+    case FROM_CURRENT:
+       lseek_whence = SEEK_CUR;
+       break;
+    case FROM_END:
+       lseek_whence = SEEK_END;
+       break;
+    default:
+       return -1;
+    }
+
+    return lseek(f->fd, fileofft, lseek_whence) >= 0 ? 0 : -1;
+}
+
+uint64 get_file_posn(WFile *f)
+{
+    off_t fileofft;
+    uint64 ret;
+
+    fileofft = lseek(f->fd, (off_t) 0, SEEK_CUR);
+
+    ret = uint64_make((fileofft >> 16) >> 16, fileofft);
+
+    return ret;
+}
+
 int file_type(char *name)
 {
     struct stat statbuf;
@@ -341,6 +411,17 @@ void finish_wildcard_matching(WildcardMatcher *dir) {
     sfree(dir);
 }
 
+int vet_filename(char *name)
+{
+    if (strchr(name, '/'))
+       return FALSE;
+
+    if (name[0] == '.' && (!name[1] || (name[1] == '.' && !name[2])))
+       return FALSE;
+
+    return TRUE;
+}
+
 int create_directory(char *name)
 {
     return mkdir(name, 0777) == 0;
@@ -422,8 +503,27 @@ 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
-               now = GETTICKCOUNT();
+           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;
+               }
+           }
        } while (ret < 0 && errno != EINTR);
     } while (ret == 0);