Got rid of versioninfo member.

svn path=/trunk/; revision=29

3 files changed, 6 insertions, 5 deletions

diff --git a/fetchmail.c b/fetchmail.c
index 9c2c02b5..b99e8d30 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -52,6 +52,7 @@ int query_host(struct optrec *options);
 
 /* Controls the detail of status/progress messages written to stderr */
 int outlevel;		/* see the O_.* constants in popclient.h */
+int versioninfo;	/* emit only version info */
 
 /* Daemon-mode control */
 int poll_interval;	/* polling interval for daemon mode */
@@ -98,7 +99,7 @@ char **argv;
   if ((parsestatus = parsecmdline(argc,argv,&cmd_opts)) < 0)
     exit(PS_SYNTAX);
 
-  if (cmd_opts.versioninfo)
+  if (versioninfo)
     showversioninfo();
 
   if (prc_parse_file(poprcfile) != 0)
@@ -123,7 +124,7 @@ char **argv;
   }
 
   /* perhaps we just want to check options? */
-  if (cmd_opts.versioninfo) {
+  if (versioninfo) {
     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);
diff --git a/fetchmail.h b/fetchmail.h
index 773daff3..d3a09299 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -46,7 +46,6 @@
 #define		TO_MDA		3	/* use agent */
 
 struct optrec {
-  int versioninfo;
   int keep;
   int protocol;
   int limit;
@@ -84,7 +83,8 @@ struct prc_server {
 
 /* Controls the detail of status/progress messages written to stderr */
 extern int outlevel;    /* see the O_.* constants above */
-extern int yydebug;	/* enable parse debugging */ 
+extern int yydebug;	/* enable parse debugging */
+extern int versioninfo;	/* emit only version info */
 
 /* daemon mode control */
 extern int poll_interval;	/* poll interval in seconds */
diff --git a/options.c b/options.c
index df7c3a7d..66c7f401 100644
--- a/options.c
+++ b/options.c
@@ -116,7 +116,7 @@ struct optrec *options;
         break;
       case 'V':
       case LA_VERSION:
-        options->versioninfo = !0;
+        versioninfo = !0;
         break;
       case 'a':
       case LA_ALL: