2003-08-24 16:47:46 +04:00
|
|
|
/*
|
2003-08-25 17:53:41 +04:00
|
|
|
* winsftp.c: the Windows-specific parts of PSFTP and PSCP.
|
2003-08-24 16:47:46 +04:00
|
|
|
*/
|
|
|
|
|
2017-02-15 02:19:13 +03:00
|
|
|
#include <winsock2.h> /* need to put this first, for winelib builds */
|
2004-11-27 16:20:21 +03:00
|
|
|
#include <assert.h>
|
|
|
|
|
2017-02-15 02:19:13 +03:00
|
|
|
#define NEED_DECLARATION_OF_SELECT
|
|
|
|
|
2003-08-24 16:47:46 +04:00
|
|
|
#include "putty.h"
|
|
|
|
#include "psftp.h"
|
2009-09-27 19:31:08 +04:00
|
|
|
#include "ssh.h"
|
2016-04-10 17:08:57 +03:00
|
|
|
#include "winsecur.h"
|
2005-04-21 17:57:08 +04:00
|
|
|
|
New abstraction 'Seat', to pass to backends.
This is a new vtable-based abstraction which is passed to a backend in
place of Frontend, and it implements only the subset of the Frontend
functions needed by a backend. (Many other Frontend functions still
exist, notably the wide range of things called by terminal.c providing
platform-independent operations on the GUI terminal window.)
The purpose of making it a vtable is that this opens up the
possibility of creating a backend as an internal implementation detail
of some other activity, by providing just that one backend with a
custom Seat that implements the methods differently.
For example, this refactoring should make it feasible to directly
implement an SSH proxy type, aka the 'jump host' feature supported by
OpenSSH, aka 'open a secondary SSH session in MAINCHAN_DIRECT_TCP
mode, and then expose the main channel of that as the Socket for the
primary connection'. (Which of course you can already do by spawning
'plink -nc' as a separate proxy process, but this would permit it in
the _same_ process without anything getting confused.)
I've centralised a full set of stub methods in misc.c for the new
abstraction, which allows me to get rid of several annoying stubs in
the previous code. Also, while I'm here, I've moved a lot of
duplicated modalfatalbox() type functions from application main
program files into wincons.c / uxcons.c, which I think saves
duplication overall. (A minor visible effect is that the prefixes on
those console-based fatal error messages will now be more consistent
between applications.)
2018-10-11 21:58:42 +03:00
|
|
|
int filexfer_get_userpass_input(Seat *seat, prompts_t *p, bufchain *input)
|
2005-10-30 23:24:09 +03:00
|
|
|
{
|
|
|
|
int ret;
|
2018-05-18 09:22:56 +03:00
|
|
|
ret = cmdline_get_passwd_input(p);
|
2005-10-30 23:24:09 +03:00
|
|
|
if (ret == -1)
|
2019-09-08 22:29:00 +03:00
|
|
|
ret = console_get_userpass_input(p);
|
2005-10-30 23:24:09 +03:00
|
|
|
return ret;
|
|
|
|
}
|
2003-08-24 16:47:46 +04:00
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 22:52:21 +04:00
|
|
|
void platform_get_x11_auth(struct X11Display *display, Conf *conf)
|
2008-11-17 21:38:09 +03:00
|
|
|
{
|
|
|
|
/* Do nothing, therefore no auth. */
|
|
|
|
}
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
const bool platform_uses_x11_unix_by_default = true;
|
2008-11-17 21:38:09 +03:00
|
|
|
|
2003-08-25 17:53:41 +04:00
|
|
|
/* ----------------------------------------------------------------------
|
|
|
|
* File access abstraction.
|
|
|
|
*/
|
|
|
|
|
2003-08-24 16:47:46 +04:00
|
|
|
/*
|
|
|
|
* Set local current directory. Returns NULL on success, or else an
|
|
|
|
* error message which must be freed after printing.
|
|
|
|
*/
|
|
|
|
char *psftp_lcd(char *dir)
|
|
|
|
{
|
|
|
|
char *ret = NULL;
|
|
|
|
|
|
|
|
if (!SetCurrentDirectory(dir)) {
|
2019-09-08 22:29:00 +03:00
|
|
|
LPVOID message;
|
|
|
|
int i;
|
|
|
|
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
|
|
|
FORMAT_MESSAGE_FROM_SYSTEM |
|
|
|
|
FORMAT_MESSAGE_IGNORE_INSERTS,
|
|
|
|
NULL, GetLastError(),
|
|
|
|
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
|
|
|
(LPTSTR)&message, 0, NULL);
|
|
|
|
i = strcspn((char *)message, "\n");
|
|
|
|
ret = dupprintf("%.*s", i, (LPCTSTR)message);
|
|
|
|
LocalFree(message);
|
2003-08-24 16:47:46 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get local current directory. Returns a string which must be
|
|
|
|
* freed.
|
|
|
|
*/
|
|
|
|
char *psftp_getcwd(void)
|
|
|
|
{
|
|
|
|
char *ret = snewn(256, char);
|
New array-growing macros: sgrowarray and sgrowarrayn.
The idea of these is that they centralise the common idiom along the
lines of
if (logical_array_len >= physical_array_size) {
physical_array_size = logical_array_len * 5 / 4 + 256;
array = sresize(array, physical_array_size, ElementType);
}
which happens at a zillion call sites throughout this code base, with
different random choices of the geometric factor and additive
constant, sometimes forgetting them completely, and generally doing a
lot of repeated work.
The new macro sgrowarray(array,size,n) has the semantics: here are the
array pointer and its physical size for you to modify, now please
ensure that the nth element exists, so I can write into it. And
sgrowarrayn(array,size,n,m) is the same except that it ensures that
the array has size at least n+m (so sgrowarray is just the special
case where m=1).
Now that this is a single centralised implementation that will be used
everywhere, I've also gone to more effort in the implementation, with
careful overflow checks that would have been painful to put at all the
previous call sites.
This commit also switches over every use of sresize(), apart from a
few where I really didn't think it would gain anything. A consequence
of that is that a lot of array-size variables have to have their types
changed to size_t, because the macros require that (they address-take
the size to pass to the underlying function).
2019-02-28 23:07:30 +03:00
|
|
|
size_t len = GetCurrentDirectory(256, ret);
|
2003-08-24 16:47:46 +04:00
|
|
|
if (len > 256)
|
2019-09-08 22:29:00 +03:00
|
|
|
ret = sresize(ret, len, char);
|
2003-08-24 16:47:46 +04:00
|
|
|
GetCurrentDirectory(len, ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-10-27 01:08:58 +03:00
|
|
|
static inline uint64_t uint64_from_words(uint32_t hi, uint32_t lo)
|
|
|
|
{
|
|
|
|
return (((uint64_t)hi) << 32) | lo;
|
|
|
|
}
|
|
|
|
|
2009-09-27 19:52:13 +04:00
|
|
|
#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)
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
struct RFile {
|
|
|
|
HANDLE h;
|
|
|
|
};
|
|
|
|
|
2018-10-27 01:08:58 +03:00
|
|
|
RFile *open_existing_file(const char *name, uint64_t *size,
|
2019-09-08 22:29:00 +03:00
|
|
|
unsigned long *mtime, unsigned long *atime,
|
2011-08-11 21:59:30 +04:00
|
|
|
long *perms)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
RFile *ret;
|
|
|
|
|
|
|
|
h = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL,
|
2019-09-08 22:29:00 +03:00
|
|
|
OPEN_EXISTING, 0, 0);
|
2003-08-25 17:53:41 +04:00
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
2019-09-08 22:29:00 +03:00
|
|
|
return NULL;
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
ret = snew(RFile);
|
|
|
|
ret->h = h;
|
|
|
|
|
2016-04-02 16:11:18 +03:00
|
|
|
if (size) {
|
|
|
|
DWORD lo, hi;
|
|
|
|
lo = GetFileSize(h, &hi);
|
2018-10-27 01:08:58 +03:00
|
|
|
*size = uint64_from_words(hi, lo);
|
2016-04-02 16:11:18 +03:00
|
|
|
}
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
if (mtime || atime) {
|
2019-09-08 22:29:00 +03:00
|
|
|
FILETIME actime, wrtime;
|
|
|
|
GetFileTime(h, NULL, &actime, &wrtime);
|
|
|
|
if (atime)
|
|
|
|
TIME_WIN_TO_POSIX(actime, *atime);
|
|
|
|
if (mtime)
|
|
|
|
TIME_WIN_TO_POSIX(wrtime, *mtime);
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
2011-08-11 21:59:30 +04:00
|
|
|
if (perms)
|
|
|
|
*perms = -1;
|
|
|
|
|
2003-08-25 17:53:41 +04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int read_from_file(RFile *f, void *buffer, int length)
|
|
|
|
{
|
2009-09-27 19:31:08 +04:00
|
|
|
DWORD read;
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
if (!ReadFile(f->h, buffer, length, &read, NULL))
|
2019-09-08 22:29:00 +03:00
|
|
|
return -1; /* error */
|
2003-08-25 17:53:41 +04:00
|
|
|
else
|
2019-09-08 22:29:00 +03:00
|
|
|
return read;
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void close_rfile(RFile *f)
|
|
|
|
{
|
|
|
|
CloseHandle(f->h);
|
|
|
|
sfree(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct WFile {
|
|
|
|
HANDLE h;
|
|
|
|
};
|
|
|
|
|
2015-05-15 13:15:42 +03:00
|
|
|
WFile *open_new_file(const char *name, long perms)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
WFile *ret;
|
|
|
|
|
|
|
|
h = CreateFile(name, GENERIC_WRITE, 0, NULL,
|
2019-09-08 22:29:00 +03:00
|
|
|
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
|
2003-08-25 17:53:41 +04:00
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
2019-09-08 22:29:00 +03:00
|
|
|
return NULL;
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
ret = snew(WFile);
|
|
|
|
ret->h = h;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-10-27 01:08:58 +03:00
|
|
|
WFile *open_existing_wfile(const char *name, uint64_t *size)
|
2006-08-12 19:20:19 +04:00
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
WFile *ret;
|
|
|
|
|
|
|
|
h = CreateFile(name, GENERIC_WRITE, FILE_SHARE_READ, NULL,
|
2019-09-08 22:29:00 +03:00
|
|
|
OPEN_EXISTING, 0, 0);
|
2006-08-12 19:20:19 +04:00
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
2019-09-08 22:29:00 +03:00
|
|
|
return NULL;
|
2006-08-12 19:20:19 +04:00
|
|
|
|
|
|
|
ret = snew(WFile);
|
|
|
|
ret->h = h;
|
|
|
|
|
2016-04-02 16:11:18 +03:00
|
|
|
if (size) {
|
|
|
|
DWORD lo, hi;
|
|
|
|
lo = GetFileSize(h, &hi);
|
2018-10-27 01:08:58 +03:00
|
|
|
*size = uint64_from_words(hi, lo);
|
2016-04-02 16:11:18 +03:00
|
|
|
}
|
2006-08-12 19:20:19 +04:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2003-08-25 17:53:41 +04:00
|
|
|
int write_to_file(WFile *f, void *buffer, int length)
|
|
|
|
{
|
2009-09-27 19:31:08 +04:00
|
|
|
DWORD written;
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
if (!WriteFile(f->h, buffer, length, &written, NULL))
|
2019-09-08 22:29:00 +03:00
|
|
|
return -1; /* error */
|
2003-08-25 17:53:41 +04:00
|
|
|
else
|
2019-09-08 22:29:00 +03:00
|
|
|
return written;
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void set_file_times(WFile *f, unsigned long mtime, unsigned long atime)
|
|
|
|
{
|
|
|
|
FILETIME actime, wrtime;
|
|
|
|
TIME_POSIX_TO_WIN(atime, actime);
|
|
|
|
TIME_POSIX_TO_WIN(mtime, wrtime);
|
|
|
|
SetFileTime(f->h, NULL, &actime, &wrtime);
|
|
|
|
}
|
|
|
|
|
|
|
|
void close_wfile(WFile *f)
|
|
|
|
{
|
|
|
|
CloseHandle(f->h);
|
|
|
|
sfree(f);
|
|
|
|
}
|
|
|
|
|
2006-08-12 19:20:19 +04:00
|
|
|
/* Seek offset bytes through file, from whence, where whence is
|
|
|
|
FROM_START, FROM_CURRENT, or FROM_END */
|
2018-10-27 01:08:58 +03:00
|
|
|
int seek_file(WFile *f, uint64_t offset, int whence)
|
2006-08-12 19:20:19 +04:00
|
|
|
{
|
|
|
|
DWORD movemethod;
|
|
|
|
|
|
|
|
switch (whence) {
|
|
|
|
case FROM_START:
|
2019-09-08 22:29:00 +03:00
|
|
|
movemethod = FILE_BEGIN;
|
|
|
|
break;
|
2006-08-12 19:20:19 +04:00
|
|
|
case FROM_CURRENT:
|
2019-09-08 22:29:00 +03:00
|
|
|
movemethod = FILE_CURRENT;
|
|
|
|
break;
|
2006-08-12 19:20:19 +04:00
|
|
|
case FROM_END:
|
2019-09-08 22:29:00 +03:00
|
|
|
movemethod = FILE_END;
|
|
|
|
break;
|
2006-08-12 19:20:19 +04:00
|
|
|
default:
|
2019-09-08 22:29:00 +03:00
|
|
|
return -1;
|
2006-08-12 19:20:19 +04:00
|
|
|
}
|
|
|
|
|
2016-04-02 16:11:18 +03:00
|
|
|
{
|
2018-10-27 01:08:58 +03:00
|
|
|
LONG lo = offset & 0xFFFFFFFFU, hi = offset >> 32;
|
2016-04-02 16:11:18 +03:00
|
|
|
SetFilePointer(f->h, lo, &hi, movemethod);
|
|
|
|
}
|
2019-09-08 22:29:00 +03:00
|
|
|
|
2006-08-12 19:20:19 +04:00
|
|
|
if (GetLastError() != NO_ERROR)
|
2019-09-08 22:29:00 +03:00
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return 0;
|
2006-08-12 19:20:19 +04:00
|
|
|
}
|
|
|
|
|
2018-10-27 01:08:58 +03:00
|
|
|
uint64_t get_file_posn(WFile *f)
|
2006-08-12 19:20:19 +04:00
|
|
|
{
|
2016-05-04 00:27:57 +03:00
|
|
|
LONG lo, hi = 0;
|
2006-08-12 19:20:19 +04:00
|
|
|
|
2016-04-02 16:11:18 +03:00
|
|
|
lo = SetFilePointer(f->h, 0L, &hi, FILE_CURRENT);
|
2018-10-27 01:08:58 +03:00
|
|
|
return uint64_from_words(hi, lo);
|
2006-08-12 19:20:19 +04:00
|
|
|
}
|
|
|
|
|
2015-05-15 13:15:42 +03:00
|
|
|
int file_type(const char *name)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
DWORD attr;
|
|
|
|
attr = GetFileAttributes(name);
|
|
|
|
/* We know of no `weird' files under Windows. */
|
|
|
|
if (attr == (DWORD)-1)
|
2019-09-08 22:29:00 +03:00
|
|
|
return FILE_TYPE_NONEXISTENT;
|
2003-08-25 17:53:41 +04:00
|
|
|
else if (attr & FILE_ATTRIBUTE_DIRECTORY)
|
2019-09-08 22:29:00 +03:00
|
|
|
return FILE_TYPE_DIRECTORY;
|
2003-08-25 17:53:41 +04:00
|
|
|
else
|
2019-09-08 22:29:00 +03:00
|
|
|
return FILE_TYPE_FILE;
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
struct DirHandle {
|
|
|
|
HANDLE h;
|
|
|
|
char *name;
|
|
|
|
};
|
|
|
|
|
2018-12-27 19:52:23 +03:00
|
|
|
DirHandle *open_directory(const char *name, const char **errmsg)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
WIN32_FIND_DATA fdat;
|
|
|
|
char *findfile;
|
|
|
|
DirHandle *ret;
|
|
|
|
|
2004-10-13 16:10:30 +04:00
|
|
|
/* Enumerate files in dir `foo'. */
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 21:42:37 +03:00
|
|
|
findfile = dupcat(name, "/*");
|
2003-08-25 17:53:41 +04:00
|
|
|
h = FindFirstFile(findfile, &fdat);
|
2018-12-27 19:52:23 +03:00
|
|
|
if (h == INVALID_HANDLE_VALUE) {
|
|
|
|
*errmsg = win_strerror(GetLastError());
|
2019-09-08 22:29:00 +03:00
|
|
|
return NULL;
|
2018-12-27 19:52:23 +03:00
|
|
|
}
|
2003-08-25 18:30:59 +04:00
|
|
|
sfree(findfile);
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
ret = snew(DirHandle);
|
|
|
|
ret->h = h;
|
|
|
|
ret->name = dupstr(fdat.cFileName);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *read_filename(DirHandle *dir)
|
|
|
|
{
|
2005-02-26 03:41:36 +03:00
|
|
|
do {
|
|
|
|
|
2019-09-08 22:29:00 +03:00
|
|
|
if (!dir->name) {
|
|
|
|
WIN32_FIND_DATA fdat;
|
|
|
|
if (!FindNextFile(dir->h, &fdat))
|
|
|
|
return NULL;
|
|
|
|
else
|
|
|
|
dir->name = dupstr(fdat.cFileName);
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(dir->name);
|
|
|
|
if (dir->name[0] == '.' &&
|
|
|
|
(dir->name[1] == '\0' ||
|
|
|
|
(dir->name[1] == '.' && dir->name[2] == '\0'))) {
|
|
|
|
sfree(dir->name);
|
|
|
|
dir->name = NULL;
|
|
|
|
}
|
2005-02-26 03:41:36 +03:00
|
|
|
|
|
|
|
} while (!dir->name);
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
if (dir->name) {
|
2019-09-08 22:29:00 +03:00
|
|
|
char *ret = dir->name;
|
|
|
|
dir->name = NULL;
|
|
|
|
return ret;
|
2003-08-25 17:53:41 +04:00
|
|
|
} else
|
2019-09-08 22:29:00 +03:00
|
|
|
return NULL;
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void close_directory(DirHandle *dir)
|
|
|
|
{
|
|
|
|
FindClose(dir->h);
|
|
|
|
if (dir->name)
|
2019-09-08 22:29:00 +03:00
|
|
|
sfree(dir->name);
|
2003-08-25 17:53:41 +04:00
|
|
|
sfree(dir);
|
|
|
|
}
|
|
|
|
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
int test_wildcard(const char *name, bool cmdline)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
HANDLE fh;
|
|
|
|
WIN32_FIND_DATA fdat;
|
|
|
|
|
|
|
|
/* First see if the exact name exists. */
|
|
|
|
if (GetFileAttributes(name) != (DWORD)-1)
|
2019-09-08 22:29:00 +03:00
|
|
|
return WCTYPE_FILENAME;
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
/* Otherwise see if a wildcard match finds anything. */
|
|
|
|
fh = FindFirstFile(name, &fdat);
|
|
|
|
if (fh == INVALID_HANDLE_VALUE)
|
2019-09-08 22:29:00 +03:00
|
|
|
return WCTYPE_NONEXISTENT;
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
FindClose(fh);
|
|
|
|
return WCTYPE_WILDCARD;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct WildcardMatcher {
|
|
|
|
HANDLE h;
|
|
|
|
char *name;
|
|
|
|
char *srcpath;
|
|
|
|
};
|
|
|
|
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
char *stripslashes(const char *str, bool local)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
|
2015-09-24 19:47:10 +03:00
|
|
|
/*
|
|
|
|
* On Windows, \ / : are all path component separators.
|
|
|
|
*/
|
|
|
|
|
2003-08-25 17:53:41 +04:00
|
|
|
if (local) {
|
|
|
|
p = strchr(str, ':');
|
|
|
|
if (p) str = p+1;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = strrchr(str, '/');
|
|
|
|
if (p) str = p+1;
|
|
|
|
|
|
|
|
if (local) {
|
2019-09-08 22:29:00 +03:00
|
|
|
p = strrchr(str, '\\');
|
|
|
|
if (p) str = p+1;
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
2015-09-24 19:47:10 +03:00
|
|
|
return (char *)str;
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
2015-05-15 13:15:42 +03:00
|
|
|
WildcardMatcher *begin_wildcard_matching(const char *name)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
HANDLE h;
|
|
|
|
WIN32_FIND_DATA fdat;
|
|
|
|
WildcardMatcher *ret;
|
|
|
|
char *last;
|
|
|
|
|
|
|
|
h = FindFirstFile(name, &fdat);
|
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
2019-09-08 22:29:00 +03:00
|
|
|
return NULL;
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
ret = snew(WildcardMatcher);
|
|
|
|
ret->h = h;
|
|
|
|
ret->srcpath = dupstr(name);
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
last = stripslashes(ret->srcpath, true);
|
2003-08-25 17:53:41 +04:00
|
|
|
*last = '\0';
|
|
|
|
if (fdat.cFileName[0] == '.' &&
|
2019-09-08 22:29:00 +03:00
|
|
|
(fdat.cFileName[1] == '\0' ||
|
|
|
|
(fdat.cFileName[1] == '.' && fdat.cFileName[2] == '\0')))
|
|
|
|
ret->name = NULL;
|
2003-08-25 17:53:41 +04:00
|
|
|
else
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 21:42:37 +03:00
|
|
|
ret->name = dupcat(ret->srcpath, fdat.cFileName);
|
2003-08-25 17:53:41 +04:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *wildcard_get_filename(WildcardMatcher *dir)
|
|
|
|
{
|
|
|
|
while (!dir->name) {
|
2019-09-08 22:29:00 +03:00
|
|
|
WIN32_FIND_DATA fdat;
|
2003-08-25 17:53:41 +04:00
|
|
|
|
2019-09-08 22:29:00 +03:00
|
|
|
if (!FindNextFile(dir->h, &fdat))
|
|
|
|
return NULL;
|
2003-08-25 17:53:41 +04:00
|
|
|
|
2019-09-08 22:29:00 +03:00
|
|
|
if (fdat.cFileName[0] == '.' &&
|
|
|
|
(fdat.cFileName[1] == '\0' ||
|
|
|
|
(fdat.cFileName[1] == '.' && fdat.cFileName[2] == '\0')))
|
|
|
|
dir->name = NULL;
|
|
|
|
else
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 21:42:37 +03:00
|
|
|
dir->name = dupcat(dir->srcpath, fdat.cFileName);
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (dir->name) {
|
2019-09-08 22:29:00 +03:00
|
|
|
char *ret = dir->name;
|
|
|
|
dir->name = NULL;
|
|
|
|
return ret;
|
2003-08-25 17:53:41 +04:00
|
|
|
} else
|
2019-09-08 22:29:00 +03:00
|
|
|
return NULL;
|
2003-08-25 17:53:41 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void finish_wildcard_matching(WildcardMatcher *dir)
|
|
|
|
{
|
|
|
|
FindClose(dir->h);
|
|
|
|
if (dir->name)
|
2019-09-08 22:29:00 +03:00
|
|
|
sfree(dir->name);
|
2003-08-25 17:53:41 +04:00
|
|
|
sfree(dir->srcpath);
|
|
|
|
sfree(dir);
|
|
|
|
}
|
|
|
|
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
bool vet_filename(const char *name)
|
2004-12-16 22:36:47 +03:00
|
|
|
{
|
|
|
|
if (strchr(name, '/') || strchr(name, '\\') || strchr(name, ':'))
|
2019-09-08 22:29:00 +03:00
|
|
|
return false;
|
2004-12-16 22:36:47 +03:00
|
|
|
|
|
|
|
if (!name[strspn(name, ".")]) /* entirely composed of dots */
|
2019-09-08 22:29:00 +03:00
|
|
|
return false;
|
2004-12-16 22:36:47 +03:00
|
|
|
|
2018-10-29 22:50:29 +03:00
|
|
|
return true;
|
2004-12-16 22:36:47 +03:00
|
|
|
}
|
|
|
|
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
bool create_directory(const char *name)
|
2003-08-25 17:53:41 +04:00
|
|
|
{
|
|
|
|
return CreateDirectory(name, NULL) != 0;
|
|
|
|
}
|
|
|
|
|
2015-05-15 13:15:42 +03:00
|
|
|
char *dir_file_cat(const char *dir, const char *file)
|
2003-08-25 18:30:59 +04:00
|
|
|
{
|
2019-03-09 19:15:51 +03:00
|
|
|
ptrlen dir_pl = ptrlen_from_asciz(dir);
|
|
|
|
return dupcat(
|
|
|
|
dir, (ptrlen_endswith(dir_pl, PTRLEN_LITERAL("\\"), NULL) ||
|
|
|
|
ptrlen_endswith(dir_pl, PTRLEN_LITERAL("/"), NULL)) ? "" : "\\",
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 21:42:37 +03:00
|
|
|
file);
|
2003-08-25 18:30:59 +04:00
|
|
|
}
|
|
|
|
|
2003-08-25 17:53:41 +04:00
|
|
|
/* ----------------------------------------------------------------------
|
|
|
|
* Platform-specific network handling.
|
|
|
|
*/
|
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
int do_eventsel_loop(HANDLE other_event)
|
|
|
|
{
|
2006-08-26 14:18:31 +04:00
|
|
|
int n, nhandles, nallhandles, netindex, otherindex;
|
2012-09-19 01:42:48 +04:00
|
|
|
unsigned long next, then;
|
|
|
|
long ticks;
|
2006-08-26 02:10:16 +04:00
|
|
|
HANDLE *handles;
|
2004-11-27 16:20:21 +03:00
|
|
|
SOCKET *sklist;
|
|
|
|
int skcount;
|
2012-09-19 01:42:48 +04:00
|
|
|
unsigned long now = GETTICKCOUNT();
|
2004-11-27 16:20:21 +03:00
|
|
|
|
2013-09-15 18:05:31 +04:00
|
|
|
if (toplevel_callback_pending()) {
|
|
|
|
ticks = 0;
|
2014-11-22 13:18:16 +03:00
|
|
|
next = now;
|
2013-09-15 18:05:31 +04:00
|
|
|
} else if (run_timers(now, &next)) {
|
2019-09-08 22:29:00 +03:00
|
|
|
then = now;
|
|
|
|
now = GETTICKCOUNT();
|
|
|
|
if (now - then > next - then)
|
|
|
|
ticks = 0;
|
|
|
|
else
|
|
|
|
ticks = next - now;
|
2006-08-26 14:18:31 +04:00
|
|
|
} else {
|
2019-09-08 22:29:00 +03:00
|
|
|
ticks = INFINITE;
|
2014-11-22 13:18:16 +03:00
|
|
|
/* no need to initialise next here because we can never get
|
|
|
|
* WAIT_TIMEOUT */
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
|
|
|
|
2006-08-26 02:10:16 +04:00
|
|
|
handles = handle_get_events(&nhandles);
|
|
|
|
handles = sresize(handles, nhandles+2, HANDLE);
|
|
|
|
nallhandles = nhandles;
|
|
|
|
|
2020-01-01 14:10:22 +03:00
|
|
|
if (winselcli_event != INVALID_HANDLE_VALUE)
|
|
|
|
handles[netindex = nallhandles++] = winselcli_event;
|
2006-08-26 14:18:31 +04:00
|
|
|
else
|
2019-09-08 22:29:00 +03:00
|
|
|
netindex = -1;
|
2006-08-29 22:32:44 +04:00
|
|
|
if (other_event != INVALID_HANDLE_VALUE)
|
2019-09-08 22:29:00 +03:00
|
|
|
handles[otherindex = nallhandles++] = other_event;
|
2006-08-26 14:18:31 +04:00
|
|
|
else
|
2019-09-08 22:29:00 +03:00
|
|
|
otherindex = -1;
|
2004-11-27 16:20:21 +03:00
|
|
|
|
2018-10-29 22:50:29 +03:00
|
|
|
n = WaitForMultipleObjects(nallhandles, handles, false, ticks);
|
2004-11-27 16:20:21 +03:00
|
|
|
|
2006-08-26 02:10:16 +04:00
|
|
|
if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) {
|
2019-09-08 22:29:00 +03:00
|
|
|
handle_got_event(handles[n - WAIT_OBJECT_0]);
|
2006-08-26 14:18:31 +04:00
|
|
|
} else if (netindex >= 0 && n == WAIT_OBJECT_0 + netindex) {
|
2019-09-08 22:29:00 +03:00
|
|
|
WSANETWORKEVENTS things;
|
|
|
|
SOCKET socket;
|
|
|
|
int i, socketstate;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We must not call select_result() for any socket
|
|
|
|
* until we have finished enumerating within the
|
|
|
|
* tree. This is because select_result() may close
|
|
|
|
* the socket and modify the tree.
|
|
|
|
*/
|
|
|
|
/* Count the active sockets. */
|
|
|
|
i = 0;
|
|
|
|
for (socket = first_socket(&socketstate);
|
|
|
|
socket != INVALID_SOCKET;
|
|
|
|
socket = next_socket(&socketstate)) i++;
|
|
|
|
|
|
|
|
/* Expand the buffer if necessary. */
|
|
|
|
sklist = snewn(i, SOCKET);
|
|
|
|
|
|
|
|
/* Retrieve the sockets into sklist. */
|
|
|
|
skcount = 0;
|
|
|
|
for (socket = first_socket(&socketstate);
|
|
|
|
socket != INVALID_SOCKET;
|
|
|
|
socket = next_socket(&socketstate)) {
|
|
|
|
sklist[skcount++] = socket;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we're done enumerating; go through the list. */
|
|
|
|
for (i = 0; i < skcount; i++) {
|
|
|
|
WPARAM wp;
|
|
|
|
socket = sklist[i];
|
|
|
|
wp = (WPARAM) socket;
|
|
|
|
if (!p_WSAEnumNetworkEvents(socket, NULL, &things)) {
|
|
|
|
static const struct { int bit, mask; } eventtypes[] = {
|
|
|
|
{FD_CONNECT_BIT, FD_CONNECT},
|
|
|
|
{FD_READ_BIT, FD_READ},
|
|
|
|
{FD_CLOSE_BIT, FD_CLOSE},
|
|
|
|
{FD_OOB_BIT, FD_OOB},
|
|
|
|
{FD_WRITE_BIT, FD_WRITE},
|
|
|
|
{FD_ACCEPT_BIT, FD_ACCEPT},
|
|
|
|
};
|
|
|
|
int e;
|
|
|
|
|
|
|
|
noise_ultralight(NOISE_SOURCE_IOID, socket);
|
|
|
|
|
|
|
|
for (e = 0; e < lenof(eventtypes); e++)
|
|
|
|
if (things.lNetworkEvents & eventtypes[e].mask) {
|
|
|
|
LPARAM lp;
|
|
|
|
int err = things.iErrorCode[eventtypes[e].bit];
|
|
|
|
lp = WSAMAKESELECTREPLY(eventtypes[e].mask, err);
|
|
|
|
select_result(wp, lp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sfree(sklist);
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
|
|
|
|
2006-08-26 02:10:16 +04:00
|
|
|
sfree(handles);
|
|
|
|
|
2013-08-17 20:06:08 +04:00
|
|
|
run_toplevel_callbacks();
|
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
if (n == WAIT_TIMEOUT) {
|
2019-09-08 22:29:00 +03:00
|
|
|
now = next;
|
2004-11-27 16:20:21 +03:00
|
|
|
} else {
|
2019-09-08 22:29:00 +03:00
|
|
|
now = GETTICKCOUNT();
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
|
|
|
|
2006-08-26 14:18:31 +04:00
|
|
|
if (otherindex >= 0 && n == WAIT_OBJECT_0 + otherindex)
|
2019-09-08 22:29:00 +03:00
|
|
|
return 1;
|
2004-11-27 16:20:21 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-08-24 16:47:46 +04:00
|
|
|
/*
|
|
|
|
* Wait for some network data and process it.
|
2004-11-27 16:20:21 +03:00
|
|
|
*
|
|
|
|
* We have two variants of this function. One uses select() so that
|
|
|
|
* it's compatible with WinSock 1. The other uses WSAEventSelect
|
|
|
|
* and MsgWaitForMultipleObjects, so that we can consistently use
|
|
|
|
* WSAEventSelect throughout; this enables us to also implement
|
|
|
|
* ssh_sftp_get_cmdline() using a parallel mechanism.
|
2003-08-24 16:47:46 +04:00
|
|
|
*/
|
|
|
|
int ssh_sftp_loop_iteration(void)
|
|
|
|
{
|
2004-11-27 16:20:21 +03:00
|
|
|
if (p_WSAEventSelect == NULL) {
|
2019-09-08 22:29:00 +03:00
|
|
|
fd_set readfds;
|
|
|
|
int ret;
|
|
|
|
unsigned long now = GETTICKCOUNT(), then;
|
2020-01-01 14:10:22 +03:00
|
|
|
SOCKET skt = winselcli_unique_socket();
|
2019-09-08 22:29:00 +03:00
|
|
|
|
2020-01-01 14:10:22 +03:00
|
|
|
if (skt == INVALID_SOCKET)
|
2019-09-08 22:29:00 +03:00
|
|
|
return -1; /* doom */
|
|
|
|
|
2020-01-01 14:10:22 +03:00
|
|
|
if (socket_writable(skt))
|
|
|
|
select_result((WPARAM) skt, (LPARAM) FD_WRITE);
|
2019-09-08 22:29:00 +03:00
|
|
|
|
|
|
|
do {
|
|
|
|
unsigned long next;
|
|
|
|
long ticks;
|
|
|
|
struct timeval tv, *ptv;
|
|
|
|
|
|
|
|
if (run_timers(now, &next)) {
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
FD_ZERO(&readfds);
|
2020-01-01 14:10:22 +03:00
|
|
|
FD_SET(skt, &readfds);
|
2019-09-08 22:29:00 +03:00
|
|
|
ret = p_select(1, &readfds, NULL, NULL, ptv);
|
|
|
|
|
|
|
|
if (ret < 0)
|
|
|
|
return -1; /* doom */
|
|
|
|
else if (ret == 0)
|
|
|
|
now = next;
|
|
|
|
else
|
|
|
|
now = GETTICKCOUNT();
|
|
|
|
|
|
|
|
} while (ret == 0);
|
|
|
|
|
2020-01-01 14:10:22 +03:00
|
|
|
select_result((WPARAM) skt, (LPARAM) FD_READ);
|
2019-09-08 22:29:00 +03:00
|
|
|
|
|
|
|
return 0;
|
2004-11-27 16:20:21 +03:00
|
|
|
} else {
|
2019-09-08 22:29:00 +03:00
|
|
|
return do_eventsel_loop(INVALID_HANDLE_VALUE);
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read a command line from standard input.
|
2019-09-08 22:29:00 +03:00
|
|
|
*
|
2004-11-27 16:20:21 +03:00
|
|
|
* In the presence of WinSock 2, we can use WSAEventSelect to
|
|
|
|
* mediate between the socket and stdin, meaning we can send
|
|
|
|
* keepalives and respond to server events even while waiting at
|
|
|
|
* the PSFTP command prompt. Without WS2, we fall back to a simple
|
|
|
|
* fgets.
|
|
|
|
*/
|
|
|
|
struct command_read_ctx {
|
|
|
|
HANDLE event;
|
|
|
|
char *line;
|
|
|
|
};
|
|
|
|
|
|
|
|
static DWORD WINAPI command_read_thread(void *param)
|
|
|
|
{
|
|
|
|
struct command_read_ctx *ctx = (struct command_read_ctx *) param;
|
|
|
|
|
|
|
|
ctx->line = fgetline(stdin);
|
|
|
|
|
|
|
|
SetEvent(ctx->event);
|
2003-08-24 16:47:46 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
char *ssh_sftp_get_cmdline(const char *prompt, bool no_fds_ok)
|
2004-11-27 16:20:21 +03:00
|
|
|
{
|
|
|
|
int ret;
|
2019-12-22 11:15:52 +03:00
|
|
|
struct command_read_ctx ctx[1];
|
2004-11-27 16:20:21 +03:00
|
|
|
DWORD threadid;
|
2014-12-20 21:42:22 +03:00
|
|
|
HANDLE hThread;
|
2004-11-27 16:20:21 +03:00
|
|
|
|
|
|
|
fputs(prompt, stdout);
|
|
|
|
fflush(stdout);
|
|
|
|
|
2020-01-01 14:10:22 +03:00
|
|
|
if ((winselcli_unique_socket() == INVALID_SOCKET && no_fds_ok) ||
|
2019-09-08 22:29:00 +03:00
|
|
|
p_WSAEventSelect == NULL) {
|
|
|
|
return fgetline(stdin); /* very simple */
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a second thread to read from stdin. Process network
|
|
|
|
* and timing events until it terminates.
|
|
|
|
*/
|
2018-10-29 22:50:29 +03:00
|
|
|
ctx->event = CreateEvent(NULL, false, false, NULL);
|
2004-11-27 16:20:21 +03:00
|
|
|
ctx->line = NULL;
|
|
|
|
|
2014-12-20 21:42:22 +03:00
|
|
|
hThread = CreateThread(NULL, 0, command_read_thread, ctx, 0, &threadid);
|
|
|
|
if (!hThread) {
|
2019-09-08 22:29:00 +03:00
|
|
|
CloseHandle(ctx->event);
|
|
|
|
fprintf(stderr, "Unable to create command input thread\n");
|
|
|
|
cleanup_exit(1);
|
2004-11-27 16:20:21 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
2019-09-08 22:29:00 +03:00
|
|
|
ret = do_eventsel_loop(ctx->event);
|
2004-11-27 16:20:21 +03:00
|
|
|
|
winsftp.c: avoid creating multiple netevents.
The do_select function is called with a boolean parameter indicating
whether we're supposed to start or stop paying attention to network
activity on a given socket. So if we freeze and unfreeze the socket in
mid-session because of backlog, we'll call do_select(s, false) to
freeze it, and do_select(s, true) to unfreeze it.
But the implementation of do_select in the Windows SFTP code predated
the rigorous handling of socket backlogs, so it assumed that
do_select(s, true) would only be called at initialisation time, i.e.
only once, and therefore that it was safe to use that flag as a cue to
set up the Windows event object to associate with socket activity.
Hence, every time the socket was frozen and unfrozen, we would create
a new netevent at unfreeze time, leaking the old one.
I think perhaps part of the reason why that was hard to figure out was
that the boolean parameter was called 'startup' rather than 'enable'.
To make it less confusing the next time I read this code, I've also
renamed it, and while I was at it, adjusted another related comment.
2019-12-21 16:31:02 +03:00
|
|
|
/* do_eventsel_loop can't return an error (unlike
|
|
|
|
* ssh_sftp_loop_iteration, which can return -1 if select goes
|
|
|
|
* wrong or if the socket doesn't exist). */
|
2019-09-08 22:29:00 +03:00
|
|
|
assert(ret >= 0);
|
2004-11-27 16:20:21 +03:00
|
|
|
} while (ret == 0);
|
|
|
|
|
2014-12-20 21:42:22 +03:00
|
|
|
CloseHandle(hThread);
|
|
|
|
CloseHandle(ctx->event);
|
|
|
|
|
2004-11-27 16:20:21 +03:00
|
|
|
return ctx->line;
|
|
|
|
}
|
|
|
|
|
2017-02-11 03:44:00 +03:00
|
|
|
void platform_psftp_pre_conn_setup(void)
|
2016-04-02 10:00:07 +03:00
|
|
|
{
|
2017-02-11 03:44:00 +03:00
|
|
|
if (restricted_acl) {
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 21:26:18 +03:00
|
|
|
lp_eventlog(default_logpolicy, "Running with restricted process ACL");
|
2017-02-11 03:44:00 +03:00
|
|
|
}
|
2016-04-02 10:00:07 +03:00
|
|
|
}
|
|
|
|
|
2003-08-25 17:53:41 +04:00
|
|
|
/* ----------------------------------------------------------------------
|
2003-08-24 16:47:46 +04:00
|
|
|
* Main program. Parse arguments etc.
|
|
|
|
*/
|
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2016-07-18 22:02:32 +03:00
|
|
|
dll_hijacking_protection();
|
|
|
|
|
2003-08-24 16:47:46 +04:00
|
|
|
ret = psftp_main(argc, argv);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|