Update translations.

[~andy/fetchmail] / fetchmail.c

diff --git a/fetchmail.c b/fetchmail.c
index e0ec175826778300233230b207602fdba5abe705..6456ed284906c68952bc805fc2eff9a9b4f2fda5 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -72,9 +72,9 @@ flag versioninfo;         /* emit only version info */
 char *user;                /* the name of the invoking user */
 char *home;                /* invoking user's home directory */
 char *fmhome;              /* fetchmail's home directory */
-char *program_name;        /* the name to prefix error messages with */
+const char *program_name;   /* the name to prefix error messages with */
 flag configdump;           /* dump control blocks for configurator */
-char *fetchmailhost;       /* either `localhost' or the host's FQDN */
+const char *fetchmailhost;  /* either `localhost' or the host's FQDN */
 
 static int quitonly;       /* if we should quit after killing the running daemon */
 
@@ -137,12 +137,16 @@ static void printcopyright(FILE *fp) {
        fprintf(fp, GT_("Copyright (C) 2002, 2003 Eric S. Raymond\n"
                   "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
                   "                   Robert M. Funk, Graham Wilson\n"
-                  "Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
-                  "Copyright (C) 2005 - 2010 Matthias Andree\n"
+                  "Copyright (C) 2005 - 2006, 2010 - 2011 Sunil Shetye\n"
+                  "Copyright (C) 2005 - 2011 Matthias Andree\n"
                   ));
        fprintf(fp, GT_("Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
                   "are welcome to redistribute it under certain conditions. For details,\n"
                   "please see the file COPYING in the source or documentation directory.\n"));
+#ifdef SSL_ENABLE
+       /* Do not translate this */
+       fprintf(fp, "This product includes software developed by the OpenSSL Project\nfor use in the OpenSSL Toolkit. (http://www.openssl.org/)\n");
+#endif
 }
 
 const char *iana_charset;
@@ -446,8 +450,8 @@ int main(int argc, char **argv)
        }
        else if (kill(pid, SIGTERM) < 0)
        {
-           fprintf(stderr,GT_("fetchmail: error killing %s fetchmail at %d; bailing out.\n"),
-                   bkgd ? GT_("background") : GT_("foreground"), pid);
+           fprintf(stderr,GT_("fetchmail: error killing %s fetchmail at %ld; bailing out.\n"),
+                   bkgd ? GT_("background") : GT_("foreground"), (long)pid);
            exit(PS_EXCLUDE);
        }
        else
@@ -455,8 +459,8 @@ int main(int argc, char **argv)
            int maxwait;
 
            if (outlevel > O_SILENT)
-               fprintf(stderr,GT_("fetchmail: %s fetchmail at %d killed.\n"),
-                       bkgd ? GT_("background") : GT_("foreground"), pid);
+               fprintf(stderr,GT_("fetchmail: %s fetchmail at %ld killed.\n"),
+                       bkgd ? GT_("background") : GT_("foreground"), (long)pid);
            /* We used to nuke the other process's lock here, with
             * fm_lock_release(), which is broken. The other process
             * needs to clear its lock by itself. */
@@ -484,15 +488,15 @@ int main(int argc, char **argv)
        else if (!implicitmode)
        {
            fprintf(stderr,
-                GT_("fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"),
-                pid);
+                GT_("fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"),
+                (long)pid);
                return(PS_EXCLUDE);
        }
        else if (!bkgd)
        {
            fprintf(stderr,
-                GT_("fetchmail: another foreground fetchmail is running at %d.\n"),
-                pid);
+                GT_("fetchmail: another foreground fetchmail is running at %ld.\n"),
+                (long)pid);
                return(PS_EXCLUDE);
        }
        else if (getpid() == pid)
@@ -507,8 +511,8 @@ int main(int argc, char **argv)
        else if (kill(pid, SIGUSR1) == 0)
        {
            fprintf(stderr,
-                   GT_("fetchmail: background fetchmail at %d awakened.\n"),
-                   pid);
+                   GT_("fetchmail: background fetchmail at %ld awakened.\n"),
+                   (long)pid);
            return(0);
        }
        else
@@ -519,8 +523,8 @@ int main(int argc, char **argv)
             * SIGUSR1/SIGHUP transmission.
             */
            fprintf(stderr,
-                   GT_("fetchmail: elder sibling at %d died mysteriously.\n"),
-                   pid);
+                   GT_("fetchmail: elder sibling at %ld died mysteriously.\n"),
+                   (long)pid);
            return(PS_UNDEFINED);
        }
     }
@@ -981,6 +985,7 @@ static void optmerge(struct query *h2, struct query *h1, int force)
     FLAG_MERGE(sslcert);
     FLAG_MERGE(sslproto);
     FLAG_MERGE(sslcertck);
+    FLAG_MERGE(sslcertfile);
     FLAG_MERGE(sslcertpath);
     FLAG_MERGE(sslcommonname);
     FLAG_MERGE(sslfingerprint);
@@ -1094,12 +1099,18 @@ static int load_params(int argc, char **argv, int optind)
 
     /*
      * If there's a defaults record, merge it and lose it.
+     * FIXME: we don't currently free all entries that might be in struct query.
      */ 
     if (querylist && strcmp(querylist->server.pollname, "defaults") == 0)
     {
+       struct query *tmpq;
+
        for (ctl = querylist->next; ctl; ctl = ctl->next)
            optmerge(ctl, querylist, FALSE);
+       tmpq = querylist;
        querylist = querylist->next;
+       free(tmpq->server.pollname);
+       free(tmpq);
     }
 
     /* don't allow a defaults record after the first */
@@ -1637,7 +1648,7 @@ static void dump_params (struct runctl *runp,
            printf(GT_("  OTP authentication will be forced.\n"));
            break;
        case A_CRAM_MD5:
-           printf(GT_("  CRAM-Md5 authentication will be forced.\n"));
+           printf(GT_("  CRAM-MD5 authentication will be forced.\n"));
            break;
        case A_GSSAPI:
            printf(GT_("  GSSAPI authentication will be forced.\n"));
@@ -1661,9 +1672,11 @@ static void dump_params (struct runctl *runp,
            printf(GT_("  SSL protocol: %s.\n"), ctl->sslproto);
        if (ctl->sslcertck) {
            printf(GT_("  SSL server certificate checking enabled.\n"));
-           if (ctl->sslcertpath != NULL)
-               printf(GT_("  SSL trusted certificate directory: %s\n"), ctl->sslcertpath);
        }
+       if (ctl->sslcertfile != NULL)
+               printf(GT_("  SSL trusted certificate file: %s\n"), ctl->sslcertfile);
+       if (ctl->sslcertpath != NULL)
+               printf(GT_("  SSL trusted certificate directory: %s\n"), ctl->sslcertpath);
        if (ctl->sslcommonname != NULL)
                printf(GT_("  SSL server CommonName: %s\n"), ctl->sslcommonname);
        if (ctl->sslfingerprint != NULL)
@@ -1891,17 +1904,14 @@ static void dump_params (struct runctl *runp,
 
                        if (ctl->server.akalist)
                        {
-                           struct idlist *idp;
-
                            printf(GT_("  Predeclared mailserver aliases:"));
                            for (idp = ctl->server.akalist; idp; idp = idp->next)
                                printf(" %s", idp->id);
                            putchar('\n');
                        }
+
                        if (ctl->server.localdomains)
                        {
-                           struct idlist *idp;
-
                            printf(GT_("  Local domains:"));
                            for (idp = ctl->server.localdomains; idp; idp = idp->next)
                                printf(" %s", idp->id);