projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
8db397a
..
a9af614
100644
(file)
--- a/
unix/uxsftp.c
+++ b/
unix/uxsftp.c
@@
-18,6
+18,7
@@
#endif
#include "putty.h"
#endif
#include "putty.h"
+#include "ssh.h"
#include "psftp.h"
#include "int64.h"
#include "psftp.h"
#include "int64.h"
@@
-33,11
+34,11
@@
char *x_get_default(const char *key)
return NULL; /* this is a stub */
}
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. */
}
{
/* Do nothing, therefore no auth. */
}
+const int platform_uses_x11_unix_by_default = TRUE;
/*
* Default settings that are specific to PSFTP.
/*
* Default settings that are specific to PSFTP.
@@
-143,14
+144,9
@@
RFile *open_existing_file(char *name, uint64 *size,
memset(&statbuf, 0, sizeof(statbuf));
}
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 (mtime)
*mtime = statbuf.st_mtime;
@@
-214,12
+210,8
@@
WFile *open_existing_wfile(char *name, uint64 *size)
memset(&statbuf, 0, sizeof(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;
}
return ret;
@@
-273,11
+265,7
@@
int seek_file(WFile *f, uint64 offset, int whence)
off_t fileofft;
int lseek_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:
switch (whence) {
case FROM_START:
@@
-303,12
+291,7
@@
uint64 get_file_posn(WFile *f)
fileofft = lseek(f->fd, (off_t) 0, SEEK_CUR);
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;
}
return ret;
}