nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-21 04:55:02 -05:00
Code Issues Projects Releases Wiki Activity

provide_xrm_string: report a more sensible program name.

Browse Source 
It was always issuing an error message beginning "pterm:", even when
the application was GTK PuTTY or Unix Plink.
This commit is contained in:
Simon Tatham 2019-04-13 19:12:53 +01:00
parent 2692bfe8ee
commit 56198afb5c
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/gtkmain.c
View File

@ -515,7 +515,7 @@ bool do_cmdline(int argc, char **argv, bool do_everything, Conf *conf)
} else if (!strcmp(p, "-xrm")) { } else if (!strcmp(p, "-xrm")) {
EXPECTS_ARG; EXPECTS_ARG;
provide_xrm_string(val); provide_xrm_string(val, appname);
} else if(!strcmp(p, "-help") || !strcmp(p, "--help")) { } else if(!strcmp(p, "-help") || !strcmp(p, "--help")) {
help(stdout); help(stdout);

2
unix/unix.h
View File

@ -267,7 +267,7 @@ int keysym_to_unicode(int keysym);
char *x_get_default(const char *key); char *x_get_default(const char *key);
/* Things uxstore.c provides to gtkwin.c */ /* Things uxstore.c provides to gtkwin.c */
void provide_xrm_string(const char *string); void provide_xrm_string(const char *string, const char *progname);
/* Function that {gtkapp,gtkmain}.c needs from ux{pterm,putty}.c. Does /* Function that {gtkapp,gtkmain}.c needs from ux{pterm,putty}.c. Does
* early process setup that varies between applications (e.g. * early process setup that varies between applications (e.g.

6
unix/uxplink.c
View File

@ -661,7 +661,11 @@ int main(int argc, char **argv)
errors = true; errors = true;
} else { } else {
--argc; --argc;
provide_xrm_string(*++argv); /* Explicitly pass "plink" in place of appname for
* error reporting purposes. appname will have been
* set by be_foo.c to something more generic, probably
* "PuTTY". */
provide_xrm_string(*++argv, "plink");
} }
} else if (!strcmp(p, "-shareexists")) { } else if (!strcmp(p, "-shareexists")) {
just_test_share_exists = true; just_test_share_exists = true;

6
unix/uxstore.c
View File

@ -301,7 +301,7 @@ static int keycmp(void *av, void *bv)
return strcmp(a->key, b->key); return strcmp(a->key, b->key);
} }
void provide_xrm_string(const char *string) void provide_xrm_string(const char *string, const char *progname)
{ {
const char *p, *q; const char *p, *q;
char *key; char *key;
@ -309,8 +309,8 @@ void provide_xrm_string(const char *string)
p = q = strchr(string, ':'); p = q = strchr(string, ':');
if (!q) { if (!q) {
fprintf(stderr, "pterm: expected a colon in resource string" fprintf(stderr, "%s: expected a colon in resource string"
" \"%s\"\n", string); " \"%s\"\n", progname, string);
return; return;
} }
q++; q++;