[Mixmaster-devel] r802 - trunk/Mix/Src

[<we...@so...>]

Author: weasel
Date: 2004-05-04 15:28:11 +0200 (Tue, 04 May 2004)
New Revision: 802

Modified:
   trunk/Mix/Src/menustats.c
Log:
A few minor fixes to menustats by goblin

Modified: trunk/Mix/Src/menustats.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Mix/Src/menustats.c	2004-05-04 01:21:09 UTC (rev 801)
+++ trunk/Mix/Src/menustats.c	2004-05-04 13:28:11 UTC (rev 802)
@@ -17,9 +17,8 @@
 	clear();
 	standout();
 	GetPrivateProfileString(source,"base","",buffer,sizeof(buffer),allpinge=
rs);
-	if (buffer[0]=3D=3D'\0')
-		return FALSE;
-	printw("%s",buffer);
+	if (buffer[0]!=3D'\0')
+		printw("%s",buffer);
 	standend();
 =09
 	for (i =3D 0;i < NUMFILES;i++) {
@@ -29,7 +28,7 @@
 		mixfile(path, localfiles[i]);
 		mvprintw(i+3,0,"downloading %s...",localfiles[i]);
 		refresh();
-                if (URLDownloadToFile(NULL,buffer,path,BINDF_GETNEWESTVE=
RSION,NULL) !=3D S_OK) {
+		if (URLDownloadToFile(NULL,buffer,path,BINDF_GETNEWESTVERSION,NULL) !=3D=
 S_OK) {
 			printw("failed to download.\n\rTry using another stats source.");
 			ret =3D FALSE;
 			break;
@@ -44,23 +43,26 @@
 }
 /* Checks whether the stats source has all the required files */
 static BOOL good_source(char *source,char *allpingers) {
-	char buffer[1024];
+	char buffer[1024],*ptr;
 	int i;
 =09
-	for (i =3D 0;i < NUMFILES;i++)
-	{
-		GetPrivateProfileString(source,files[i],"",buffer,sizeof(buffer),allpi=
ngers);
-		if (buffer[0]=3D=3D'\0')
+	GetPrivateProfileString(source,NULL,"",buffer,sizeof(buffer),allpingers=
);
+=09
+	for (i =3D 0;i < NUMFILES;i++) {
+		ptr =3D buffer;
+		while (*ptr !=3D '\0') {
+			if (!strcmp(ptr,files[i]))
+				break;
+			ptr+=3Dstrlen(ptr)+1;
+		}
+		if (*ptr =3D=3D '\0')
 			return FALSE;
 	}
 =09
 	return TRUE;
 }
 /* Download allpingers.txt */
-static BOOL download_list(void) {
-	char path[PATHMAX];
-	mixfile(path,ALLPINGERS);
-=09
+static BOOL download_list(char *allpingers) {
 	clear();
 	standout();
 	printw(URL);
@@ -68,7 +70,7 @@
 =09
 	mvprintw(3,0,"downloading %s...", ALLPINGERS);
 	refresh();
-        if (URLDownloadToFile(NULL,URL,path,BINDF_GETNEWESTVERSION,NULL)=
 !=3D S_OK) {
+	if (URLDownloadToFile(NULL,URL,allpingers,BINDF_GETNEWESTVERSION,NULL) =
!=3D S_OK) {
 		printw("failed to download.\n\rTry again later.");
 		printw("\n\n\rPress any key to continue");
 		getch();
@@ -80,8 +82,8 @@
 void update_stats(void) {
 	char buffer[1024],*ptr,*stats[MAXREM];
 	int i=3D0,x,y,num=3D0;
-        char path[PATHMAX],c;
-        mixfile(path, ALLPINGERS);
+	char path[PATHMAX],c;
+	mixfile(path, ALLPINGERS);
 =09
 	while (1) {
 		x =3D 0;
@@ -122,7 +124,7 @@
 			}
 		}
 		else if (c =3D=3D '*') {
-			download_list();
+			download_list(path);
 		}
 		else break;
 	}