X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/154c73d56d8847aaf20c048ccc35c19c584890ce..962468d4b96c33869e9131eb42a0c784591f5884:/unix/uxsftp.c

diff --git a/unix/uxsftp.c b/unix/uxsftp.c
index 3691cacc..61847d8e 100644
--- a/unix/uxsftp.c
+++ b/unix/uxsftp.c
@@ -18,7 +18,9 @@
 #endif
 
 #include "putty.h"
+#include "ssh.h"
 #include "psftp.h"
+#include "int64.h"
 
 /*
  * In PSFTP our selects are synchronous, so these functions are
@@ -32,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.
@@ -51,36 +53,29 @@ 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; }
 
-/*
- * 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) {}
-
+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
@@ -125,8 +120,9 @@ struct RFile {
     int fd;
 };
 
-RFile *open_existing_file(char *name, unsigned long *size,
-			  unsigned long *mtime, unsigned long *atime)
+RFile *open_existing_file(char *name, uint64 *size,
+			  unsigned long *mtime, unsigned long *atime,
+                          long *perms)
 {
     int fd;
     RFile *ret;
@@ -138,7 +134,7 @@ RFile *open_existing_file(char *name, unsigned long *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));
@@ -146,13 +142,17 @@ 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;
 
 	if (atime)
 	    *atime = statbuf.st_atime;
+
+	if (perms)
+	    *perms = statbuf.st_mode;
     }
 
     return ret;
@@ -174,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;
 
@@ -190,6 +191,34 @@ 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;
+    ret->name = dupstr(name);
+
+    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;
@@ -231,6 +260,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;