putty/clicons.c

/*
 * clicons.c: definitions limited to tools that link against both
 * console.c and cmdline.c.
 */

#include "putty.h"

static const LogPolicyVtable console_cli_logpolicy_vt = {
    console_eventlog,
    console_askappend,
    console_logging_error,
    cmdline_lp_verbose,
};
LogPolicy console_cli_logpolicy[1] = {{ &console_cli_logpolicy_vt }};
Remove FLAG_VERBOSE. The global 'int flags' has always been an ugly feature of this code base, and I suddenly thought that perhaps it's time to start throwing it out, one flag at a time, until it's totally unused. My first target is FLAG_VERBOSE. This was usually set by cmdline.c when it saw a -v option on the program's command line, except that GUI PuTTY itself sets it unconditionally on startup. And then various bits of the code would check it in order to decide whether to print a given message. In the current system of front-end abstraction traits, there's no _one_ place that I can move it to. But there are two: every place that checked FLAG_VERBOSE has access to either a Seat or a LogPolicy. So now each of those traits has a query method for 'do I want verbose messages?'. A good effect of this is that subsidiary Seats, like the ones used in Uppity for the main SSH server module itself and the server end of shell channels, now get to have their own verbosity setting instead of inheriting the one global one. In fact I don't expect any code using those Seats to be generating any messages at all, but if that changes later, we'll have a way to control it. (Who knows, perhaps logging in Uppity might become a thing.) As part of this cleanup, I've added a new flag to cmdline_tooltype, called TOOLTYPE_NO_VERBOSE_OPTION. The unconditionally-verbose tools now set that, and it has the effect of making cmdline.c disallow -v completely. So where 'putty -v' would previously have been silently ignored ("I was already verbose"), it's now an error, reminding you that that option doesn't actually do anything. Finally, the 'default_logpolicy' provided by uxcons.c and wincons.c (with identical definitions) has had to move into a new file of its own, because now it has to ask cmdline.c for the verbosity setting as well as asking console.c for the rest of its methods. So there's a new file clicons.c which can only be included by programs that link against both cmdline.c _and_ one of the *cons.c, and I've renamed the logpolicy to reflect that. 2020-01-30 09:40:21 +03:00			`/*`
			`* clicons.c: definitions limited to tools that link against both`
			`* console.c and cmdline.c.`
			`*/`

			`#include "putty.h"`

			`static const LogPolicyVtable console_cli_logpolicy_vt = {`
			`console_eventlog,`
			`console_askappend,`
			`console_logging_error,`
			`cmdline_lp_verbose,`
			`};`
			`LogPolicy console_cli_logpolicy[1] = {{ &console_cli_logpolicy_vt }};`