aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--env.c6
-rw-r--r--etrn.c1
-rw-r--r--fetchmail.c4
-rw-r--r--fetchmail.h2
-rw-r--r--interface.c2
6 files changed, 11 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 2ec24b38..fb24924d 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@
Release Notes:
------------------------------------------------------------------------------
+fetchmail-4.2.4 (Thu Sep 18 16:19:10 EDT 1997)
+* Small compilation cleanups, thanks to Florian laRoche.
+
fetchmail-4.2.3 (Thu Sep 18 16:19:10 EDT 1997)
* Fix a bug in IMAP message-size retrieval.
* Yet another try at getting the size-consistency check right.
diff --git a/env.c b/env.c
index 06f9da67..874a094d 100644
--- a/env.c
+++ b/env.c
@@ -7,6 +7,7 @@
#include "config.h"
#include "fetchmail.h"
#include <stdio.h>
+#include <ctype.h>
#if defined(STDC_HEADERS)
#include <stdlib.h>
#endif
@@ -22,16 +23,13 @@
extern char *getenv(); /* needed on sysV68 R3V7.1. */
-char *user, *home, *fetchmailhost;
-
extern char *program_name;
void envquery(int argc, char **argv)
/* set up basic stuff from the environment (including the rc file name) */
{
- char *tmpdir, tmpbuf[BUFSIZ];
+ char tmpbuf[BUFSIZ];
struct passwd *pw;
- struct query *ctl;
if ((program_name = strrchr(argv[0], '/')) != NULL)
++program_name;
diff --git a/etrn.c b/etrn.c
index d65e1b03..d5c6f432 100644
--- a/etrn.c
+++ b/etrn.c
@@ -10,6 +10,7 @@
#include <assert.h>
#include <netdb.h>
#include <errno.h>
+#include <unistd.h>
#include "fetchmail.h"
#include "smtp.h"
#include "socket.h"
diff --git a/fetchmail.c b/fetchmail.c
index 60b0ed17..54dc45c6 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -64,6 +64,7 @@ int cmd_daemon; /* if --daemon was set */
char *idfile; /* UID list file */
flag versioninfo; /* emit only version info */
char *user; /* the name of the invoking user */
+char *home;
char *fetchmailhost; /* the name of the host running fetchmail */
char *program_name; /* the name to prefix error messages with */
@@ -90,7 +91,6 @@ int main (int argc, char **argv)
{
int st, bkgd = FALSE;
int parsestatus, implicitmode = FALSE;
- struct passwd *pw;
struct query *ctl;
FILE *lockfp;
netrc_entry *netrc_list;
@@ -517,7 +517,7 @@ static int load_params(int argc, char **argv, int optind)
{
int implicitmode, st;
struct passwd *pw;
- struct query def_opts, *ctl, *mp;
+ struct query def_opts, *ctl;
memset(&def_opts, '\0', sizeof(struct query));
def_opts.smtp_socket = -1;
diff --git a/fetchmail.h b/fetchmail.h
index 9b1695e7..376c5f83 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -181,7 +181,6 @@ extern struct query cmd_opts, *querylist;
/* what's returned by envquery */
extern void envquery(int, char **);
-char *user, *home, *fetchmailhost;
/* controls the detail level of status/progress messages written to stderr */
extern int outlevel; /* see the O_.* constants above */
@@ -207,6 +206,7 @@ extern char *idfile; /* path name of UID file */
extern int linelimit; /* limit # lines retrieved per site */
extern flag versioninfo; /* emit only version info */
extern char *user; /* name of invoking user */
+extern char *home; /* home directory of invoking user */
extern char *fetchmailhost; /* the name of the host running fetchmail */
/* prototypes for globally callable functions */
diff --git a/interface.c b/interface.c
index 3e20f7af..266cf6ba 100644
--- a/interface.c
+++ b/interface.c
@@ -23,7 +23,9 @@
#include <unistd.h>
#endif
#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <net/if.h>
#include "config.h"
#include "fetchmail.h"