optrec -> hostrec.

svn path=/trunk/; revision=34

diff --git a/fetchmail.c b/fetchmail.c
index 94929549d9941cd59577275da0acd2de0bbc86bf..81aafe1db8c0acfa06106d5d6ce4d65f8a838373 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -43,11 +43,11 @@
 
 #ifdef HAVE_PROTOTYPES
 /* prototypes for internal functions */
-int showoptions (struct optrec *options);
-int parseMDAargs (struct optrec *options);
+int showoptions (struct hostrec *options);
+int parseMDAargs (struct hostrec *options);
 int showversioninfo (void);
-int dump_options (struct optrec *options);
-int query_host(struct optrec *options);
+int dump_options (struct hostrec *options);
+int query_host(struct hostrec *options);
 #endif
 
 /* controls the detail level of status/progress messages written to stderr */
@@ -89,10 +89,10 @@ int argc;
 char **argv;
 { 
   int mboxfd;
-  struct optrec cmd_opts, def_opts;
+  struct hostrec cmd_opts, def_opts;
   int parsestatus;
   char *servername; 
-  struct optrec *hostp, *hostlist = (struct optrec *)NULL;
+  struct hostrec *hostp, *hostlist = (struct hostrec *)NULL;
   FILE *tmpfp;
   pid_t pid;
 
@@ -116,7 +116,7 @@ char **argv;
     if (strcmp(servername, "defaults") == 0)
       continue;
 
-    hostp = (struct optrec *)xmalloc(sizeof(struct optrec));
+    hostp = (struct hostrec *)xmalloc(sizeof(struct hostrec));
 
     prc_mergeoptions(servername, &cmd_opts, &def_opts, hostp);
     strcpy(hostp->servername, servername);
@@ -228,7 +228,7 @@ void termhook()
 
 int query_host(options)
 /* perform fetch transaction with single host */
-struct optrec *options;
+struct hostrec *options;
 {
   if (outlevel != O_SILENT)
     fprintf(stderr, "popclient: querying %s\n", options->servername);
@@ -272,7 +272,7 @@ int showversioninfo()
 *********************************************************************/
 
 int dump_options (options)
-struct optrec *options;
+struct hostrec *options;
 {
   printf("  Username = '%s'\n", options->remotename);
   printf("  Password = '%s'\n", options->password);
@@ -341,7 +341,7 @@ struct optrec *options;
  *********************************************************************/
 
 int openuserfolder (options)
-struct optrec *options;
+struct hostrec *options;
 {
   int fd;
 
@@ -380,7 +380,7 @@ struct optrec *options;
  *********************************************************************/
 
 int openmailpipe (options)
-struct optrec *options;
+struct hostrec *options;
 {
   int pipefd [2];
   int childpid;
@@ -494,7 +494,7 @@ int fd;
  *********************************************************************/
 
 int parseMDAargs (options)
-struct optrec *options;
+struct hostrec *options;
 {
   int argi;
   char *argp;

diff --git a/fetchmail.h b/fetchmail.h
index c2280f37d8421cd4bf84621cc41195cf5147be4a..8432c443223b759831b82ba97098ba0f5c291800 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -45,7 +45,7 @@
 #define                TO_STDOUT       2       /* use stdout */
 #define                TO_MDA          3       /* use agent */
 
-struct optrec {
+struct hostrec {
   char servername [HOSTLEN];
   char localname [USERNAMELEN];
   char remotename [USERNAMELEN];
@@ -60,7 +60,7 @@ struct optrec {
 
   /* dependent on the above members */
   int output;
-  struct optrec *next;
+  struct hostrec *next;
 
 #if defined(HAVE_APOP_SUPPORT)
   /* internal use only */ 
@@ -85,15 +85,15 @@ extern int versioninfo;             /* emit only version info */
 #ifdef HAVE_PROTOTYPES
 
 /* prototypes for globally callable functions */
-int doPOP2 (struct optrec *options); 
-int doPOP3 (struct optrec *options);
+int doPOP2 (struct hostrec *options); 
+int doPOP3 (struct hostrec *options);
 
-int parsecmdline (int argc, char **argv, struct optrec *options);
-int setdefaults (struct optrec *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 optrec *options);
+int openuserfolder (struct hostrec *options);
 int closeuserfolder (int fd);
-int openmailpipe (struct optrec *options);
+int openmailpipe (struct hostrec *options);
 int closemailpipe (int fd);
 char *MD5Digest (char *);
 void reply_hack(char *buf, const char *host);

diff --git a/options.c b/options.c
index f669f49ca72252ee77f904336cc6b7ff1f04ee75..7ae374d84e33d0b6967c1c8ca0cceadd7d2d85cb 100644 (file)
--- a/options.c
+++ b/options.c
@@ -74,7 +74,7 @@ static struct option longoptions[] = {
   arguments:
     argc         argument count.
     argv         argument strings.
-    options      pointer to a struct optrec to receive the parsed 
+    options      pointer to a struct hostrec to receive the parsed 
                  options.
 
   return value:  if positive, argv index of last parsed option + 1
@@ -91,7 +91,7 @@ static struct option longoptions[] = {
 int parsecmdline (argc,argv,options)
 int argc;
 char **argv;
-struct optrec *options;
+struct hostrec *options;
 {
   int c,i;
   int fflag = 0;     /* TRUE when -o or -c has been specified */
@@ -102,7 +102,7 @@ struct optrec *options;
   extern int optind, opterr;     /* defined in getopt(2) */
   extern char *optarg;          /* defined in getopt(2) */
 
-  bzero(options,sizeof(struct optrec));    /* start clean */
+  bzero(options,sizeof(struct hostrec));    /* start clean */
 
   while (!errflag && 
          (c = getopt_long(argc,argv,shortoptions,
@@ -277,7 +277,7 @@ struct optrec *options;
  *********************************************************************/
 
 int setdefaults (options)
-struct optrec *options;
+struct hostrec *options;
 {
   int uid;
   struct passwd *pw;

diff --git a/pop2.c b/pop2.c
index dc9c2e7cd9c9b090f6eb73361431e7b305d8c4f2..28056b1376f6ba421364ce5f0fc02e16837f819d 100644 (file)
--- a/pop2.c
+++ b/pop2.c
@@ -64,7 +64,7 @@ int POP2_stateXFER (int msgsize, int socket, int mboxfd, int topipe);
  *********************************************************************/
 
 int doPOP2 (options)
-struct optrec *options;
+struct hostrec *options;
 {
   int mboxfd;
   int socket;

diff --git a/pop3.c b/pop3.c
index fccf1e73b36c1fbf1f470c7f146e33ad3a966c96..53ccd955c99ef3b2b3d3d08fc6f9e81e35e6aa9c 100644 (file)
--- a/pop3.c
+++ b/pop3.c
@@ -34,14 +34,14 @@
 #ifdef HAVE_PROTOTYPES
 /* prototypes for internal functions */
 int POP3_OK (char *buf, int socket);
-int POP3_auth (struct optrec *options, int socket);
+int POP3_auth (struct hostrec *options, int socket);
 int POP3_sendQUIT (int socket);
 int POP3_sendSTAT (int *msgcount, int socket);
 int POP3_sendRETR (int msgnum, int socket);
 int POP3_sendDELE (int msgnum, int socket);
 int POP3_sendLAST (int *last, int socket);
 int POP3_readmsg (int socket, int mboxfd, char *host, int topipe);
-int POP3_BuildDigest (char *buf, struct optrec *options);
+int POP3_BuildDigest (char *buf, struct hostrec *options);
 #endif
 
 
@@ -61,7 +61,7 @@ int POP3_BuildDigest (char *buf, struct optrec *options);
  *********************************************************************/
 
 int doPOP3 (options)
-struct optrec *options;
+struct hostrec *options;
 {
   int ok;
   int mboxfd;
@@ -290,7 +290,7 @@ int socket;
  *********************************************************************/
 
 int POP3_auth (options,socket) 
-struct optrec *options;
+struct hostrec *options;
 int socket;
 {
   char buf [POPBUFSIZE];
@@ -713,7 +713,7 @@ int socket;
 #if defined(HAVE_APOP_SUPPORT)
 POP3_BuildDigest (buf,options)
 char *buf;
-struct optrec *options;
+struct hostrec *options;
 {
   char *start,*end;
   char *msg;