Commit 50a942cf authored by Eric S. Raymond's avatar Eric S. Raymond

The great name change.

svn path=/trunk/; revision=114
parent 3f972ba1
INSTALL Instructions for Popclient
INSTALL Instructions for Fetchmail
Installing popclient is easy. From within this directory, type:
Installing fetchmail is easy. From within this directory, type:
./configure
......@@ -17,14 +17,14 @@ Next run
make
This will compile popclient for your system. Note that in order to
This will compile fetchmail for your system. Note that in order to
build it, you'll need either flex at version 2.5.3 org greater, or lex.
Lastly, become root and run
make install
This will install popclient. By default, popclient will be installed
This will install fetchmail. By default, fetchmail will be installed
in /usr/local/bin, with the man page in /usr/local/man/man1, and the
GNU info file in /usr/local/info. If you wish to change these defaults,
edit the Makefile AFTER you run "configure" but BEFORE you run
......
# Makefile for popclient
# Makefile for fetchmail
# If you're running QNX, we can't assume a working autoconf.
# So just uncomment all the lines marked QNX.
VERS=3.2
VERS=1.0
# Ultrix 2.2 make doesn't expand the value of VPATH.
srcdir = @[email protected]
......@@ -44,8 +44,8 @@ prefix = /usr/local
# Common prefix for machine-dependent installed files.
exec_prefix = $(prefix)
# Name under which to install popclient
instname = popclient
# Name under which to install fetchmail
instname = fetchmail
# Directory in which to install.
bindir = $(exec_prefix)/bin
# Directory to install the Info files in.
......@@ -71,33 +71,33 @@ TEXI2DVI = texi2dvi
ETAGS = etags -tw
CTAGS = ctags -tw
popobjs = socket.o getpass.o pop2.o pop3.o imap.o popclient.o options.o \
poprc_l.o poprc_y.o poprc.o daemon.o driver.o smtp.o xmalloc.o
popobjs = socket.o getpass.o pop2.o pop3.o imap.o fetchmail.o options.o \
fetchrc_l.o fetchrc_y.o fetchrc.o daemon.o driver.o smtp.o xmalloc.o
objs = $(popobjs) $(EXTRAOBJ) $(extras)
srcs = $(srcdir)/socket.c $(srcdir)/getpass.c $(srcdir)/pop2.c \
$(srcdir)/pop3.c $(srcdir)/imap.c $(srcdir)/popclient.c \
$(srcdir)/options.c $(srcdir)/poprc.c $(srcdir)/daemon.c \
$(srcdir)/pop3.c $(srcdir)/imap.c $(srcdir)/fetchmail.c \
$(srcdir)/options.c $(srcdir)/fetchrc.c $(srcdir)/daemon.c \
$(srcdir)/driver.c $(srcdir)/smtp.c $(srcdir)/xmalloc.c $(EXTRASRC)
.SUFFIXES:
.SUFFIXES: .o .c .h .y .l .ps .dvi .info .texi
all: popclient
all: fetchmail
check: # No tests.
depend:
test -f config.h || touch config.h
test -f poprc_y.h || touch poprc_y.h
test -f fetchrc_y.h || touch fetchrc_y.h
makedepend -fMakefile.in *.c
# Some makes apparently use .PHONY as the default goal is it is before `all'.
.PHONY: all check
$(popobjs): popclient.h
$(popobjs): fetchmail.h
popclient: $(srcdir)/poprc_l.c $(srcdir)/poprc_y.c $(objs)
$(CC) $(LDFLAGS) $(objs) $(LOADLIBS) -o popclient
fetchmail: $(srcdir)/fetchrc_l.c $(srcdir)/fetchrc_y.c $(objs)
$(CC) $(LDFLAGS) $(objs) $(LOADLIBS) -o fetchmail
# -I. is needed to find config.h in the build directory.
......@@ -125,7 +125,7 @@ MAKE = make
FORCE:
tagsrcs = $(srcs) $(srcdir)/poprc_l.c $(srcdir)/poprc_y.c
tagsrcs = $(srcs) $(srcdir)/fetchrc_l.c $(srcdir)/fetchrc_y.c
TAGS: $(tagsrcs)
$(ETAGS) $(tagsrcs)
tags: $(tagsrcs)
......@@ -133,21 +133,21 @@ tags: $(tagsrcs)
.PHONY: install installdirs
install: installdirs \
$(bindir)/$(instname) # $(infodir)/popclient.info \
$(bindir)/$(instname) # $(infodir)/fetchmail.info \
$(mandir)/$(instname).$(manext)
installdirs:
$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(mandir)
$(bindir)/$(instname): popclient
$(INSTALL_PROGRAM) popclient [email protected]
$(bindir)/$(instname): fetchmail
$(INSTALL_PROGRAM) fetchmail [email protected]
$(infodir)/popclient.info: popclient.info
if [ -r ./popclient.info ]; then dir=.; else dir=$(srcdir); fi; \
for file in $${dir}/popclient.info*; do \
$(infodir)/fetchmail.info: fetchmail.info
if [ -r ./fetchmail.info ]; then dir=.; else dir=$(srcdir); fi; \
for file in $${dir}/fetchmail.info*; do \
name="`basename $$file`"; \
$(INSTALL_DATA) $$file \
`echo [email protected] | sed "s,popclient.info\$$,$$name,"`; \
`echo [email protected] | sed "s,fetchmail.info\$$,$$name,"`; \
done
# Run install-info only if it exists.
# Use `if' instead of just prepending `-' to the
......@@ -155,25 +155,25 @@ $(infodir)/popclient.info: popclient.info
# We use `$(SHELL) -c' because some shells do not
# fail gracefully when there is an unknown command.
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
install-info --infodir=$(infodir) $$dir/popclient.info; \
install-info --infodir=$(infodir) $$dir/fetchmail.info; \
else true; fi
$(mandir)/$(instname).$(manext): popclient.man
$(INSTALL_DATA) $(srcdir)/popclient.man [email protected]
$(mandir)/$(instname).$(manext): fetchmail.man
$(INSTALL_DATA) $(srcdir)/fetchmail.man [email protected]
.PHONY: clean realclean distclean mostlyclean
clean:
-rm -f popclient *.o core popclient.dvi \
poprc_l.c poprc_y.h poprc_y.c popclient.tar popclient.tar.gz
-rm -f fetchmail *.o core fetchmail.dvi \
fetchrc_l.c fetchrc_y.h fetchrc_y.c fetchmail.tar fetchmail.tar.gz
distclean: clean
-rm -f Makefile config.h
-rm -f config.cache config.status config.log stamp-config
-rm -f TAGS tags
-rm -f popclient.log popclient.toc popclient.*aux
-rm -f fetchmail.log fetchmail.toc fetchmail.*aux
realclean: popclient.info* distclean
realclean: fetchmail.info* distclean
mostlyclean: clean
......@@ -194,31 +194,31 @@ configure: configure.in
# Special dependencies, not easily handled without explicit rules
$(srcdir)/poprc_l.c: $(srcdir)/poprc_l.l
$(srcdir)/poprc_y.c: $(srcdir)/poprc_y.y
$(srcdir)/fetchrc_l.c: $(srcdir)/fetchrc_l.l
$(srcdir)/fetchrc_y.c: $(srcdir)/fetchrc_y.y
parser = $(srcdir)/poprc_l.l $(srcdir)/poprc_y.y
headers = $(srcdir)/popclient.h $(srcdir)/socket.h $(srcdir)/poproto.h \
parser = $(srcdir)/fetchrc_l.l $(srcdir)/fetchrc_y.y
headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/poproto.h \
$(srcdir)/smtp.h
extra = $(srcdir)/alloca.c $(srcdir)/bzero.[ch] $(srcdir)/errorcodes \
$(srcdir)/getopt.[ch] $(srcdir)/getopt1.c $(srcdir)/md5*.[ch] \
$(srcdir)/strcasecmp.c $(srcdir)/strdup.c
docs = $(srcdir)/COPYING $(srcdir)/README $(srcdir)/INSTALL $(srcdir)/NEWS \
$(srcdir)/popclient.lsm $(srcdir)/RFC/*.txt \
$(srcdir)/*.man $(srcdir)/sample.poprc
$(srcdir)/fetchmail.lsm $(srcdir)/RFC/*.txt \
$(srcdir)/*.man $(srcdir)/sample.fetchrc
config = $(srcdir)/Makefile.in $(srcdir)/configure.in $(srcdir)/configure \
$(srcdir)/config.guess $(srcdir)/config.h.in $(srcdir)/config.sub
scripts = $(srcdir)/install.sh $(srcdir)/mkinstalldirs
all = $(docs) $(config) $(srcs) $(parser) $(headers) $(extra) $(scripts) MANIFEST
manifest: $(all)
@echo $(all) | tr "[ \t]" '\n' | sort | sed "s/\\./popclient-$(VERS)/"
@echo $(all) | tr "[ \t]" '\n' | sort | sed "s/\\./fetchmail-$(VERS)/"
popclient-$(VERS).tar: $(all)
(cd ..; tar -cf popclient-$(VERS).tar `cat popclient-$(VERS)/MANIFEST`)
mv ../popclient-$(VERS).tar popclient-$(VERS).tar
popclient-$(VERS).tar.gz: popclient-$(VERS).tar
gzip -f popclient-$(VERS).tar
fetchmail-$(VERS).tar: $(all)
(cd ..; tar -cf fetchmail-$(VERS).tar `cat fetchmail-$(VERS)/MANIFEST`)
mv ../fetchmail-$(VERS).tar fetchmail-$(VERS).tar
fetchmail-$(VERS).tar.gz: fetchmail-$(VERS).tar
gzip -f fetchmail-$(VERS).tar
# The automatically generated dependencies below may omit config.h
# because it is included with ``#include <config.h>'' rather than
......
......@@ -49,7 +49,11 @@ Recode POP2 to use the same driver/method strategy as POP3/IMAP, so
all three protocols will be able to forward messages through the generic
driver to SMTP. (This requires that we find a POP2 server to test with.)
3.2 (Mon Sep 23 13:29:46 EDT 1996):
fetchmail-1.0 (Mon Sep 23 19:54:01 EDT 1996):
* Name change (it ain't just for POP3 any more).
popclient-3.2 (Mon Sep 23 13:29:46 EDT 1996):
* RPOP support (coded at a user's request but untested).
......@@ -66,7 +70,7 @@ driver to SMTP. (This requires that we find a POP2 server to test with.)
* Try USER and HOME to set defaults before going to the password file.
This should work better in Sun NIS environments.
3.1:
popclient-3.1:
* MDA arguments are now dumped when using the -V option.
......@@ -85,20 +89,20 @@ driver to SMTP. (This requires that we find a POP2 server to test with.)
* It is now possible to specify the host TCP/IP port number to connect to.
3.05:
popclient-3.05:
* Experimental support for RFC1725-compliant POP servers with the UIDL
command and without LAST.
3.04:
popclient-3.04:
* Logfile option works.
3.03:
popclient-3.03:
* Minor bug fixes for password querying and redirection to stdout.
3.02:
popclient-3.02:
* Correct buggy processing of nokeep/noflush/fetchall.
......@@ -108,7 +112,7 @@ driver to SMTP. (This requires that we find a POP2 server to test with.)
* Delivery via sendmail now works in non-daemon mode.
3.01:
popclient-3.01:
* Fixed a lexical analyzer bug in quoted-string processing.
......@@ -117,7 +121,7 @@ driver to SMTP. (This requires that we find a POP2 server to test with.)
* The lock assertion code was in the wrong place relative to the daemonize()
call.
3.0:
popclient-3.0:
Eric S. Raymond <[email protected]> hacked extensively on 3.0b6 and took over
the package with the consent of Carl Harris, the original implementor.
......
README for popclient
README for fetchmail
popclient is a full-featured, robust, well-documented POP2, POP3, APOP,
and IMAP client originally developed by Carl Harris <[email protected]> and
now maintained by Eric S. Raymond <[email protected]>.
fetchmail is a full-featured, robust, well-documented POP2, POP3, APOP,
and IMAP client originally developed (under the name popclient) by Carl
Harris <[email protected]> and now maintained by Eric S. Raymond
<[email protected]>.
popclient was developed under Linux and should be readily portable to other
fetchmail was developed under Linux and should be readily portable to other
UNIX systems (it uses GNU autoconf). It has also been ported to QNX; to build
under QNX, see the header commets in the Makefile.
under QNX, see the header comments in the Makefile.
You can find the latest version of popclient from Eric's home page
You can find the latest version of fetchmail from Eric's home page
http://www.ccil.org/~esr
Features of popclient include:
Features of fetchmail include:
* POP2, POP3, APOP, RPOP and IMAP support with auto-probing for a
server on the host if no protocol is specified.
* Easy configuration via command line or free-format .poprc file.
* Daemon mode -- popmail can be run in background to poll
* Daemon mode -- fetchmail can be run in background to poll
one or more hosts at a specified interval.
* Delivery via either file-append with mandatory locking or an
MDA you specify, or via SMTP to the client machine's port 25.
* From:, To:, Cc:, and Reply-To: headers are rewritten so that
usernames relative to the popclient host become fully-qualified
usernames relative to the fetchmail host become fully-qualified
Internet addresses. This enables replies to work correctly.
There is a man page at popclient.man. A sample rc file is at sample.poprc.
There is a man page at fetchmail.man. A sample rc file is at sample.fetchrc.
For a release history, see the file NEWS.
-- esr
dnl Autoconfigure input file for popclient
dnl Autoconfigure input file for fetchmail
dnl Carl Harris, [email protected]
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
AC_INIT(popclient.h) dnl A distinctive file to look for in srcdir.
AC_INIT(fetchmail.h) dnl A distinctive file to look for in srcdir.
AC_CONFIG_HEADER(config.h)
# We want these before the checks, so the checks can modify their values.
......@@ -67,7 +67,7 @@ case $host in
# Do *not* use the -t option! We explicitly want only
# local delivery to the recipients named on the command line.
# Also don't use -fpopmail -- this looks tempting, but will
# cause lossage unless you always run popclient from the
# cause lossage unless you always run fetchmail from the
# account of a privileged user.
AC_DEFINE(DEF_MDA,"/usr/lib/sendmail -oem %s")
mdacmd="/usr/lib/sendmail -fpopmail \$u"
......@@ -195,7 +195,7 @@ AC_TRY_LINK([#include <signal.h>
AC_MSG_RESULT(no))
# The presence of the following is not meant to imply
# that popclient necessarily works on those systems.
# that fetchmail necessarily works on those systems.
dnl AC_DYNIX_SEQ
dnl AC_XENIX_DIR
dnl AC_IRIX_SUN
......
......@@ -6,7 +6,7 @@
/***********************************************************************
module: daemon
project: popclient
project: fetchmail
programmer: Carl Harris, [email protected]
description: This module contains all of the code needed to
turn a process into a daemon for POSIX, SysV, and
......@@ -40,7 +40,7 @@
#define SIGCLD SIGCHLD
#endif
#include "popclient.h"
#include "fetchmail.h"
/******************************************************************
function: sigchld_handler
......
......@@ -5,7 +5,7 @@
/***********************************************************************
module: driver.c
project: popclient
project: fetchmail
programmer: Eric S. Raymond
description: Generic driver for mail fetch method protocols
......@@ -28,7 +28,7 @@
#include <malloc.h>
#include "socket.h"
#include "popclient.h"
#include "fetchmail.h"
#include "smtp.h"
static struct method *protocol;
......@@ -55,7 +55,7 @@ static int gen_readmsg (int socket, int mboxfd, long len, int delimited,
proto protocol method pointer
return value: exit code from the set of PS_.* constants defined in
popclient.h
fetchmail.h
calls:
globals: reads outlevel.
*********************************************************************/
......@@ -660,7 +660,7 @@ int rewrite;
return(PS_SMTP);
#ifdef SMTP_RESEND
/*
* This is what we'd do if popclient were a real MDA
* This is what we'd do if fetchmail were a real MDA
* a la sendmail -- crack all the destination headers
* and send to every address we can reach via SMTP.
*/
......
......@@ -4,11 +4,11 @@
*/
/***********************************************************************
module: popclient.c
project: popclient
module: fetchmail.c
project: fetchmail
programmer: Carl Harris, [email protected]
Extensively hacked and improved by esr.
description: main driver module for popclient
description: main driver module for fetchmail
***********************************************************************/
......@@ -36,7 +36,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include "popclient.h"
#include "fetchmail.h"
/* release info */
#define RELEASE_TAG "3.1"
......@@ -60,7 +60,7 @@ char *logfile; /* log file for daemon mode */
int quitmode; /* if --quit was set */
/* miscellaneous global controls */
char *poprcfile; /* path name of rc file */
char *rcfile; /* path name of rc file */
char *idfile; /* path name of id file */
int linelimit; /* limit # lines retrieved per site */
int versioninfo; /* emit only version info */
......@@ -111,7 +111,7 @@ char **argv;
if (versioninfo)
showversioninfo();
if (prc_parse_file(poprcfile) != 0)
if (prc_parse_file(rcfile) != 0)
exit(PS_SYNTAX);
if (optind >= argc)
......@@ -138,7 +138,7 @@ char **argv;
if ((tmpdir = getenv("TMPDIR")) == (char *)NULL)
tmpdir = "/tmp";
strcpy(tmpbuf, tmpdir);
strcat(tmpbuf, "/poplock-");
strcat(tmpbuf, "/fetchmail-");
gethostname(tmpbuf + strlen(tmpbuf), HOSTLEN+1);
if ((user = getenv("USER")) != (char *)NULL)
{
......@@ -148,7 +148,7 @@ char **argv;
/* perhaps we just want to check options? */
if (versioninfo) {
printf("Taking options from command line and %s\n", poprcfile);
printf("Taking options from command line and %s\n", rcfile);
for (hostp = hostlist; hostp; hostp = hostp->next) {
printf("Options for host %s:\n", hostp->servername);
dump_params(hostp);
......@@ -158,17 +158,17 @@ char **argv;
if (hostlist == NULL)
(void) fprintf(stderr,
"No mailservers set up -- perhaps %s is missing?\n",
poprcfile);
rcfile);
exit(0);
}
else if (hostlist == NULL) {
(void) fputs("popclient: no mailservers have been specified.\n", stderr);
(void) fputs("fetchmail: no mailservers have been specified.\n", stderr);
exit(PS_SYNTAX);
}
if ((lockfile = (char *) malloc(strlen(tmpbuf) + 1)) == NULL)
{
fprintf(stderr,"popclient: cannot allocate memory for lock name.\n");
fprintf(stderr,"fetchmail: cannot allocate memory for lock name.\n");
exit(PS_EXCLUDE);
}
else
......@@ -180,16 +180,16 @@ char **argv;
FILE* fp;
if ( (fp = fopen(lockfile, "r")) == NULL ) {
fprintf(stderr,"popclient: no other popclient is running\n");
fprintf(stderr,"fetchmail: no other fetchmail is running\n");
return(PS_EXCLUDE);
}
fscanf(fp,"%d",&pid);
fprintf(stderr,"popclient: killing popclient at PID %d\n",pid);
fprintf(stderr,"fetchmail: killing fetchmail at PID %d\n",pid);
if ( kill(pid,SIGTERM) < 0 )
fprintf(stderr,"popclient: error killing the process %d.\n",pid);
fprintf(stderr,"fetchmail: error killing the process %d.\n",pid);
else
fprintf(stderr,"popclient: popclient at %d is dead.\n", pid);
fprintf(stderr,"fetchmail: fetchmail at %d is dead.\n", pid);
fclose(fp);
remove(lockfile);
......@@ -197,7 +197,7 @@ char **argv;
}
/* beyond here we don't want more than one popclient running per user */
/* beyond here we don't want more than one fetchmail running per user */
umask(0077);
if ( (tmpfp = fopen(lockfile, "r")) != NULL ) {
fscanf(tmpfp,"%d",&pid);
......@@ -331,7 +331,7 @@ struct hostrec *queryctl;
time_t now;
time(&now);
fprintf(stderr, "popclient: querying %s (protocol %s) at %s",
fprintf(stderr, "fetchmail: querying %s (protocol %s) at %s",
queryctl->servername, showproto(queryctl->protocol), ctime(&now));
}
switch (queryctl->protocol) {
......@@ -356,7 +356,7 @@ struct hostrec *queryctl;
return(doIMAP(queryctl));
break;
default:
fprintf(stderr,"popclient: unsupported protocol selected.\n");
fprintf(stderr,"fetchmail: unsupported protocol selected.\n");
return(PS_PROTOCOL);
}
}
......@@ -372,7 +372,7 @@ struct hostrec *queryctl;
int showversioninfo()
{
printf("This is popclient release %s\n",RELEASE_TAG);
printf("This is fetchmail release %s\n",RELEASE_TAG);
}
/*********************************************************************
......@@ -495,7 +495,7 @@ struct hostrec *queryctl;
return(fd);
}
else {
perror("popclient: openuserfolder: open()");
perror("fetchmail: openuserfolder: open()");
return(-1);
}
......@@ -523,11 +523,11 @@ struct hostrec *queryctl;
char binmailargs [80];
if (pipe(pipefd) < 0) {
perror("popclient: openmailpipe: pipe");
perror("fetchmail: openmailpipe: pipe");
return(-1);
}
if ((childpid = fork()) < 0) {
perror("popclient: openmailpipe: fork");
perror("fetchmail: openmailpipe: fork");
return(-1);
}
else if (childpid == 0) {
......@@ -536,14 +536,14 @@ struct hostrec *queryctl;
close(pipefd[1]); /* close the 'write' end of the pipe */
close(0); /* get rid of inherited stdin */
if (dup(pipefd[0]) != 0) {
fputs("popclient: openmailpipe: dup() failed\n",stderr);
fputs("fetchmail: openmailpipe: dup() failed\n",stderr);
exit(1);
}
execv(queryctl->mda, mda_argv+1);
/* if we got here, an error occurred */
perror("popclient: openmailpipe: exec");
perror("fetchmail: openmailpipe: exec");
return(-1);
}
......@@ -578,7 +578,7 @@ int fd;
err = 0;
if (err)
perror("popclient: closeuserfolder: close");
perror("fetchmail: closeuserfolder: close");
return(err);
}
......@@ -613,7 +613,7 @@ int fd;
childpid = wait((int *) 0);
#endif
if (err)
perror("popclient: closemailpipe: close");
perror("fetchmail: closemailpipe: close");
if (outlevel == O_VERBOSE)
fprintf(stderr, "closed pipe %d\n", fd);
......
......@@ -4,8 +4,8 @@
*/
/***********************************************************************
module: popclient.h
project: popclient
module: fetchmail.h
project: fetchmail
programmer: Carl Harris, [email protected]
description: global constant, type, and variable definitions.
......@@ -108,7 +108,7 @@ extern char *logfile; /* log file for daemon mode */
extern int quitmode; /* if --quit was set */
/* miscellaneous global controls */
extern char *poprcfile; /* path name of rc file */
extern char *rcfile; /* path name of rc file */
extern char *idfile; /* path name of id file */
extern int linelimit; /* limit # lines retrieved per site */
extern int versioninfo; /* emit only version info */
......
This diff is collapsed.
......@@ -5,7 +5,7 @@
/***********************************************************************
module: getpass.c
project: popclient
project: fetchmail
programmer: Carl Harris, [email protected]
description: getpass() replacement which allows for long passwords.
......
......@@ -5,7 +5,7 @@
/***********************************************************************
module: imap.c
project: popclient
project: fetchmail
programmer: Eric S. Raymond
description: IMAP client code
......@@ -24,7 +24,7 @@
#include <errno.h>
#include "socket.h"
#include "popclient.h"
#include "fetchmail.h"
static int count, first;
......
......@@ -2,7 +2,7 @@
* All rights reserved.
* For license terms, see the file COPYING in this directory.
*
* md5global.h Global declarations for MD5 module used by popclient
* md5global.h Global declarations for MD5 module used by fetchmail
*
*/
......
......@@ -5,7 +5,7 @@
/***********************************************************************
module: md5ify.c
project: popclient
project: fetchmail
programmer: Carl Harris, [email protected]
description: Simple interface to MD5 module.
......
......@@ -5,7 +5,7 @@
/***********************************************************************
module: options.c
project: popclient
project: fetchmail
programmer: Carl Harris, [email protected]
description: command-line option processing
......@@ -16,7 +16,7 @@
#include <pwd.h>
#include "getopt.h"
#include "popclient.h"
#include "fetchmail.h"
#include "bzero.h"
#define LA_VERSION 1
......@@ -30,7 +30,7 @@
#define LA_FLUSH 9
#define LA_PROTOCOL 10
#define LA_DAEMON 11
#define LA_POPRC 12
#define LA_FETCHRC 12
#define LA_IDFILE 13
#define LA_USERNAME 14
#define LA_REMOTEFILE 15
......@@ -57,7 +57,7 @@ static struct option longoptions[] = {
{"protocol", required_argument, (int *) 0, LA_PROTOCOL },
{"proto", required_argument, (int *) 0, LA_PROTOCOL },
{"daemon", required_argument, (int *) 0, LA_DAEMON },
{"poprc", required_argument, (int *) 0, LA_POPRC },
{"fetchrc", required_argument, (int *) 0, LA_FETCHRC },
{"user", required_argument, (int *) 0, LA_USERNAME },
{"username", required_argument, (int *) 0, LA_USERNAME },
{"remote", required_argument, (int *) 0, LA_REMOTEFILE },
......@@ -91,7 +91,7 @@ static struct option longoptions[] = {
syntax errors.
calls: none.
globals: writes outlevel, versioninfo, yydebug, logfile,
poll_interval, quitmode, poprcfile, idfile, linelimit.
poll_interval, quitmode, rcfile, idfile, linelimit.
*********************************************************************/
int parsecmdline (argc,argv,queryctl)
......@@ -191,9 +191,9 @@ struct hostrec *queryctl;
poll_interval = atoi(optarg);
break;
case 'f':
case LA_POPRC:
poprcfile = (char *) xmalloc(strlen(optarg)+1);
strcpy(poprcfile,optarg);
case LA_FETCHRC:
rcfile = (char *) xmalloc(strlen(optarg)+1);
strcpy(rcfile,optarg);
break;