Fix saving and loading of the configuration file and make the proxy support

work

2 files changed, 75 insertions, 1 deletions

diff --git a/misc/bidwatcher/distinfo b/misc/bidwatcher/distinfo
index 8f8f7b9ca23..73ba1fda1f0 100644
--- a/misc/bidwatcher/distinfo
+++ b/misc/bidwatcher/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/10/07 08:29:43 tron Exp $
+$NetBSD: distinfo,v 1.3 2001/10/07 22:17:20 tron Exp $
 
 SHA1 (bidwatcher-1.3.0.tar.gz) = 2fc2d17d65aab43fd0b716cce3588207aebb8a68
 Size (bidwatcher-1.3.0.tar.gz) = 97828 bytes
+SHA1 (patch-aa) = 5201218785610e52e747c760288edf46df9a9ca5
diff --git a/misc/bidwatcher/patches/patch-aa b/misc/bidwatcher/patches/patch-aa
new file mode 100644
index 00000000000..75850287407
--- /dev/null
+++ b/misc/bidwatcher/patches/patch-aa
@@ -0,0 +1,73 @@
+$NetBSD: patch-aa,v 1.3 2001/10/07 22:17:20 tron Exp $
+
+--- bidwatcher.cpp.orig	Thu Jul  5 02:31:54 2001
++++ bidwatcher.cpp	Mon Oct  8 00:10:20 2001
+@@ -639,7 +639,7 @@
+ 
+   if(proxyurl!=NULL) delete(proxyurl);
+   if(strlen(proxystring)>2)
+-    proxyurl=new URL(g_strdup_printf("http://%s",proxystring),NULL);
++    proxyurl=new URL(g_strdup_printf("http://%s/",proxystring),NULL);
+   else proxyurl=NULL;
+   
+   if(timesyncurl!=NULL) delete(timesyncurl);
+@@ -1712,10 +1712,11 @@
+   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");
+-  fprintf(file,"option snipedelay %.2f\n", snipeDelay);
++  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);
+   for ( int i=0; i < aucIdx; i++ )
+     {
+@@ -2508,7 +2509,7 @@
+ 
+   if(proxyurl!=NULL) delete(proxyurl);
+   if(strlen(proxystring)>2)
+-    proxyurl=new URL(g_strdup_printf("http://%s",proxystring),NULL);
++    proxyurl=new URL(g_strdup_printf("http://%s/",proxystring),NULL);
+   else proxyurl=NULL;
+   
+   if(timesyncurl!=NULL) delete(timesyncurl);
+@@ -2564,7 +2565,7 @@
+       }
+ 
+       if(!strcasecmp(which,"snipedelay")) {
+-	fscanf(file,"%.2f",&snipeDelay);
++	fscanf(file,"%d",&snipeDelay);
+ 	recognized=1;
+       }
+ 
+@@ -2575,12 +2576,17 @@
+       }
+       
+       if(!strcasecmp(which,"browser")) {
+-	fscanf(file,"%199[^\n]",browserPATH);
++	fscanf(file," %199[^\n]",browserPATH);
++	recognized=1;
++      }
++
++      if(!strcasecmp(which,"email")) {
++	fscanf(file," %199[^\n]",emailPATH);
+ 	recognized=1;
+       }
+ 
+       if(!strcasecmp(which,"proxy")) {
+-	fscanf(file,"%199[^\n]",proxystring);
++	fscanf(file," %199[^\n]",proxystring);
+ 	recognized=1;
+ 	if(strspn(proxystring," ")==strlen(proxystring)) proxystring[0]='\0';
+       }
+@@ -2618,7 +2624,7 @@
+   fclose(file);
+   if(proxyurl!=NULL) delete(proxyurl);
+   if(strlen(proxystring)>2)
+-    proxyurl=new URL(g_strdup_printf("http://%s",proxystring),NULL);
++    proxyurl=new URL(g_strdup_printf("http://%s/",proxystring),NULL);
+   else proxyurl=NULL;
+   
+   if(timesyncurl!=NULL) delete(timesyncurl);