Change the `explicit' option to `skip'.

svn path=/trunk/; revision=147

7 files changed, 17 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index 565b3f27..d6a7f5c7 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,8 @@ fetchmail-1.0 (Mon Sep 23 19:54:01 EDT 1996):
   server greeting message; add the server host being queried to the
   message count information line).
 
+* `skip' option to make it easier to set up test entries.
+
 * Name change (it ain't just for POP any more).
 
 popclient-3.2 (Mon Sep 23 13:29:46 EDT 1996):
diff --git a/fetchmail.c b/fetchmail.c
index 44c16ce9..331e5508 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -225,7 +225,7 @@ char **argv;
 
     /* pick up interactively any passwords we need but don't have */ 
     for (hostp = hostlist; hostp; hostp = hostp->next)
-	if (!(implicitmode && hostp->explicit)
+	if (!(implicitmode && hostp->skip)
 	    && !hostp->password[0] && !hostp->rpopid[0])
 	{
 	    char prompt[BUFSIZ];
@@ -261,7 +261,7 @@ char **argv;
      */
     do {
 	for (hostp = hostlist; hostp; hostp = hostp->next) {
-	    if (!implicitmode || !hostp->explicit)
+	    if (!implicitmode || !hostp->skip)
 		popstatus = query_host(hostp);
 	}
 
@@ -405,9 +405,9 @@ struct hostrec *queryctl;
 {
     char *cp;
 
-    if (queryctl->explicit || outlevel == O_VERBOSE)
+    if (queryctl->skip || outlevel == O_VERBOSE)
 	printf("  This host will%s be queried when no host is specified.\n",
-	       queryctl->explicit ? " not" : "");
+	       queryctl->skip ? " not" : "");
     printf("  Username = '%s'\n", queryctl->remotename);
     if (queryctl->password[0] == '\0')
 	printf("  Password will be prompted for.\n");
diff --git a/fetchmail.h b/fetchmail.h
index a50e4dd0..2db2e5b2 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -70,7 +70,7 @@ struct hostrec
   int fetchall;
   int flush;
   int norewrite;
-  int explicit;
+  int skip;
   int port;
 
   /* state used for tracking UIDL ids */
diff --git a/fetchmail.man b/fetchmail.man
index c6215f9b..2630453d 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -404,21 +404,21 @@ Legal keywords are:
     flush
     fetchall
     rewrite
-    explicit
+    skip
     nokeep
     noflush
     nofetchall
     norewrite
-    noexplicit
+    noskip
     port
 .PP
 All these correspond to the obvuious command-line arguments except
-two: \fBpassword\fR and \fBexplicit\fR.
+two: \fBpassword\fR and \fBskip\fR.
 .PP
 The \fBpassword\fR option requires a string argument, which is the password
 to be used with the entry's server.
 .PP
-The \fBexplicit\fR option tells
+The \fBskip\fR option tells
 .I fetchmail 
 not to query this host unless it is explicitly named on the command
 line.  A host entry with this flag will be skipped when
diff --git a/rcfile_l.l b/rcfile_l.l
index 5ac469d6..32aa6a30 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -38,12 +38,12 @@ keep		{ yylval.flag = TRUE; return KW_KEEP; }
 flush		{ yylval.flag = TRUE; return KW_FLUSH; }
 fetchall	{ yylval.flag = TRUE; return KW_FETCHALL; }
 rewrite		{ yylval.flag = TRUE; return KW_REWRITE; }
-explicit	{ yylval.flag = TRUE; return KW_EXPLICIT; }
+skip		{ yylval.flag = TRUE; return KW_SKIP; }
 nokeep		{ yylval.flag = FALSE; return KW_KEEP; }
 noflush		{ yylval.flag = FALSE; return KW_FLUSH; }
 nofetchall	{ yylval.flag = FALSE; return KW_FETCHALL; }
 norewrite	{ yylval.flag = FALSE; return KW_REWRITE; }
-noexplicit	{ yylval.flag = FALSE; return KW_EXPLICIT; }
+noskip		{ yylval.flag = FALSE; return KW_SKIP; }
 port		{ return KW_PORT; }
 
 (auto)|(AUTO)	{ yylval.proto = P_AUTO;  return PROTO_AUTO; }
diff --git a/rcfile_y.y b/rcfile_y.y
index 3b90f3f7..52af1f0d 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -33,7 +33,7 @@ int yydebug;	/* in case we didn't generate with -- debug */
 %token KW_REMOTEFOLDER KW_LOCALFOLDER KW_SMTPHOST KW_MDA KW_EOL KW_DEFAULTS
 %token <proto> PROTO_AUTO PROTO_POP2 PROTO_POP3 PROTO_IMAP PROTO_APOP PROTO_RPOP
 %token <sval> PARAM_STRING
-%token <flag> KW_KEEP KW_FLUSH KW_FETCHALL KW_REWRITE KW_PORT KW_EXPLICIT
+%token <flag> KW_KEEP KW_FLUSH KW_FETCHALL KW_REWRITE KW_PORT KW_SKIP
 %type <proto> proto;
 
 /* these are actually used by the lexer */
@@ -75,7 +75,7 @@ serv_option_clause:
 	|	KW_FLUSH			{prc_setflush($1);}
 	|	KW_FETCHALL			{prc_setfetchall($1);}
 	|	KW_REWRITE			{prc_setrewrite($1);}
-	|	KW_EXPLICIT			{prc_setexplicit($1);}
+	|	KW_SKIP				{prc_setskip($1);}
 	|	KW_PORT PARAM_STRING		{prc_setport($2);}
   ;
 
diff --git a/sample.rcfile b/sample.rcfile
index f7eed187..a7b32fed 100644
--- a/sample.rcfile
+++ b/sample.rcfile
@@ -32,12 +32,12 @@
 #   flush
 #   fetchall
 #   rewrite
-#   explicit
+#   skip
 #   nokeep
 #   noflush
 #   nofetchall
 #   norewrite
-#   noexplicit
+#   noskip
 #   port
 #
 # Legal protocol identifiers are