diff options
| -rw-r--r-- | conf.c | 6 | ||||
| -rw-r--r-- | fetchmail.c | 7 |
2 files changed, 8 insertions, 5 deletions
@@ -123,6 +123,7 @@ void dump_config(struct runctl *runp, struct query *querylist) { struct query *ctl; struct idlist *idp; + const char *features; indent_level = 0; @@ -149,7 +150,7 @@ void dump_config(struct runctl *runp, struct query *querylist) * This should be approximately in sync with the -V option dumping * in fetchmail.c. */ - printf("feature_options = (" + features = "feature_options = (" #ifdef POP2_ENABLE "'pop2'," #endif /* POP2_ENABLE */ @@ -186,7 +187,8 @@ void dump_config(struct runctl *runp, struct query *querylist) #ifdef INET6_ENABLE "'inet6'," #endif /* INET6_ENABLE */ - ")\n"); + ")\n"; + fputs(features, stdout); fputs("# Start of configuration initializer\n", stdout); fputs("fetchmailrc = ", stdout); diff --git a/fetchmail.c b/fetchmail.c index 0d237213..54ba2a81 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -199,8 +199,7 @@ int main(int argc, char **argv) if (versioninfo) { - printf(GT_("This is fetchmail release %s"), VERSION); - printf( + const char *features = #ifdef POP2_ENABLE "+POP2" #endif /* POP2_ENABLE */ @@ -246,7 +245,9 @@ int main(int argc, char **argv) #ifdef ENABLE_NLS "+NLS" #endif /* ENABLE_NLS */ - "\n"); + "\n"; + printf(GT_("This is fetchmail release %s"), VERSION); + fputs(features, stdout); fputs("Fallback MDA: ", stdout); #ifdef FALLBACK_MDA fputs(FALLBACK_MDA, stdout); |