nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Remove FLAG_SYNCAGENT.

Browse Source 
This was the easiest flag to remove: nothing ever checks it at all!

It was part of an abandoned early attempt to make Pageant requests
asynchronous. The flag was added in commit 135abf244 (April 2003); the
code that used it was #ifdef-ed out in commit 98d735fde (January 2004),
and removed completely in commit f864265e3 (January 2017).

We now have an actually working system for async agent requests on
Windows, via the new named-pipe IPC. And we also have a perfectly good
way to force a particular agent request to work synchronously: just
pass NULL as the callback function pointer. All of that works just
fine, without ever using this flag. So begone!
This commit is contained in:
Simon Tatham 2020-01-30 06:40:21 +00:00
parent 6e85d3fe60
commit e5f85fc269
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pscp.c
View File

@ -2235,11 +2235,7 @@ int psftp_main(int argc, char *argv[])
default_protocol = PROT_TELNET; default_protocol = PROT_TELNET;
flags = 0 flags = 0;
#ifdef FLAG_SYNCAGENT
| FLAG_SYNCAGENT
#endif
;
cmdline_tooltype = TOOLTYPE_FILETRANSFER; cmdline_tooltype = TOOLTYPE_FILETRANSFER;
sk_init(); sk_init();

6
psftp.c
View File

@ -2769,11 +2769,7 @@ int psftp_main(int argc, char *argv[])
bool sanitise_stderr = true; bool sanitise_stderr = true;
char *batchfile = NULL; char *batchfile = NULL;
flags = 0 flags = 0;
#ifdef FLAG_SYNCAGENT
| FLAG_SYNCAGENT
#endif
;
cmdline_tooltype = TOOLTYPE_FILETRANSFER; cmdline_tooltype = TOOLTYPE_FILETRANSFER;
sk_init(); sk_init();

2
windows/winpgnt.c
View File

@ -1183,7 +1183,7 @@ void cleanup_exit(int code)
exit(code); exit(code);
} }
int flags = FLAG_SYNCAGENT; int flags = 0;
struct winpgnt_client { struct winpgnt_client {
PageantListenerClient plc; PageantListenerClient plc;

4
windows/winstuff.h
View File

@ -662,13 +662,9 @@ char *agent_named_pipe_name(void);
* winpgntc.c needs to schedule callbacks for asynchronous agent * winpgntc.c needs to schedule callbacks for asynchronous agent
* requests. This has to be done differently in GUI and console, so * requests. This has to be done differently in GUI and console, so
* there's an exported function used for the purpose. * there's an exported function used for the purpose.
*
* Also, we supply FLAG_SYNCAGENT to force agent requests to be
* synchronous in pscp and psftp.
*/ */
void agent_schedule_callback(void (*callback)(void *, void *, int), void agent_schedule_callback(void (*callback)(void *, void *, int),
void *callback_ctx, void *data, int len); void *callback_ctx, void *data, int len);
#define FLAG_SYNCAGENT 0x1000
/* /*
* Exports from winser.c. * Exports from winser.c.