Minor bug fixes.

svn path=/trunk/; revision=2881

diff --git a/NEWS b/NEWS
index c1db39bcce73df745898dede664492dfeb8cf50b..1dca6114c8e0482bf73cee1ed46258d2746d4979 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* Fixed brown-paper-bag bugs involving rcfile initialization.
+* In fetchmailconf, don't permit editing of a blank server entry.
+
 fetchmail-5.3.7 (Sun Apr 16 03:46:13 EDT 2000), 18975 lines:
 
 * Updated and corrected version of contrib/domino.

diff --git a/env.c b/env.c
index 1adba642b88f03e7e86e010494c4739e152c7ff1..2ca72cf37406813418a2c664e5bc74667891085d 100644 (file)
--- a/env.c
+++ b/env.c
@@ -95,7 +95,7 @@ void envquery(int argc, char **argv)
      * for its files. We don't want to do that if fetchmail has its
      * own home ($FETCHMAILHOME), however.
      */
-    rcfile = (char *)xmalloc(strlen(fmhome)+sizeof(RCFILE_NAME)+(fmhome==home)+1);
+    rcfile = (char *)xmalloc(strlen(fmhome)+sizeof(RCFILE_NAME)+(fmhome==home)+2);
     /* avoid //.fetchmailrc */
     if (strcmp(fmhome, "/") != 0)
        strcpy(rcfile, fmhome);

diff --git a/fetchmail.c b/fetchmail.c
index 75f2bf1448dcdba4738b5d9e1b9de32cc9a36505..d68bffca82cda3c2326eaa6f9d96e8678001e99c 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
     }
 
 #define IDFILE_NAME    ".fetchids"
-    run.idfile = (char *) xmalloc(strlen(fmhome)+sizeof(IDFILE_NAME)+1);
+    run.idfile = (char *) xmalloc(strlen(fmhome)+sizeof(IDFILE_NAME)+2);
     strcpy(run.idfile, fmhome);
     strcat(run.idfile, "/");
     strcat(run.idfile, IDFILE_NAME);
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
 
 #define        NETRC_FILE      ".netrc"
     /* parse the ~/.netrc file (if present) for future password lookups. */
-    xalloca(netrc_file, char *, strlen(home) + sizeof(NETRC_FILE) + 1);
+    xalloca(netrc_file, char *, strlen(home) + sizeof(NETRC_FILE) + 2);
     strcpy (netrc_file, home);
     strcat (netrc_file, "/");
     strcat (netrc_file, NETRC_FILE);

diff --git a/fetchmail.man b/fetchmail.man
index 4b35fa8a567d1e304e4fdef3725253d652dc61bc..2ab32ab160dba5ad20084140bfe368ad4fec11e9 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -1936,7 +1936,7 @@ If the environment variable FETCHMAILHOME is set to a valid and
 existing directory name, the .fetchmailrc and .fetchids and
 \&.fetchmail.pid files are put there instead of in the invoking user's
 home directory (and lose the leading dots on theirt names).  The
-.netrc file is looked for in the the invoking user's home directory
+\&.netrc file is looked for in the the invoking user's home directory
 regardless of FETCHMAILHOME's setting.
 
 .SH SIGNALS