From 9220032f8017cfb6a4ee0ddea3ee3d510686dc13 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Tue, 18 Aug 1998 04:05:05 +0000 Subject: Enclose string dumps in doublequotes to work with visbuf properly. svn path=/trunk/; revision=2045 --- NEWS | 4 ++++ env.c | 7 ++++++- fetchmail.c | 12 ++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 54195632..fc461bfe 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ fetchmail-4.5.6 (): * SDPS support, experimental version 2. Requires configure --enable-SDPS. +* Major FAQ update. Added geocities warning. +* Fix --configdump so embedded single and double quotes are handled. + +There are 254 people on fetchmail-friends and 267 on fetchmail-announce. fetchmail-4.5.5 (Mon Aug 3 16:08:14 EDT 1998): * Brendan Cully's FAQ entry on GSSAPI. diff --git a/env.c b/env.c index 67679d19..3e86ac45 100644 --- a/env.c +++ b/env.c @@ -97,7 +97,12 @@ char *visbuf(const char *buf) while (*buf) { - if (isprint(*buf) || *buf == ' ') + if (*buf == '"') + { + *tp++ = '\\'; *tp++ = '"'; + buf++; + } + else if (isprint(*buf) || *buf == ' ') *tp++ = *buf++; else if (*buf == '\n') { diff --git a/fetchmail.c b/fetchmail.c index f1a983a7..4cf1c338 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -1238,11 +1238,11 @@ void dump_params (struct runctl *runp, struct query *querylist, flag implicit) printf(" Password will be prompted for.\n"); else if (outlevel == O_VERBOSE) if (ctl->server.protocol == P_APOP) - printf(" APOP secret = '%s'.\n", visbuf(ctl->password)); + printf(" APOP secret = \"%s\".\n", visbuf(ctl->password)); else if (ctl->server.protocol == P_RPOP) - printf(" RPOP id = '%s'.\n", visbuf(ctl->password)); + printf(" RPOP id = \"%s\".\n", visbuf(ctl->password)); else - printf(" Password = '%s'.\n", visbuf(ctl->password)); + printf(" Password = \"%s\".\n", visbuf(ctl->password)); if (ctl->server.protocol == P_POP3 #if INET6 && !strcmp(ctl->server.service, KPOP_PORT) @@ -1340,7 +1340,7 @@ void dump_params (struct runctl *runp, struct query *querylist, flag implicit) printf(" No expunges (--expunge 0).\n"); } if (ctl->mda && (ctl->server.protocol != P_ETRN)) - printf(" Messages will be delivered with '%s.'\n", visbuf(ctl->mda)); + printf(" Messages will be delivered with \"%s\".\n", visbuf(ctl->mda)); else { struct idlist *idp; @@ -1373,12 +1373,12 @@ void dump_params (struct runctl *runp, struct query *querylist, flag implicit) printf(" Spam-blocking disabled\n"); } if (ctl->preconnect) - printf(" Server connection will be brought up with '%s.'\n", + printf(" Server connection will be brought up with \"%s\".\n", visbuf(ctl->preconnect)); else if (outlevel == O_VERBOSE) printf(" No pre-connection command.\n"); if (ctl->postconnect) - printf(" Server connection will be taken down with '%s.'\n", + printf(" Server connection will be taken down with \"%s\".\n", visbuf(ctl->postconnect)); else if (outlevel == O_VERBOSE) printf(" No post-connection command.\n"); -- cgit v1.2.3