#include "putty.h"
#include "psftp.h"
+#include "ssh.h"
#include "int64.h"
+#include "winsecur.h"
char *get_ttymode(void *frontend, const char *mode) { return NULL; }
-int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
return ret;
}
+void platform_get_x11_auth(struct X11Display *display, Conf *conf)
+{
+ /* Do nothing, therefore no auth. */
+}
+const int platform_uses_x11_unix_by_default = TRUE;
+
/* ----------------------------------------------------------------------
* File access abstraction.
*/
return ret;
}
-#define TIME_POSIX_TO_WIN(t, ft) (*(LONGLONG*)&(ft) = \
- ((LONGLONG) (t) + (LONGLONG) 11644473600) * (LONGLONG) 10000000)
-#define TIME_WIN_TO_POSIX(ft, t) ((t) = (unsigned long) \
- ((*(LONGLONG*)&(ft)) / (LONGLONG) 10000000 - (LONGLONG) 11644473600))
+#define TIME_POSIX_TO_WIN(t, ft) do { \
+ ULARGE_INTEGER uli; \
+ uli.QuadPart = ((ULONGLONG)(t) + 11644473600ull) * 10000000ull; \
+ (ft).dwLowDateTime = uli.LowPart; \
+ (ft).dwHighDateTime = uli.HighPart; \
+} while(0)
+#define TIME_WIN_TO_POSIX(ft, t) do { \
+ ULARGE_INTEGER uli; \
+ uli.LowPart = (ft).dwLowDateTime; \
+ uli.HighPart = (ft).dwHighDateTime; \
+ uli.QuadPart = uli.QuadPart / 10000000ull - 11644473600ull; \
+ (t) = (unsigned long) uli.QuadPart; \
+} while(0)
struct RFile {
HANDLE h;
};
-RFile *open_existing_file(char *name, uint64 *size,
- unsigned long *mtime, unsigned long *atime)
+RFile *open_existing_file(const char *name, uint64 *size,
+ unsigned long *mtime, unsigned long *atime,
+ long *perms)
{
HANDLE h;
RFile *ret;
ret = snew(RFile);
ret->h = h;
- if (size)
- size->lo=GetFileSize(h, &(size->hi));
+ if (size) {
+ DWORD lo, hi;
+ lo = GetFileSize(h, &hi);
+ size->lo = lo;
+ size->hi = hi;
+ }
if (mtime || atime) {
FILETIME actime, wrtime;
TIME_WIN_TO_POSIX(wrtime, *mtime);
}
+ if (perms)
+ *perms = -1;
+
return ret;
}
int read_from_file(RFile *f, void *buffer, int length)
{
- int ret, read;
+ int ret;
+ DWORD read;
ret = ReadFile(f->h, buffer, length, &read, NULL);
if (!ret)
return -1; /* error */
HANDLE h;
};
-WFile *open_new_file(char *name)
+WFile *open_new_file(const char *name, long perms)
{
HANDLE h;
WFile *ret;
return ret;
}
-WFile *open_existing_wfile(char *name, uint64 *size)
+WFile *open_existing_wfile(const char *name, uint64 *size)
{
HANDLE h;
WFile *ret;
ret = snew(WFile);
ret->h = h;
- if (size)
- size->lo=GetFileSize(h, &(size->hi));
+ if (size) {
+ DWORD lo, hi;
+ lo = GetFileSize(h, &hi);
+ size->lo = lo;
+ size->hi = hi;
+ }
return ret;
}
int write_to_file(WFile *f, void *buffer, int length)
{
- int ret, written;
+ int ret;
+ DWORD written;
ret = WriteFile(f->h, buffer, length, &written, NULL);
if (!ret)
return -1; /* error */
return -1;
}
- SetFilePointer(f->h, offset.lo, &(offset.hi), movemethod);
+ {
+ LONG lo = offset.lo, hi = offset.hi;
+ SetFilePointer(f->h, lo, &hi, movemethod);
+ }
if (GetLastError() != NO_ERROR)
return -1;
uint64 get_file_posn(WFile *f)
{
uint64 ret;
+ LONG lo, hi = 0;
- ret.hi = 0L;
- ret.lo = SetFilePointer(f->h, 0L, &(ret.hi), FILE_CURRENT);
+ lo = SetFilePointer(f->h, 0L, &hi, FILE_CURRENT);
+ ret.lo = lo;
+ ret.hi = hi;
return ret;
}
-int file_type(char *name)
+int file_type(const char *name)
{
DWORD attr;
attr = GetFileAttributes(name);
char *name;
};
-DirHandle *open_directory(char *name)
+DirHandle *open_directory(const char *name)
{
HANDLE h;
WIN32_FIND_DATA fdat;
sfree(dir);
}
-int test_wildcard(char *name, int cmdline)
+int test_wildcard(const char *name, int cmdline)
{
HANDLE fh;
WIN32_FIND_DATA fdat;
char *srcpath;
};
-/*
- * Return a pointer to the portion of str that comes after the last
- * slash (or backslash or colon, if `local' is TRUE).
- */
-static char *stripslashes(char *str, int local)
+char *stripslashes(const char *str, int local)
{
char *p;
+ /*
+ * On Windows, \ / : are all path component separators.
+ */
+
if (local) {
p = strchr(str, ':');
if (p) str = p+1;
if (p) str = p+1;
}
- return str;
+ return (char *)str;
}
-WildcardMatcher *begin_wildcard_matching(char *name)
+WildcardMatcher *begin_wildcard_matching(const char *name)
{
HANDLE h;
WIN32_FIND_DATA fdat;
sfree(dir);
}
-int vet_filename(char *name)
+int vet_filename(const char *name)
{
if (strchr(name, '/') || strchr(name, '\\') || strchr(name, ':'))
return FALSE;
return TRUE;
}
-int create_directory(char *name)
+int create_directory(const char *name)
{
return CreateDirectory(name, NULL) != 0;
}
-char *dir_file_cat(char *dir, char *file)
+char *dir_file_cat(const char *dir, const char *file)
{
return dupcat(dir, "\\", file, NULL);
}
* Be told what socket we're supposed to be using.
*/
static SOCKET sftp_ssh_socket = INVALID_SOCKET;
-static HANDLE netevent = NULL;
+static HANDLE netevent = INVALID_HANDLE_VALUE;
char *do_select(SOCKET skt, int startup)
{
int events;
int do_eventsel_loop(HANDLE other_event)
{
int n, nhandles, nallhandles, netindex, otherindex;
- long next, ticks;
+ unsigned long next, then;
+ long ticks;
HANDLE *handles;
SOCKET *sklist;
int skcount;
- long now = GETTICKCOUNT();
+ unsigned long now = GETTICKCOUNT();
- if (run_timers(now, &next)) {
- ticks = next - GETTICKCOUNT();
- if (ticks < 0) ticks = 0; /* just in case */
+ if (toplevel_callback_pending()) {
+ ticks = 0;
+ next = now;
+ } else if (run_timers(now, &next)) {
+ then = now;
+ now = GETTICKCOUNT();
+ if (now - then > next - then)
+ ticks = 0;
+ else
+ ticks = next - now;
} else {
ticks = INFINITE;
+ /* no need to initialise next here because we can never get
+ * WAIT_TIMEOUT */
}
handles = handle_get_events(&nhandles);
handles = sresize(handles, nhandles+2, HANDLE);
nallhandles = nhandles;
- if (netevent)
+ if (netevent != INVALID_HANDLE_VALUE)
handles[netindex = nallhandles++] = netevent;
else
netindex = -1;
- if (other_event)
+ if (other_event != INVALID_HANDLE_VALUE)
handles[otherindex = nallhandles++] = other_event;
else
otherindex = -1;
- n = MsgWaitForMultipleObjects(nallhandles, handles, FALSE, ticks,
- QS_POSTMESSAGE);
+ n = WaitForMultipleObjects(nallhandles, handles, FALSE, ticks);
if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) {
handle_got_event(handles[n - WAIT_OBJECT_0]);
sfree(handles);
+ run_toplevel_callbacks();
+
if (n == WAIT_TIMEOUT) {
now = next;
} else {
if (p_WSAEventSelect == NULL) {
fd_set readfds;
int ret;
- long now = GETTICKCOUNT();
+ unsigned long now = GETTICKCOUNT(), then;
if (sftp_ssh_socket == INVALID_SOCKET)
return -1; /* doom */
select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_WRITE);
do {
- long next, ticks;
+ unsigned long next;
+ long ticks;
struct timeval tv, *ptv;
if (run_timers(now, &next)) {
- ticks = next - GETTICKCOUNT();
- if (ticks <= 0)
- ticks = 1; /* just in case */
+ 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;
return 0;
} else {
- return do_eventsel_loop(NULL);
+ return do_eventsel_loop(INVALID_HANDLE_VALUE);
}
}
return 0;
}
-char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
+char *ssh_sftp_get_cmdline(const char *prompt, int no_fds_ok)
{
int ret;
struct command_read_ctx actx, *ctx = &actx;
DWORD threadid;
+ HANDLE hThread;
fputs(prompt, stdout);
fflush(stdout);
ctx->event = CreateEvent(NULL, FALSE, FALSE, NULL);
ctx->line = NULL;
- if (!CreateThread(NULL, 0, command_read_thread,
- ctx, 0, &threadid)) {
+ hThread = CreateThread(NULL, 0, command_read_thread, ctx, 0, &threadid);
+ if (!hThread) {
+ CloseHandle(ctx->event);
fprintf(stderr, "Unable to create command input thread\n");
cleanup_exit(1);
}
assert(ret >= 0);
} while (ret == 0);
+ CloseHandle(hThread);
+ CloseHandle(ctx->event);
+
return ctx->line;
}
+void platform_psftp_pre_conn_setup(void)
+{
+ if (restricted_acl) {
+ logevent(NULL, "Running with restricted process ACL");
+ }
+}
+
/* ----------------------------------------------------------------------
* Main program. Parse arguments etc.
*/
{
int ret;
+ dll_hijacking_protection();
+
ret = psftp_main(argc, argv);
return ret;
projects / PuTTY.git / blobdiff