#include <config.h>
+#include <stdio.h>
#include <pwd.h>
#include <string.h>
#if defined(STDC_HEADERS)
#define LA_NODETACH 7
#define LA_QUIT 8
#define LA_LOGFILE 9
-#define LA_RCFILE 10
-#define LA_IDFILE 11
-#define LA_PROTOCOL 12
-#define LA_PORT 13
-#define LA_AUTHENTICATE 14
-#define LA_TIMEOUT 15
-#define LA_USERNAME 16
-#define LA_ALL 17
-#define LA_KILL 18
-#define LA_KEEP 19
-#define LA_FLUSH 20
-#define LA_NOREWRITE 21
-#define LA_LIMIT 22
-#define LA_REMOTEFILE 23
-#define LA_SMTPHOST 24
-#define LA_MDA 25
-#define LA_YYDEBUG 26
+#define LA_SYSLOG 10
+#define LA_RCFILE 11
+#define LA_IDFILE 12
+#define LA_PROTOCOL 13
+#define LA_PORT 14
+#define LA_AUTHENTICATE 15
+#define LA_TIMEOUT 16
+#define LA_ENVELOPE 17
+#define LA_USERNAME 18
+#define LA_ALL 19
+#define LA_KILL 20
+#define LA_KEEP 21
+#define LA_FLUSH 22
+#define LA_NOREWRITE 23
+#define LA_LIMIT 24
+#define LA_REMOTEFILE 25
+#define LA_SMTPHOST 26
+#define LA_BATCHLIMIT 27
+#define LA_FETCHLIMIT 28
+#define LA_MDA 29
+#define LA_INTERFACE 30
+#define LA_MONITOR 31
+#define LA_YYDEBUG 32
-static char *shortoptions = "?Vcsvd:NqL:f:i:p:P:A:t:u:akKFnl:r:S:m:y";
+static char *shortoptions = "?Vcsvd:NqL:f:i:p:P:A:t:E:u:akKFnl:r:S:b:B:m:I:M:y";
static struct option longoptions[] = {
{"help", no_argument, (int *) 0, LA_HELP },
{"version", no_argument, (int *) 0, LA_VERSION },
{"nodetach", no_argument, (int *) 0, LA_NODETACH },
{"quit", no_argument, (int *) 0, LA_QUIT },
{"logfile", required_argument, (int *) 0, LA_LOGFILE },
+ {"syslog", no_argument, (int *) 0, LA_SYSLOG },
{"fetchmailrc",required_argument,(int *) 0, LA_RCFILE },
{"idfile", required_argument, (int *) 0, LA_IDFILE },
+#ifdef linux
+ {"interface", required_argument, (int *) 0, LA_INTERFACE },
+ {"monitor", required_argument, (int *) 0, LA_MONITOR },
+#endif
{"protocol", required_argument, (int *) 0, LA_PROTOCOL },
{"proto", required_argument, (int *) 0, LA_PROTOCOL },
{"port", required_argument, (int *) 0, LA_PORT },
{"auth", required_argument, (int *) 0, LA_AUTHENTICATE},
{"timeout", required_argument, (int *) 0, LA_TIMEOUT },
+ {"envelope", required_argument, (int *) 0, LA_ENVELOPE },
{"user", required_argument, (int *) 0, LA_USERNAME },
{"username", required_argument, (int *) 0, LA_USERNAME },
{"remote", required_argument, (int *) 0, LA_REMOTEFILE },
{"smtphost", required_argument, (int *) 0, LA_SMTPHOST },
+ {"batchlimit",required_argument, (int *) 0, LA_BATCHLIMIT },
+ {"fetchlimit",required_argument, (int *) 0, LA_FETCHLIMIT },
{"mda", required_argument, (int *) 0, LA_MDA },
+ {"interface", required_argument, (int *) 0, LA_INTERFACE },
+ {"monitor", required_argument, (int *) 0, LA_MONITOR },
+
{"yydebug", no_argument, (int *) 0, LA_YYDEBUG },
{(char *) 0, no_argument, (int *) 0, 0 }
};
-int parsecmdline (argc,argv,ctl)
+int parsecmdline (argc, argv, ctl)
/* parse and validate the command line options */
int argc; /* argument count */
char **argv; /* argument strings */
break;
case 'L':
case LA_LOGFILE:
- logfile = optarg;
+ cmd_logfile = optarg;
break;
case 'f':
case LA_RCFILE:
case LA_PROTOCOL:
/* XXX -- should probably use a table lookup here */
if (strcasecmp(optarg,"pop2") == 0)
- ctl->protocol = P_POP2;
+ ctl->server.protocol = P_POP2;
else if (strcasecmp(optarg,"pop3") == 0)
- ctl->protocol = P_POP3;
+ ctl->server.protocol = P_POP3;
else if (strcasecmp(optarg,"imap") == 0)
- ctl->protocol = P_IMAP;
+ ctl->server.protocol = P_IMAP;
else if (strcasecmp(optarg,"apop") == 0)
- ctl->protocol = P_APOP;
+ ctl->server.protocol = P_APOP;
else if (strcasecmp(optarg,"kpop") == 0)
{
- ctl->protocol = P_POP3;
- ctl->port = KPOP_PORT;
- ctl->authenticate = A_KERBEROS;
+ ctl->server.protocol = P_POP3;
+ ctl->server.port = KPOP_PORT;
+ ctl->server.authenticate = A_KERBEROS;
}
else {
fprintf(stderr,"Invalid protocol `%s' specified.\n", optarg);
break;
case 'P':
case LA_PORT:
- ctl->port = atoi(optarg);
+ ctl->server.port = atoi(optarg);
break;
case 'A':
case LA_AUTHENTICATE:
if (strcmp(optarg, "password") == 0)
- ctl->authenticate = A_PASSWORD;
+ ctl->server.authenticate = A_PASSWORD;
else if (strcmp(optarg, "kerberos") == 0)
- ctl->authenticate = A_KERBEROS;
+ ctl->server.authenticate = A_KERBEROS;
else {
fprintf(stderr,"Invalid authentication `%s' specified.\n", optarg);
errflag++;
}
break;
case 't':
- ctl->timeout = atoi(optarg);
+ case LA_TIMEOUT:
+ ctl->server.timeout = atoi(optarg);
+ break;
+ case 'E':
+ case LA_ENVELOPE:
+ ctl->server.envelope = xstrdup(optarg);
break;
+
case 'u':
case LA_USERNAME:
- strncpy(ctl->remotename,optarg,sizeof(ctl->remotename)-1);
+ ctl->remotename = xstrdup(optarg);
break;
-
case 'a':
case LA_ALL:
ctl->fetchall = TRUE;
break;
case 'n':
case LA_NOREWRITE:
- ctl->norewrite = TRUE;
+ ctl->no_rewrite = TRUE;
break;
case 'l':
case LA_LIMIT:
break;
case 'r':
case LA_REMOTEFILE:
- strncpy(ctl->mailbox,optarg,sizeof(ctl->mailbox)-1);
+ ctl->mailbox = xstrdup(optarg);
break;
case 'S':
case LA_SMTPHOST:
- strncpy(ctl->smtphost,optarg,sizeof(ctl->smtphost)-1);
+ ctl->smtphost = xstrdup(optarg);
ocount++;
break;
+ case 'b':
+ case LA_BATCHLIMIT:
+ ctl->batchlimit = atoi(optarg);
+ break;
+ case 'B':
+ case LA_FETCHLIMIT:
+ ctl->fetchlimit = atoi(optarg);
+ break;
case 'm':
case LA_MDA:
- strncpy(ctl->mda,optarg,sizeof(ctl->mda));
+ ctl->mda = xstrdup(optarg);
ocount++;
break;
+
+#ifdef linux
+ case 'I':
+ case LA_INTERFACE:
+ ctl->server.interface = xstrdup(optarg);
+ break;
+ case 'M':
+ case LA_MONITOR:
+ ctl->server.monitor = xstrdup(optarg);
+ break;
+#endif
+
case 'y':
case LA_YYDEBUG:
yydebug = TRUE;
break;
+ case LA_SYSLOG:
+ use_syslog = TRUE;
+ break;
+
case '?':
case LA_HELP:
default:
return(-1);
}
+ if (poll_interval == 0 && use_syslog)
+ {
+ fputs("The --syslog option is only valid with the --daemon option.\n", stderr);
+ return(-1);
+ }
+
if (errflag || ocount > 1) {
/* squawk if syntax errors were detected */
fputs("usage: fetchmail [options] [server ...]\n", stderr);
fputs(" -N, --nodetach don't detach daemon process\n", stderr);
fputs(" -q, --quit kill daemon process\n", stderr);
fputs(" -L, --logfile specify logfile name\n", stderr);
+ fputs(" --syslog use syslog(3) for most messages when running as a daemon\n", stderr);
fputs(" -f, --fetchmailrc specify alternate run control file\n", stderr);
fputs(" -i, --idfile specify alternate UIDs file\n", stderr);
+#ifdef linux
+ fputs(" -I, --interface interface required specification\n",stderr);
+ fputs(" -M, --monitor monitor interface for activity\n",stderr);
+#endif
fputs(" -p, --protocol specify pop2, pop3, imap, apop, rpop, kpop\n", stderr);
fputs(" -P, --port TCP/IP service port to connect to\n",stderr);
fputs(" -A, --auth authentication type (password or kerberos)\n",stderr);
fputs(" -t, --timeout server nonresponse timeout\n",stderr);
+ fputs(" -E, --envelope envelope address header\n",stderr);
fputs(" -u, --username specify users's login on server\n", stderr);
fputs(" -a, --all retrieve old and new messages\n", stderr);
fputs(" -l, --limit don't fetch messages over given size\n", stderr);
fputs(" -S, --smtphost set SMTP forwarding host\n", stderr);
+ fputs(" -b, --batchlimit set batch limit for SMTP connections\n", stderr);
+ fputs(" -B, --fetchlimit set fetch limit for server connections\n", stderr);
fputs(" -r, --remote specify remote folder name\n", stderr);
return(-1);
}
projects / ~andy / fetchmail / blobdiff