r11810 - in packages/trunk/jugglemaster/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-02-21 05:26:53 +0000 (Mon, 21 Feb 2011)
New Revision: 11810

Added:
   packages/trunk/jugglemaster/debian/patches/jmlib_sscanf_locale.patch
Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/patches/series
Log:
Add a patch to fix locale issues when loading files (Closes: #528564)

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2011-02-21 05:16:25 UTC (rev 11809)
+++ packages/trunk/jugglemaster/debian/changelog	2011-02-21 05:26:53 UTC (rev 11810)
@@ -5,6 +5,7 @@
   * Switch to dh from debhelper 7 and dpkg-source v3
   * Add DEP-3 headers to the patches
   * Bump Standards-Version, no changes needed
+  * Add a patch to fix locale issues when loading files (Closes: #528564)
 
  -- Paul Wise <pabs at debian.org>  Sat, 19 Feb 2011 10:22:44 +0800
 

Added: packages/trunk/jugglemaster/debian/patches/jmlib_sscanf_locale.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/jmlib_sscanf_locale.patch	                        (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/jmlib_sscanf_locale.patch	2011-02-21 05:26:53 UTC (rev 11810)
@@ -0,0 +1,31 @@
+Author: Paul Wise <pabs at debian.org>
+Description: fix locale issues when parsing files
+--- a/src/jmlib/patterns.cpp
++++ b/src/jmlib/patterns.cpp
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
++#include <locale.h>
+ #include "./patterns.h"
+ 
+ 
+@@ -67,6 +68,8 @@
+ 		return(0);
+ 	}
+ 
++	char* locale = setlocale(LC_NUMERIC,"C");
++
+ 	while(!feof(input)) {
+ 		fgets(buf, 1023, input);
+ 		if(sscanf(buf, "#HR=%f",&currhr) == 1) {
+@@ -222,6 +225,9 @@
+ 			patt->next = NULL;
+ 		}
+ 	}
++
++	setlocale(LC_NUMERIC,locale);
++
+ 	return(1);
+ }
+ 

Modified: packages/trunk/jugglemaster/debian/patches/series
===================================================================
--- packages/trunk/jugglemaster/debian/patches/series	2011-02-21 05:16:25 UTC (rev 11809)
+++ packages/trunk/jugglemaster/debian/patches/series	2011-02-21 05:26:53 UTC (rev 11810)
@@ -2,3 +2,4 @@
 jmlib_sigfpe.patch
 semaphore_segfault.patch
 010_wx26_trans.patch
+jmlib_sscanf_locale.patch