Don't write empty configuration strings to the configuration file like

e.g. an empty proxy setting because the very optimistic parse can't
handle those.

2 files changed, 21 insertions, 15 deletions

diff --git a/misc/bidwatcher/distinfo b/misc/bidwatcher/distinfo
index 73ba1fda1f0..9bab1e6b238 100644
--- a/misc/bidwatcher/distinfo
+++ b/misc/bidwatcher/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/10/07 22:17:20 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/10/07 22:44:20 tron Exp $
 
 SHA1 (bidwatcher-1.3.0.tar.gz) = 2fc2d17d65aab43fd0b716cce3588207aebb8a68
 Size (bidwatcher-1.3.0.tar.gz) = 97828 bytes
-SHA1 (patch-aa) = 5201218785610e52e747c760288edf46df9a9ca5
+SHA1 (patch-aa) = 3db432be9adf3a16cbc3056e0877674009bb019a
diff --git a/misc/bidwatcher/patches/patch-aa b/misc/bidwatcher/patches/patch-aa
index 75850287407..1d6e1eace8f 100644
--- a/misc/bidwatcher/patches/patch-aa
+++ b/misc/bidwatcher/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2001/10/07 22:17:20 tron Exp $
+$NetBSD: patch-aa,v 1.4 2001/10/07 22:44:21 tron Exp $
 
 --- bidwatcher.cpp.orig	Thu Jul  5 02:31:54 2001
-+++ bidwatcher.cpp	Mon Oct  8 00:10:20 2001
++++ bidwatcher.cpp	Mon Oct  8 00:42:19 2001
 @@ -639,7 +639,7 @@
  
    if(proxyurl!=NULL) delete(proxyurl);
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2001/10/07 22:17:20 tron Exp $
    else proxyurl=NULL;
    
    if(timesyncurl!=NULL) delete(timesyncurl);
-@@ -1712,10 +1712,11 @@
+@@ -1712,11 +1712,15 @@
    fprintf(file,"option trackbids %s\n", trackBids?"yes":"no");
    fprintf(file,"option updateonstartup %s\n", doStartup?"yes":"no");
    fprintf(file,"option autodelete %s\n", autoDelete?"yes":"no");
@@ -19,12 +19,18 @@ $NetBSD: patch-aa,v 1.3 2001/10/07 22:17:20 tron Exp $
 +  fprintf(file,"option snipedelay %.d\n", snipeDelay);
    if(clockIsSet) fprintf(file,"option timediff %d\n",timeDiff);
    fprintf(file, "user %s %s\n",authID,authPASS);
-   fprintf(file, "option browser %s\n",browserPATH);
-+  fprintf(file, "option email %s\n",emailPATH);
-   fprintf(file, "option proxy %s\n",proxystring);
+-  fprintf(file, "option browser %s\n",browserPATH);
+-  fprintf(file, "option proxy %s\n",proxystring);
++  if (browserPATH[0]!='\0')
++    fprintf(file, "option browser %s\n",browserPATH);
++  if (emailPATH[0]!='\0')
++    fprintf(file, "option email %s\n",emailPATH);
++  if (proxystring[0]!='\0')
++     fprintf(file, "option proxy %s\n",proxystring);
    for ( int i=0; i < aucIdx; i++ )
      {
-@@ -2508,7 +2509,7 @@
+       fprintf(file,"auction %u\n",auction[i]->ItemNumber);
+@@ -2508,7 +2512,7 @@
  
    if(proxyurl!=NULL) delete(proxyurl);
    if(strlen(proxystring)>2)
@@ -33,7 +39,7 @@ $NetBSD: patch-aa,v 1.3 2001/10/07 22:17:20 tron Exp $
    else proxyurl=NULL;
    
    if(timesyncurl!=NULL) delete(timesyncurl);
-@@ -2564,7 +2565,7 @@
+@@ -2564,7 +2568,7 @@
        }
  
        if(!strcasecmp(which,"snipedelay")) {
@@ -42,27 +48,27 @@ $NetBSD: patch-aa,v 1.3 2001/10/07 22:17:20 tron Exp $
  	recognized=1;
        }
  
-@@ -2575,12 +2576,17 @@
+@@ -2575,12 +2579,17 @@
        }
        
        if(!strcasecmp(which,"browser")) {
 -	fscanf(file,"%199[^\n]",browserPATH);
-+	fscanf(file," %199[^\n]",browserPATH);
++	fscanf(file,"%199s[^\n]",browserPATH);
 +	recognized=1;
 +      }
 +
 +      if(!strcasecmp(which,"email")) {
-+	fscanf(file," %199[^\n]",emailPATH);
++	fscanf(file,"%199s[^\n]",emailPATH);
  	recognized=1;
        }
  
        if(!strcasecmp(which,"proxy")) {
 -	fscanf(file,"%199[^\n]",proxystring);
-+	fscanf(file," %199[^\n]",proxystring);
++	fscanf(file,"%199s[^\n]",proxystring);
  	recognized=1;
  	if(strspn(proxystring," ")==strlen(proxystring)) proxystring[0]='\0';
        }
-@@ -2618,7 +2624,7 @@
+@@ -2618,7 +2627,7 @@
    fclose(file);
    if(proxyurl!=NULL) delete(proxyurl);
    if(strlen(proxystring)>2)