Enlightenment CVS committal
Author : davemds
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
engrave_out.c engrave_parse.c
Log Message:
Parse&output correctly also on locale that write floating point with ( , )
instead of ( . )
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- engrave_out.c 9 Nov 2007 09:15:19 -0000 1.47
+++ engrave_out.c 26 Nov 2007 03:06:57 -0000 1.48
@@ -1,6 +1,7 @@
#include <errno.h>
#include <unistd.h>
#include <stdio.h>
+#include <locale.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
@@ -191,6 +192,7 @@
engrave_edc_output(Engrave_File *engrave_file, const char *path)
{
FILE *out = NULL;
+ char locale[128];
if (!engrave_file) return 0;
@@ -201,6 +203,10 @@
return 0;
}
+ /* set locale posix compliant*/
+ strncpy(locale, setlocale(LC_NUMERIC, NULL), sizeof(locale));
+ setlocale(LC_NUMERIC, "C");
+
/* fonts */
engrave_out_start(out, "fonts");
engrave_file_font_foreach(engrave_file, _engrave_output_font, out);
@@ -237,6 +243,10 @@
engrave_out_end(out);
fclose(out);
+
+ /* reset locale to system default*/
+ setlocale(LC_NUMERIC, locale);
+
return 1;
}
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_parse.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- engrave_parse.c 21 Aug 2007 05:42:29 -0000 1.24
+++ engrave_parse.c 26 Nov 2007 03:06:57 -0000 1.25
@@ -1,4 +1,5 @@
#include "engrave_private.h"
+#include <locale.h>
#include <Engrave.h>
static Engrave_File *engrave_file = 0;
@@ -9,14 +10,22 @@
engrave_parse(const char *file, const char *imdir, const char *fontdir)
{
int ret;
+ char locale[128];
engrave_file = engrave_file_new();
engrave_file_image_dir_set(engrave_file, imdir);
engrave_file_font_dir_set(engrave_file, fontdir);
+ /* set locale posix compliant*/
+ strncpy(locale, setlocale(LC_NUMERIC, NULL), sizeof(locale));
+ setlocale(LC_NUMERIC, "C");
+
yyin = fopen(file, "r");
ret = yyparse();
fclose(yyin);
+ /* reset locale to system default*/
+ setlocale(LC_NUMERIC, locale);
+
if (ret == 0)
return (engrave_file);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs