Cleanup patches from Gunther Leber.

svn path=/trunk/; revision=2699

diff --git a/NEWS b/NEWS
index 934ba533d43e09618f20d87a0dd63e25a40ccd44..4ba3a804c255e7a241ff179028945f9854ffd478 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ a Certifying Authority we recognize?).
 * Javier Kohen's replacement for es.po.
 * Munechika SUMIKAWA's patch to make IPv6 version build when POP2 is enabled.
 * Russian translation removed; it was badly garbled.
+* Added Rick van Rein's fetchmaildistrib script to the contrib directory.
+* Gunther Leber's cleanup patches.
 * Note to translators: The bodies of the login-error and timeout-error
   form letters have been changed in driver.c.
 

diff --git a/design-notes.html b/design-notes.html
index 567c5be601dc32902e47b3f55810571812863e90..3ba76e621565c93f5d0ac7a1efbae11966b0584a 100644 (file)
--- a/design-notes.html
+++ b/design-notes.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="/~esr/index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1999/12/19 20:15:47 $
+<td width="30%" align=right>$Date: 2000/01/03 22:59:48 $
 </table>
 <HR>
 <H1 ALIGN=CENTER>Design Notes On Fetchmail</H1>
@@ -334,7 +334,7 @@ following minimum steps.
 
 <LI>Add proper <code>FLAG_MERGE</code> actions in fetchmail.c's
     optmerge() function.  (If it's a global option, add an override 
-    at the end of load_params.
+    at the end of load_params.)
 
 <LI>Document the option in fetchmail.man.  This will require at least
     two changes; one to the collected table of options, and one full
@@ -535,7 +535,7 @@ all shaped the design in one way or another.<P>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1999/12/19 20:15:47 $
+<td width="30%" align=right>$Date: 2000/01/03 22:59:48 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>

diff --git a/options.c b/options.c
index 4129342bfb435ec046b154ef7682607905c57756..f4210f6220edadcb4209d1e2247991004a106e4b 100644 (file)
--- a/options.c
+++ b/options.c
@@ -299,17 +299,14 @@ struct query *ctl;        /* option record to be initialized */
            break;
        case 'f':
        case LA_RCFILE:
-           rcfile = (char *) xmalloc(strlen(optarg)+1);
-           strcpy(rcfile,optarg);
+           rcfile = (char *) xstrdup(optarg);
            break;
        case 'i':
        case LA_IDFILE:
-           rctl->idfile = (char *) xmalloc(strlen(optarg)+1);
-           strcpy(rctl->idfile,optarg);
+           rctl->idfile = (char *) xstrdup(optarg);
            break;
        case LA_POSTMASTER:
-           rctl->postmaster = (char *) xmalloc(strlen(optarg)+1);
-           strcpy(rctl->postmaster,optarg);
+           rctl->postmaster = (char *) xstrdup(optarg);
            break;
        case LA_NOBOUNCE:
            run.bouncemail = FALSE;
@@ -476,7 +473,7 @@ struct query *ctl;  /* option record to be initialized */
            do {
                struct idlist   *idp = save_str(&ctl->antispam, NULL, 0);;
 
-               idp->val.status.num = atoi(cp);
+               idp->val.status.num = xatoi(cp, &errflag);
            } while
                ((cp = strtok((char *)NULL, ",")));
            break;

diff --git a/rcfile_y.y b/rcfile_y.y
index 4cb0b5a4f827a462e36bb51a4d4d5b784fb26f57..525a38d5d3773e3e7a02e960a3262318d38e6bb5 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -388,7 +388,7 @@ int prc_filecheck(const char *pathname, const flag securecheck)
        }
     }
 
-    if (!securecheck)  return 0;
+    if (!securecheck)  return PS_SUCCESS;
 
     if ((statbuf.st_mode & S_IFLNK) == S_IFLNK)
     {