aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fetchmail.c6
-rw-r--r--fetchmail.h26
-rw-r--r--options.c42
3 files changed, 37 insertions, 37 deletions
diff --git a/fetchmail.c b/fetchmail.c
index 705c4643..68b6600a 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -131,7 +131,7 @@ char **argv;
printf("Taking options from command line and %s\n", poprcfile);
for (hostp = hostlist; hostp; hostp = hostp->next) {
printf("Options for host %s:\n", hostp->servername);
- dump_options(hostp);
+ dump_params(hostp);
}
if (hostlist == NULL)
(void) printf("No mailservers set up -- perhaps %s is missing?\n",
@@ -261,7 +261,7 @@ int showversioninfo()
}
/*********************************************************************
- function: dump_options
+ function: dump_params
description: display program options in English
arguments:
queryctl merged options
@@ -271,7 +271,7 @@ int showversioninfo()
globals: linelimit, outlimit.
*********************************************************************/
-int dump_options (queryctl)
+int dump_params (queryctl)
struct hostrec *queryctl;
{
printf(" Username = '%s'\n", queryctl->remotename);
diff --git a/fetchmail.h b/fetchmail.h
index 8432c443..76deb5fd 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -85,20 +85,20 @@ extern int versioninfo; /* emit only version info */
#ifdef HAVE_PROTOTYPES
/* prototypes for globally callable functions */
-int doPOP2 (struct hostrec *options);
-int doPOP3 (struct hostrec *options);
-
-int parsecmdline (int argc, char **argv, struct hostrec *options);
-int setdefaults (struct hostrec *options);
-char *getnextserver (int argc, char **argv, int *optind);
-int openuserfolder (struct hostrec *options);
-int closeuserfolder (int fd);
-int openmailpipe (struct hostrec *options);
-int closemailpipe (int fd);
+int doPOP2 (struct hostrec *);
+int doPOP3 (struct hostrec *);
+
+int parsecmdline (int, char **, struct hostrec *);
+int setdefaults (struct hostrec *);
+char *getnextserver (int argc, char **, int *);
+int openuserfolder (struct hostrec *);
+int closeuserfolder (int);
+int openmailpipe (struct hostrec *);
+int closemailpipe (int);
char *MD5Digest (char *);
-void reply_hack(char *buf, const char *host);
-void append_server_names(int *pargc, char **argv);
-int daemonize(const char *logfile, void (*)(void));
+void reply_hack(char *, const char *);
+void append_server_names(int *, char **);
+int daemonize(const char *, void (*)(void));
#else
diff --git a/options.c b/options.c
index 4e782ba8..3d4efe1d 100644
--- a/options.c
+++ b/options.c
@@ -88,10 +88,10 @@ static struct option longoptions[] = {
poll_interval, quitmode, poprcfile, linelimit.
*********************************************************************/
-int parsecmdline (argc,argv,options)
+int parsecmdline (argc,argv,queryctl)
int argc;
char **argv;
-struct hostrec *options;
+struct hostrec *queryctl;
{
int c,i;
int fflag = 0; /* TRUE when -o or -c has been specified */
@@ -102,7 +102,7 @@ struct hostrec *options;
extern int optind, opterr; /* defined in getopt(2) */
extern char *optarg; /* defined in getopt(2) */
- bzero(options,sizeof(struct hostrec)); /* start clean */
+ bzero(queryctl,sizeof(struct hostrec)); /* start clean */
while (!errflag &&
(c = getopt_long(argc,argv,shortoptions,
@@ -110,10 +110,10 @@ struct hostrec *options;
switch (c) {
case '2':
- options->protocol = P_POP2;
+ queryctl->protocol = P_POP2;
break;
case '3':
- options->protocol = P_POP3;
+ queryctl->protocol = P_POP3;
break;
case 'V':
case LA_VERSION:
@@ -121,16 +121,16 @@ struct hostrec *options;
break;
case 'a':
case LA_ALL:
- options->fetchall = !0;
+ queryctl->fetchall = !0;
break;
case 'K':
case LA_KILL:
- options->keep = 0;
+ queryctl->keep = 0;
got_kill = 1;
break;
case 'k':
case LA_KEEP:
- options->keep = !0;
+ queryctl->keep = !0;
got_kill = 0;
break;
case 'v':
@@ -147,7 +147,7 @@ struct hostrec *options;
errflag++;
else {
fflag++;
- options->output = TO_STDOUT;
+ queryctl->output = TO_STDOUT;
}
break;
case 'l':
@@ -160,20 +160,20 @@ struct hostrec *options;
break;
case 'F':
case LA_FLUSH:
- options->flush = !0;
+ queryctl->flush = !0;
break;
case LA_PROTOCOL:
/* XXX -- should probably use a table lookup here */
if (strcasecmp(optarg,"pop2") == 0)
- options->protocol = P_POP2;
+ queryctl->protocol = P_POP2;
else if (strcasecmp(optarg,"pop3") == 0)
- options->protocol = P_POP3;
+ queryctl->protocol = P_POP3;
else if (strcasecmp(optarg,"imap") == 0)
- options->protocol = P_IMAP;
+ queryctl->protocol = P_IMAP;
else if (strcasecmp(optarg,"apop") == 0)
- options->protocol = P_APOP;
+ queryctl->protocol = P_APOP;
else if (strcasecmp(optarg,"rpop") == 0)
- options->protocol = P_RPOP;
+ queryctl->protocol = P_RPOP;
else {
fprintf(stderr,"Invalid protocol '%s'\n specified.\n", optarg);
errflag++;
@@ -190,7 +190,7 @@ struct hostrec *options;
break;
case 'u':
case LA_USERNAME:
- strncpy(options->remotename,optarg,sizeof(options->remotename)-1);
+ strncpy(queryctl->remotename,optarg,sizeof(queryctl->remotename)-1);
break;
case 'o':
case LA_LOCALFILE:
@@ -198,17 +198,17 @@ struct hostrec *options;
errflag++;
else {
fflag++;
- options->output = TO_FOLDER;
- strncpy(options->userfolder,optarg,sizeof(options->userfolder)-1);
+ queryctl->output = TO_FOLDER;
+ strncpy(queryctl->userfolder,optarg,sizeof(queryctl->userfolder)-1);
}
break;
case 'r':
case LA_REMOTEFILE:
- strncpy(options->remotefolder,optarg,sizeof(options->remotefolder)-1);
+ strncpy(queryctl->remotefolder,optarg,sizeof(queryctl->remotefolder)-1);
break;
case 'm':
case LA_MDA:
- strncpy(options->mda,optarg,sizeof(options->mda)-1);
+ strncpy(queryctl->mda,optarg,sizeof(queryctl->mda)-1);
break;
case 'L':
case LA_LOGFILE:
@@ -255,7 +255,7 @@ struct hostrec *options;
}
else {
if (linelimit && !got_kill)
- options->keep = !0;
+ queryctl->keep = !0;
else
;
return(optind);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 01:25:43 +0000