#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
* empty stubs.
*/
-int uxsel_input_add(int fd, int rwx) { return 0; }
-void uxsel_input_remove(int id) { }
+uxsel_id *uxsel_input_add(int fd, int rwx) { return NULL; }
+void uxsel_input_remove(uxsel_id *id) { }
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.
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("");
}
-/*
- * 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, const 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
int fd;
};
-RFile *open_existing_file(char *name, unsigned long *size,
- unsigned long *mtime, unsigned long *atime)
+RFile *open_existing_file(const char *name, uint64 *size,
+ unsigned long *mtime, unsigned long *atime,
+ long *perms)
{
int fd;
RFile *ret;
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));
}
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;
char *name;
};
-WFile *open_new_file(char *name)
+WFile *open_new_file(const 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;
return ret;
}
+
+WFile *open_existing_wfile(const 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;
sfree(f);
}
-int file_type(char *name)
+/* 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(const char *name)
{
struct stat statbuf;
DIR *dir;
};
-DirHandle *open_directory(char *name)
+DirHandle *open_directory(const char *name)
{
DIR *dir;
DirHandle *ret;
sfree(dir);
}
-int test_wildcard(char *name, int cmdline)
+int test_wildcard(const char *name, int cmdline)
{
struct stat statbuf;
glob_t globbed;
int i;
};
-WildcardMatcher *begin_wildcard_matching(char *name) {
+WildcardMatcher *begin_wildcard_matching(const char *name) {
WildcardMatcher *ret = snew(WildcardMatcher);
if (glob(name, 0, NULL, &ret->globbed) < 0) {
sfree(dir);
}
-int create_directory(char *name)
+char *stripslashes(const char *str, int local)
+{
+ char *p;
+
+ /*
+ * On Unix, we do the same thing regardless of the 'local'
+ * parameter.
+ */
+ p = strrchr(str, '/');
+ if (p) str = p+1;
+
+ return (char *)str;
+}
+
+int vet_filename(const char *name)
+{
+ if (strchr(name, '/'))
+ return FALSE;
+
+ if (name[0] == '.' && (!name[1] || (name[1] == '.' && !name[2])))
+ return FALSE;
+
+ return TRUE;
+}
+
+int create_directory(const char *name)
{
return mkdir(name, 0777) == 0;
}
-char *dir_file_cat(char *dir, char *file)
+char *dir_file_cat(const char *dir, const char *file)
{
return dupcat(dir, "/", file, NULL);
}
fd_set rset, wset, xset;
int i, fdcount, fdsize, *fdlist;
int fd, fdstate, rwx, ret, maxfd;
- long now = GETTICKCOUNT();
+ unsigned long now = GETTICKCOUNT();
+ unsigned long next;
fdlist = NULL;
fdcount = fdsize = 0;
if (include_stdin)
FD_SET_MAX(0, maxfd, rset);
- do {
- long next, ticks;
- struct timeval tv, *ptv;
-
- if (run_timers(now, &next)) {
- ticks = next - GETTICKCOUNT();
- if (ticks <= 0)
- ticks = 1; /* just in case */
+ if (toplevel_callback_pending()) {
+ struct timeval tv;
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+ ret = select(maxfd, &rset, &wset, &xset, &tv);
+ if (ret == 0)
+ run_toplevel_callbacks();
+ } else if (run_timers(now, &next)) {
+ do {
+ unsigned long then;
+ long ticks;
+ struct timeval tv;
+
+ 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;
- } else {
- ptv = NULL;
- }
- ret = select(maxfd, &rset, &wset, &xset, ptv);
- if (ret == 0)
- now = next;
- else
- now = GETTICKCOUNT();
- } while (ret < 0 && errno != EINTR);
+ ret = select(maxfd, &rset, &wset, &xset, &tv);
+ if (ret == 0)
+ now = next;
+ else
+ now = GETTICKCOUNT();
+ } while (ret < 0 && errno == EINTR);
+ } else {
+ do {
+ ret = select(maxfd, &rset, &wset, &xset, NULL);
+ } while (ret < 0 && errno == EINTR);
+ }
} while (ret == 0);
if (ret < 0) {
sfree(fdlist);
+ run_toplevel_callbacks();
+
return FD_ISSET(0, &rset) ? 1 : 0;
}
/*
* Read a PSFTP command line from stdin.
*/
-char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
+char *ssh_sftp_get_cmdline(const char *prompt, int no_fds_ok)
{
char *buf;
int buflen, bufsize, ret;
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) {
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;
}
}
}
+void frontend_net_error_pending(void) {}
+
+void platform_psftp_pre_conn_setup(void) {}
+
+const int buildinfo_gtk_relevant = FALSE;
+
/*
* Main program: do platform-specific initialisation and then call
* psftp_main().
projects / PuTTY.git / blobdiff