From: "Christian T. Steigies" <cts@debian.org>
Date: Sun, 23 Oct 2011 22:32:42 +0200
Subject: shared_scorefile

---
 Makefile.am   |    1 +
 circuslinux.c |  165 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 configure.in  |    9 +++
 3 files changed, 156 insertions(+), 19 deletions(-)

Index: circuslinux-1.0.3/Makefile.am
===================================================================
--- circuslinux-1.0.3.orig/Makefile.am
+++ circuslinux-1.0.3/Makefile.am
@@ -18,6 +18,7 @@ VERSION = @VERSION@
 CC=@CC@
 DATA_PREFIX=$(pkgdatadir)/data/
 JOY=@JOY@
+SHARED_SCOREFILE=@SHARED_SCOREFILE@
 TARGET_DEF=@TARGET_DEF@
 
 
Index: circuslinux-1.0.3/circuslinux.c
===================================================================
--- circuslinux-1.0.3.orig/circuslinux.c
+++ circuslinux-1.0.3/circuslinux.c
@@ -15,6 +15,11 @@
   December 11, 1999 - April 28, 2001
 */
 
+#ifndef SHARED_SCOREFILE_YES
+#ifndef SHARED_SCOREFILE_NO
+#error something went wrong in configure, either SHARED_SCOREFILE_YES or SHARED_SCOREFILE_NO must be defined. Please tell cts@debian.org how you did this.
+#endif
+#endif
 
 /* Constraints: */
 
@@ -430,6 +435,9 @@ void drawtext(int x, int y, char * str);
 void drawfuzz(int x, int y, int w, int h);
 void seticon(void);
 void usage(int ret);
+#ifdef SHARED_SCOREFILE_YES
+FILE * open_score_file(char * mode);
+#endif
 FILE * open_option_file(char * mode);
 void addscore(int player, int inc);
 int highscorescreen(void);
@@ -579,7 +587,37 @@ int main(int argc, char * argv[])
       strcpy(highscorer[i], "TUX");
     }
   
+
+#ifdef SHARED_SCOREFILE_YES
+  fi = open_score_file("r");
   
+  if (fi != NULL) {
+    do {
+      fgets(temp, sizeof(temp), fi);
+
+      if (!feof(fi)) {
+	temp[strlen(temp) - 1] = '\0';
+
+	/* Parse each line: */
+
+	if (strstr(temp, "highscore") == temp &&
+	    temp[9] >= '0' && temp[9] <= '7' &&
+	    temp[10] == '=') {
+	  highscore[temp[9] - '0'] = atoi(temp + 11);
+	} else if (strstr(temp, "highscorer") == temp &&
+		   temp[10] >= '0' && temp[10] <= '7' &&
+		   temp[11] == '=') {
+	  highscorer[temp[10] - '0'][0] = temp[12];
+	  highscorer[temp[10] - '0'][1] = temp[13];
+	  highscorer[temp[10] - '0'][2] = temp[14];
+	}
+      }
+    } while (!feof(fi));
+
+    fclose(fi);
+  }
+#endif /* SHARED_SCOREFILE_YES */
+
   /* Load options: */
   
   fi = open_option_file("r");
@@ -597,7 +635,20 @@ int main(int argc, char * argv[])
 	      
 	      /* Parse each line: */
 	      
-	      if (strstr(temp, "highscore") == temp &&
+	      if (strstr(temp, "effects=") == temp)
+		{
+		  sfx_vol = atoi(temp + 8);
+		  if (sfx_vol > 3 || sfx_vol < 0)
+		    sfx_vol = 3;
+		}
+	      else if (strstr(temp, "music=") == temp)
+		{
+		  music_vol = atoi(temp + 6);
+		  if (music_vol > 3 || music_vol < 0)
+		    music_vol = 3;
+		}
+#ifdef SHARED_SCOREFILE_NO
+	      else if (strstr(temp, "highscore") == temp &&
 		  temp[9] >= '0' && temp[9] <= '7' &&
 		  temp[10] == '=')
 		{
@@ -611,18 +662,7 @@ int main(int argc, char * argv[])
 		  highscorer[temp[10] - '0'][1] = temp[13];
 		  highscorer[temp[10] - '0'][2] = temp[14];
 		}
-	      else if (strstr(temp, "effects=") == temp)
-		{
-		  sfx_vol = atoi(temp + 8);
-		  if (sfx_vol > 3 || sfx_vol < 0)
-		    sfx_vol = 3;
-		}
-	      else if (strstr(temp, "music=") == temp)
-		{
-		  music_vol = atoi(temp + 6);
-		  if (music_vol > 3 || music_vol < 0)
-		    music_vol = 3;
-		}
+#endif /* SHARED_SCOREFILE_NO */
 	    }
 	}
       while (!feof(fi));
@@ -667,8 +707,36 @@ int main(int argc, char * argv[])
   while (!done);
   
   
+  /* Save scores: */
+
+#ifdef SHARED_SCOREFILE_YES
+  fi = open_score_file("w");
+  if (fi != NULL) {
+    /* Comment at the top (I wish _everyone_ did this!) */
+
+    fprintf(fi, "# Circus Linux! score file\n\n");
+
+    /* High scores: */
+
+    fprintf(fi, "# Highscores:\n\n");
+
+    for (i = 0; i < 8; i++) {
+      fprintf(fi, "highscore%d=%d\n", i, highscore[i]);
+      fprintf(fi, "highscorer%d=%s\n\n", i, highscorer[i]);
+    }
+
+    fprintf(fi, "\n");
+
+    /* The end! */
+
+    fprintf(fi, "# (File automatically created.)\n");
+
+    fclose(fi);
+  }
+#endif /* SHARED_SCOREFILE_YES */
+
   /* Save options: */
-  
+
   fi = open_option_file("w");
   if (fi != NULL)
     {
@@ -677,6 +745,7 @@ int main(int argc, char * argv[])
       fprintf(fi, "# Circus Linux! options file\n\n");
       
       
+#ifdef SHARED_SCOREFILE_NO
       /* High scores: */
       
       fprintf(fi, "# Highscores:\n\n");
@@ -686,9 +755,9 @@ int main(int argc, char * argv[])
 	  fprintf(fi, "highscore%d=%d\n", i, highscore[i]);
 	  fprintf(fi, "highscorer%d=%s\n\n", i, highscorer[i]);
 	}
-      
+
       fprintf(fi, "\n");
-      
+#endif /* SHARED_SCOREFILE_NO */
       
       /* Volume settings: */
       
@@ -3424,6 +3493,33 @@ void usage(int ret)
 }
 
 
+#ifdef SHARED_SCOREFILE_YES
+FILE * open_score_file(char * mode)
+{
+  FILE * fi;
+
+  /* Try opening the file: */
+
+  fi = fopen("/var/games/circuslinux/scorefile", mode);
+
+  if (fi == NULL)
+    {
+      fprintf(stderr, "\nWarning: I could not open the score file ");
+
+      if (strcmp(mode, "r") == 0)
+        fprintf(stderr, "for read:");
+      else if (strcmp(mode, "w") == 0)
+        fprintf(stderr, "for write:");
+
+     fprintf(stderr, "\n%s\n"
+              "The error that occured was:\n"
+              "%s\n\n","/var/games/circuslinux/scorefile" , strerror(errno));
+    }
+
+  return(fi);
+}
+#endif
+
 /* Open the option file: */
 
 FILE * open_option_file(char * mode)
@@ -3444,25 +3540,53 @@ FILE * open_option_file(char * mode)
   else
     home = ".";
   
-  
   /* Create the buffer for the filename: */
   
+#ifdef SHARED_SCOREFILE_YES
+/* do not touch the old scorefile, options go in the (new) rc file instead */
+  filename = (char *) malloc(sizeof(char) * (strlen(home) +
+                                             strlen("/.circuslinuxrc") + 1));
+
+  strcpy(filename, home);
+  strcat(filename, "/.circuslinuxrc");
+#else
   filename = (char *) malloc(sizeof(char) * (strlen(home) +
                                              strlen("/.circuslinux") + 1));
-  
+
   strcpy(filename, home);
   strcat(filename, "/.circuslinux");
+#endif
 #else
   filename = "circuslinux.dat";
 #endif
   
   
   /* Try opening the file: */
-  
   fi = fopen(filename, mode);
   
   if (fi == NULL)
     {
+#ifdef SHARED_SCOREFILE_YES
+      if (strcmp(mode, "r") == 0)
+	{ /* try to read old options file when the new one is not found*/
+          strcpy(filename, home);
+          strcat(filename, "/.circuslinux\0\0");
+          fprintf(stderr, "Trying old options file instead: %s...\n", filename);
+          fi = fopen(filename, mode);
+
+          if (fi != NULL)
+            {
+              fprintf(stderr, "Found %s.\n", filename);
+              fprintf(stderr, "Your config will be stored in %src upon exit.\n", filename);
+              fprintf(stderr,
+"Once your sysadmin has merged all scorefiles on this system (or you can do\n"
+"without your old circuslinux highscores) you can safely delete you old config\n"
+"and scorefile :\n %s",  filename);
+	      return (fi);
+            }
+        }
+#endif /* SHARED_SCOREFILE_YES */
+      
       fprintf(stderr, "\nWarning: I could not open the options file "); 
       
       if (strcmp(mode, "r") == 0)
@@ -3474,7 +3598,7 @@ FILE * open_option_file(char * mode)
               "The error that occured was:\n"
               "%s\n\n", filename, strerror(errno));
     }
-  
+
   return(fi);
 }
 
Index: circuslinux-1.0.3/configure.in
===================================================================
--- circuslinux-1.0.3.orig/configure.in
+++ circuslinux-1.0.3/configure.in
@@ -69,7 +69,16 @@ AC_ARG_ENABLE(joystick,
               JOY=YES)
 
 AC_SUBST(JOY)
+
 	
+dnl shared scorefile
+SHARED_SCOREFILE=NO
+AC_ARG_ENABLE(scorefile,
+              [  --enable-scorefile      Use shared scorefile [default=no]],
+              SHARED_SCOREFILE=YES)
+
+AC_SUBST(SHARED_SCOREFILE)
+
 
 dnl Target
 case "$target_os" in