aboutsummaryrefslogtreecommitdiffstats
path: root/driver.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-09-24 20:13:57 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-09-24 20:13:57 +0000
commita12da4ee65e0d140bbbcb811eef1cba93785ce35 (patch)
treec549258dcd9b8d2848da3135cb86d51c75138097 /driver.c
parentf5ece9304c6f778f8888860b50d431dca147074c (diff)
downloadfetchmail-a12da4ee65e0d140bbbcb811eef1cba93785ce35.tar.gz
fetchmail-a12da4ee65e0d140bbbcb811eef1cba93785ce35.tar.bz2
fetchmail-a12da4ee65e0d140bbbcb811eef1cba93785ce35.zip
_( -> GT_(
svn path=/trunk/; revision=3478
Diffstat (limited to 'driver.c')
-rw-r--r--driver.c164
1 files changed, 82 insertions, 82 deletions
diff --git a/driver.c b/driver.c
index d3ea352f..9f2a8915 100644
--- a/driver.c
+++ b/driver.c
@@ -150,7 +150,7 @@ char *principal;
}
if (rem != KSUCCESS)
{
- report(stderr, _("kerberos error %s\n"), (krb_get_err_text (rem)));
+ report(stderr, GT_("kerberos error %s\n"), (krb_get_err_text (rem)));
return (PS_AUTHFAIL);
}
return (0);
@@ -209,12 +209,12 @@ const char *canonical; /* server name */
if (retval) {
#ifdef HEIMDAL
if (err_ret && err_ret->e_text) {
- report(stderr, _("krb5_sendauth: %s [server says '%*s'] \n"),
+ report(stderr, GT_("krb5_sendauth: %s [server says '%*s'] \n"),
error_message(retval),
err_ret->e_text);
#else
if (err_ret && err_ret->text.length) {
- report(stderr, _("krb5_sendauth: %s [server says '%*s'] \n"),
+ report(stderr, GT_("krb5_sendauth: %s [server says '%*s'] \n"),
error_message(retval),
err_ret->text.length,
err_ret->text.data);
@@ -295,7 +295,7 @@ static void send_size_warnings(struct query *ctl)
if (open_warning_by_mail(ctl, (struct msgblk *)NULL))
return;
stuff_warning(ctl,
- _("Subject: Fetchmail oversized-messages warning.\r\n"
+ GT_("Subject: Fetchmail oversized-messages warning.\r\n"
"\r\n"
"The following oversized messages remain on the mail server %s:"),
ctl->server.pollname);
@@ -313,7 +313,7 @@ static void send_size_warnings(struct query *ctl)
nbr = current->val.status.mark;
size = atoi(current->id);
stuff_warning(ctl,
- _("\t%d msg %d octets long skipped by fetchmail.\r\n"),
+ GT_("\t%d msg %d octets long skipped by fetchmail.\r\n"),
nbr, size);
}
current->val.status.num++;
@@ -397,7 +397,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
if (outlevel > O_SILENT)
{
report_build(stdout,
- _("skipping message %s@%s:%d (%d octets)"),
+ GT_("skipping message %s@%s:%d (%d octets)"),
ctl->remotename, ctl->server.truename, num,
msgsizes[num-1]);
switch (msgcodes[num-1])
@@ -413,11 +413,11 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
* DELE succeeds but doesn't actually delete
* the message.
*/
- report_build(stdout, _(" (length -1)"));
+ report_build(stdout, GT_(" (length -1)"));
break;
case MSGLEN_TOOLARGE:
report_build(stdout,
- _(" (oversized, %d octets)"),
+ GT_(" (oversized, %d octets)"),
msgsizes[num-1]);
break;
}
@@ -432,7 +432,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
if (err == PS_TRANSIENT) /* server is probably Exchange */
{
report_build(stdout,
- _("couldn't fetch headers, message %s@%s:%d (%d octets)"),
+ GT_("couldn't fetch headers, message %s@%s:%d (%d octets)"),
ctl->remotename, ctl->server.truename, num,
msgsizes[num-1]);
continue;
@@ -449,13 +449,13 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
if (outlevel > O_SILENT)
{
- report_build(stdout, _("reading message %s@%s:d of %d"),
+ report_build(stdout, GT_("reading message %s@%s:d of %d"),
ctl->remotename, ctl->server.truename,
num, count);
if (len > 0)
- report_build(stdout, _(" (%d %soctets)"),
- len, wholesize ? "" : _("header "));
+ report_build(stdout, GT_(" (%d %soctets)"),
+ len, wholesize ? "" : GT_("header "));
if (outlevel >= O_VERBOSE)
report_complete(stdout, "\n");
else
@@ -513,7 +513,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
len = msgsizes[num-1] - msgblk.msglen;
if (outlevel > O_SILENT && !wholesize)
report_complete(stdout,
- _(" (%d body octets) "), len);
+ GT_(" (%d body octets) "), len);
}
}
@@ -586,7 +586,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
{
if (outlevel >= O_DEBUG)
report(stdout,
- _("message %s@%s:%d was not the expected length (%d actual != %d expected)\n"),
+ GT_("message %s@%s:%d was not the expected length (%d actual != %d expected)\n"),
ctl->remotename, ctl->server.truename, num,
msgblk.msglen, msgsizes[num-1]);
}
@@ -628,7 +628,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
if (retained)
{
if (outlevel > O_SILENT)
- report(stdout, _(" retained\n"));
+ report(stdout, GT_(" retained\n"));
}
else if (ctl->server.base_protocol->delete
&& !suppress_delete
@@ -636,7 +636,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
{
(*deletions)++;
if (outlevel > O_SILENT)
- report_complete(stdout, _(" flushed\n"));
+ report_complete(stdout, GT_(" flushed\n"));
err = (ctl->server.base_protocol->delete)(mailserver_socket, ctl, num);
if (err != 0)
return(err);
@@ -645,12 +645,12 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
#endif /* POP3_ENABLE */
}
else if (outlevel > O_SILENT)
- report_complete(stdout, _(" not flushed\n"));
+ report_complete(stdout, GT_(" not flushed\n"));
/* perhaps this as many as we're ready to handle */
if (maxfetch && maxfetch <= *fetches && *fetches < count)
{
- report(stdout, _("fetchlimit %d reached; %d messages left on server %s account %s\n"),
+ report(stdout, GT_("fetchlimit %d reached; %d messages left on server %s account %s\n"),
maxfetch, count - *fetches, ctl->server.truename, ctl->remotename);
return(PS_MAXFETCH);
}
@@ -710,7 +710,7 @@ const int maxfetch; /* maximum number of messages to fetch */
{
signal(SIGPIPE, SIG_IGN);
report(stdout,
- _("SIGPIPE thrown from an MDA or a stream socket error\n"));
+ GT_("SIGPIPE thrown from an MDA or a stream socket error\n"));
err = PS_SOCKET;
goto cleanUp;
}
@@ -718,23 +718,23 @@ const int maxfetch; /* maximum number of messages to fetch */
{
if (phase == OPEN_WAIT)
report(stdout,
- _("timeout after %d seconds waiting to connect to server %s.\n"),
+ GT_("timeout after %d seconds waiting to connect to server %s.\n"),
ctl->server.timeout, ctl->server.pollname);
else if (phase == SERVER_WAIT)
report(stdout,
- _("timeout after %d seconds waiting for server %s.\n"),
+ GT_("timeout after %d seconds waiting for server %s.\n"),
ctl->server.timeout, ctl->server.pollname);
else if (phase == FORWARDING_WAIT)
report(stdout,
- _("timeout after %d seconds waiting for %s.\n"),
+ GT_("timeout after %d seconds waiting for %s.\n"),
ctl->server.timeout,
ctl->mda ? "MDA" : "SMTP");
else if (phase == LISTENER_WAIT)
report(stdout,
- _("timeout after %d seconds waiting for listener to respond.\n"), ctl->server.timeout);
+ GT_("timeout after %d seconds waiting for listener to respond.\n"), ctl->server.timeout);
else
report(stdout,
- _("timeout after %d seconds.\n"), ctl->server.timeout);
+ GT_("timeout after %d seconds.\n"), ctl->server.timeout);
/*
* If we've exceeded our threshold for consecutive timeouts,
@@ -746,14 +746,14 @@ const int maxfetch; /* maximum number of messages to fetch */
&& !open_warning_by_mail(ctl, (struct msgblk *)NULL))
{
stuff_warning(ctl,
- _("Subject: fetchmail sees repeated timeouts\r\n"));
+ GT_("Subject: fetchmail sees repeated timeouts\r\n"));
stuff_warning(ctl,
- _("Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\r\n"),
+ GT_("Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\r\n"),
MAX_TIMEOUTS,
ctl->remotename,
ctl->server.truename);
stuff_warning(ctl,
- _("This could mean that your mailserver is stuck, or that your SMTP\r\n" \
+ GT_("This could mean that your mailserver is stuck, or that your SMTP\r\n" \
"server is wedged, or that your mailbox file on the server has been\r\n" \
"corrupted by a server error. You can run `fetchmail -v -v' to\r\n" \
"diagnose the problem.\r\n\r\n" \
@@ -789,7 +789,7 @@ const int maxfetch; /* maximum number of messages to fetch */
if (ctl->preconnect && (err = system(ctl->preconnect)))
{
report(stderr,
- _("pre-connection command failed with status %d\n"), err);
+ GT_("pre-connection command failed with status %d\n"), err);
err = PS_SYNTAX;
goto closeUp;
}
@@ -822,7 +822,7 @@ const int maxfetch; /* maximum number of messages to fetch */
/* prevent core dump from ill-formed or duplicate entry */
if (!leadname)
{
- report(stderr, _("Lead server has no name.\n"));
+ report(stderr, GT_("Lead server has no name.\n"));
err = PS_DNS;
set_timeout(0);
phase = oldphase;
@@ -845,7 +845,7 @@ const int maxfetch; /* maximum number of messages to fetch */
if (namerec == (struct hostent *)NULL)
{
report(stderr,
- _("couldn't find canonical DNS name of %s\n"),
+ GT_("couldn't find canonical DNS name of %s\n"),
ctl->server.pollname);
err = PS_DNS;
set_timeout(0);
@@ -882,7 +882,7 @@ const int maxfetch; /* maximum number of messages to fetch */
int err_no = errno;
#ifdef HAVE_RES_SEARCH
if (err_no != 0 && h_errno != 0)
- report(stderr, _("internal inconsistency\n"));
+ report(stderr, GT_("internal inconsistency\n"));
#endif
/*
* Avoid generating a bogus error every poll cycle when we're
@@ -892,28 +892,28 @@ const int maxfetch; /* maximum number of messages to fetch */
if (!((err_no == EHOSTUNREACH || err_no == ENETUNREACH)
&& run.poll_interval))
{
- report_build(stderr, _("%s connection to %s failed"),
+ report_build(stderr, GT_("%s connection to %s failed"),
ctl->server.base_protocol->name, ctl->server.pollname);
#ifdef HAVE_RES_SEARCH
if (h_errno != 0)
{
if (h_errno == HOST_NOT_FOUND)
- strcpy(errbuf, _("host is unknown."));
+ strcpy(errbuf, GT_("host is unknown."));
#ifndef __BEOS__
else if (h_errno == NO_ADDRESS)
- strcpy(errbuf, _("name is valid but has no IP address."));
+ strcpy(errbuf, GT_("name is valid but has no IP address."));
#endif
else if (h_errno == NO_RECOVERY)
- strcpy(errbuf, _("unrecoverable name server error."));
+ strcpy(errbuf, GT_("unrecoverable name server error."));
else if (h_errno == TRY_AGAIN)
- strcpy(errbuf, _("temporary name server error."));
+ strcpy(errbuf, GT_("temporary name server error."));
else
#ifdef HAVE_SNPRINTF
snprintf(errbuf, sizeof(errbuf),
#else
sprintf(errbuf,
#endif /* HAVE_SNPRINTF */
- _("unknown DNS error %d."), h_errno);
+ GT_("unknown DNS error %d."), h_errno);
}
else
#endif /* HAVE_RES_SEARCH */
@@ -931,7 +931,7 @@ const int maxfetch; /* maximum number of messages to fetch */
if (open_warning_by_mail(ctl, (struct msgblk *)NULL) == 0)
{
stuff_warning(ctl,
- _("Subject: Fetchmail unreachable-server warning.\r\n"
+ GT_("Subject: Fetchmail unreachable-server warning.\r\n"
"\r\n"
"Fetchmail could not reach the mail server %s:")
ctl->server.pollname);
@@ -956,7 +956,7 @@ const int maxfetch; /* maximum number of messages to fetch */
if (ctl->use_ssl && SSLOpen(mailserver_socket,ctl->sslcert,ctl->sslkey,ctl->sslproto,ctl->sslcertck,
ctl->sslcertpath,ctl->sslfingerprint,realhost,ctl->server.pollname) == -1)
{
- report(stderr, _("SSL connection failed.\n"));
+ report(stderr, GT_("SSL connection failed.\n"));
goto closeUp;
}
#endif
@@ -998,19 +998,19 @@ const int maxfetch; /* maximum number of messages to fetch */
if (err != 0)
{
if (err == PS_LOCKBUSY)
- report(stderr, _("Lock-busy error on %s@%s\n"),
+ report(stderr, GT_("Lock-busy error on %s@%s\n"),
ctl->remotename,
ctl->server.truename);
else if (err == PS_SERVBUSY)
- report(stderr, _("Server busy error on %s@%s\n"),
+ report(stderr, GT_("Server busy error on %s@%s\n"),
ctl->remotename,
ctl->server.truename);
else if (err == PS_AUTHFAIL)
{
- report(stderr, _("Authorization failure on %s@%s%s\n"),
+ report(stderr, GT_("Authorization failure on %s@%s%s\n"),
ctl->remotename,
ctl->server.truename,
- (ctl->wehaveauthed ? _(" (previously authorized)") : "")
+ (ctl->wehaveauthed ? GT_(" (previously authorized)") : "")
);
/*
@@ -1031,14 +1031,14 @@ const int maxfetch; /* maximum number of messages to fetch */
{
ctl->wehavesentauthnote = 1;
stuff_warning(ctl,
- _("Subject: fetchmail authentication failed on %s@%s\r\n"),
+ GT_("Subject: fetchmail authentication failed on %s@%s\r\n"),
ctl->remotename, ctl->server.truename);
stuff_warning(ctl,
- _("Fetchmail could not get mail from %s@%s.\r\n"),
+ GT_("Fetchmail could not get mail from %s@%s.\r\n"),
ctl->remotename,
ctl->server.truename);
if (ctl->wehaveauthed)
- stuff_warning(ctl, _("\
+ stuff_warning(ctl, GT_("\
The attempt to get authorization failed.\r\n\
Since we have already succeeded in getting authorization for this\r\n\
connection, this is probably another failure mode (such as busy server)\r\n\
@@ -1053,7 +1053,7 @@ The fetchmail daemon will continue running and attempt to connect\r\n\
at each cycle. No future notifications will be sent until service\r\n\
is restored."));
else
- stuff_warning(ctl, _("\
+ stuff_warning(ctl, GT_("\
The attempt to get authorization failed.\r\n\
This probably means your password is invalid, but some servers have\r\n\
other failure modes that fetchmail cannot distinguish from this\r\n\
@@ -1066,7 +1066,7 @@ is restored."));
}
}
else
- report(stderr, _("Unknown login or authentication error on %s@%s\n"),
+ report(stderr, GT_("Unknown login or authentication error on %s@%s\n"),
ctl->remotename,
ctl->server.truename);
@@ -1090,20 +1090,20 @@ is restored."));
{
ctl->wehavesentauthnote = 0;
report(stderr,
- _("Authorization OK on %s@%s\n"),
+ GT_("Authorization OK on %s@%s\n"),
ctl->remotename,
ctl->server.truename);
if (!open_warning_by_mail(ctl, (struct msgblk *)NULL))
{
stuff_warning(ctl,
- _("Subject: fetchmail authentication OK on %s@%s\r\n"),
+ GT_("Subject: fetchmail authentication OK on %s@%s\r\n"),
ctl->remotename, ctl->server.truename);
stuff_warning(ctl,
- _("Fetchmail was able to log into %s@%s.\r\n"),
+ GT_("Fetchmail was able to log into %s@%s.\r\n"),
ctl->remotename,
ctl->server.truename);
stuff_warning(ctl,
- _("Service has been restored.\r\n"));
+ GT_("Service has been restored.\r\n"));
close_warning_by_mail(ctl, (struct msgblk *)NULL);
}
@@ -1134,9 +1134,9 @@ is restored."));
if (outlevel >= O_DEBUG)
{
if (idp->id)
- report(stdout, _("selecting or re-polling folder %s\n"), idp->id);
+ report(stdout, GT_("selecting or re-polling folder %s\n"), idp->id);
else
- report(stdout, _("selecting or re-polling default folder\n"));
+ report(stdout, GT_("selecting or re-polling default folder\n"));
}
/* compute # of messages and number of new messages waiting */
@@ -1152,7 +1152,7 @@ is restored."));
#else
(void) sprintf(buf,
#endif /* HAVE_SNPRINTF */
- _("%s at %s (folder %s)"),
+ GT_("%s at %s (folder %s)"),
ctl->remotename, ctl->server.truename, idp->id);
else
#ifdef HAVE_SNPRINTF
@@ -1160,33 +1160,33 @@ is restored."));
#else
(void) sprintf(buf,
#endif /* HAVE_SNPRINTF */
- _("%s at %s"),
+ GT_("%s at %s"),
ctl->remotename, ctl->server.truename);
if (outlevel > O_SILENT)
{
if (count == -1) /* only used for ETRN */
- report(stdout, _("Polling %s\n"), ctl->server.truename);
+ report(stdout, GT_("Polling %s\n"), ctl->server.truename);
else if (count != 0)
{
if (new != -1 && (count - new) > 0)
- report_build(stdout, _("%d %s (%d seen) for %s"),
- count, count > 1 ? _("messages") :
- _("message"),
+ report_build(stdout, GT_("%d %s (%d seen) for %s"),
+ count, count > 1 ? GT_("messages") :
+ GT_("message"),
count-new, buf);
else
- report_build(stdout, _("%d %s for %s"),
- count, count > 1 ? _("messages") :
- _("message"), buf);
+ report_build(stdout, GT_("%d %s for %s"),
+ count, count > 1 ? GT_("messages") :
+ GT_("message"), buf);
if (bytes == -1)
report_complete(stdout, ".\n");
else
- report_complete(stdout, _(" (%d octets).\n"), bytes);
+ report_complete(stdout, GT_(" (%d octets).\n"), bytes);
}
else
{
/* these are pointless in normal daemon mode */
if (pass == 1 && (run.poll_interval == 0 || outlevel >= O_VERBOSE))
- report(stdout, _("No mail for %s\n"), buf);
+ report(stdout, GT_("No mail for %s\n"), buf);
}
}
@@ -1332,31 +1332,31 @@ is restored."));
switch (err)
{
case PS_SOCKET:
- msg = _("socket");
+ msg = GT_("socket");
break;
case PS_SYNTAX:
- msg = _("missing or bad RFC822 header");
+ msg = GT_("missing or bad RFC822 header");
break;
case PS_IOERR:
- msg = _("MDA");
+ msg = GT_("MDA");
break;
case PS_ERROR:
- msg = _("client/server synchronization");
+ msg = GT_("client/server synchronization");
break;
case PS_PROTOCOL:
- msg = _("client/server protocol");
+ msg = GT_("client/server protocol");
break;
case PS_LOCKBUSY:
- msg = _("lock busy on server");
+ msg = GT_("lock busy on server");
break;
case PS_SMTP:
- msg = _("SMTP transaction");
+ msg = GT_("SMTP transaction");
break;
case PS_DNS:
- msg = _("DNS lookup");
+ msg = GT_("DNS lookup");
break;
case PS_UNDEFINED:
- report(stderr, _("undefined error\n"));
+ report(stderr, GT_("undefined error\n"));
break;
}
/* no report on PS_MAXFETCH or PS_UNDEFINED or PS_AUTHFAIL */
@@ -1367,9 +1367,9 @@ is restored."));
char *stem;
if (phase == FORWARDING_WAIT || phase == LISTENER_WAIT)
- stem = _("%s error while delivering to SMTP host %s\n");
+ stem = GT_("%s error while delivering to SMTP host %s\n");
else
- stem = _("%s error while fetching from %s\n");
+ stem = GT_("%s error while fetching from %s\n");
report(stderr, stem, msg, ctl->server.pollname);
}
@@ -1377,7 +1377,7 @@ closeUp:
/* execute wrapup command, if any */
if (ctl->postconnect && (err = system(ctl->postconnect)))
{
- report(stderr, _("post-connection command failed with status %d\n"), err);
+ report(stderr, GT_("post-connection command failed with status %d\n"), err);
if (err == PS_SUCCESS)
err = PS_SYNTAX;
}
@@ -1397,7 +1397,7 @@ const struct method *proto; /* protocol method table */
#ifndef KERBEROS_V4
if (ctl->server.authenticate == A_KERBEROS_V4)
{
- report(stderr, _("Kerberos V4 support not linked.\n"));
+ report(stderr, GT_("Kerberos V4 support not linked.\n"));
return(PS_ERROR);
}
#endif /* KERBEROS_V4 */
@@ -1405,7 +1405,7 @@ const struct method *proto; /* protocol method table */
#ifndef KERBEROS_V5
if (ctl->server.authenticate == A_KERBEROS_V5)
{
- report(stderr, _("Kerberos V5 support not linked.\n"));
+ report(stderr, GT_("Kerberos V5 support not linked.\n"));
return(PS_ERROR);
}
#endif /* KERBEROS_V5 */
@@ -1416,13 +1416,13 @@ const struct method *proto; /* protocol method table */
/* check for unsupported options */
if (ctl->flush) {
report(stderr,
- _("Option --flush is not supported with %s\n"),
+ GT_("Option --flush is not supported with %s\n"),
proto->name);
return(PS_SYNTAX);
}
else if (ctl->fetchall) {
report(stderr,
- _("Option --all is not supported with %s\n"),
+ GT_("Option --all is not supported with %s\n"),
proto->name);
return(PS_SYNTAX);
}
@@ -1430,7 +1430,7 @@ const struct method *proto; /* protocol method table */
if (!proto->getsizes && NUM_SPECIFIED(ctl->limit))
{
report(stderr,
- _("Option --limit is not supported with %s\n"),
+ GT_("Option --limit is not supported with %s\n"),
proto->name);
return(PS_SYNTAX);
}