Update of /cvsroot/plib/plib/src/ssg
In directory sc8-pr-cvs1:/tmp/cvs-serv26595/ssg
Modified Files:
ssgLoadAC.cxx
Log Message:
Melchior Franz's patch to make the AC loader tolerant of DOS-style line endings.
Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ssgLoadAC.cxx 15 Sep 2002 01:29:11 -0000 1.30
+++ ssgLoadAC.cxx 4 Jul 2003 13:51:58 -0000 1.31
@@ -138,6 +138,7 @@
{
{ "MATERIAL", do_material },
{ "OBJECT" , do_object },
+ { NULL, NULL }
} ;
@@ -345,18 +346,16 @@
}
-static int do_data ( char *s )
+static int do_data ( char *s )
{
int len = strtol ( s, NULL, 0 ) ;
+ char buffer [ len + 3 ] ; /* data + \r + \n + \0 */
+ fgets ( buffer, len + 3, loader_fd ) ;
current_data = new char [ len + 1 ] ;
- for ( int i = 0 ; i < len ; i++ )
- current_data [ i ] = getc ( loader_fd ) ;
-
+ strncpy ( current_data, buffer, len ) ;
current_data [ len ] = '\0' ;
-
- getc ( loader_fd ) ; /* Final RETURN */
ssgBranch *br = current_options -> createBranch ( current_data ) ;
|
