#endif
#include "putty.h"
+#include "ssh.h"
#include "psftp.h"
#include "int64.h"
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("");
}
char *get_ttymode(void *frontend, const char *mode) { return NULL; }
};
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;
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;
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;
ret = snew(WFile);
ret->fd = fd;
+ ret->name = dupstr(name);
if (size) {
struct stat statbuf;
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;
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:
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;
}
}
}
+void frontend_net_error_pending(void) {}
+
/*
* Main program: do platform-specific initialisation and then call
* psftp_main().