[Gnash-commit] gnash ChangeLog extensions/fileio/fileio.cpp

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/03/08 17:47:54

Modified files:
        .              : ChangeLog 
        extensions/fileio: fileio.cpp 

Log message:
        fixed fread()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2580&r2=1.2581
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/fileio.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2580
retrieving revision 1.2581
diff -u -b -r1.2580 -r1.2581
--- ChangeLog   8 Mar 2007 14:51:35 -0000       1.2580
+++ ChangeLog   8 Mar 2007 17:47:53 -0000       1.2581
@@ -1,3 +1,7 @@
+2007-03-07 Udo Giacomozzi <address@hidden>
+
+       * extensions/fileio/fileio.cpp: Fixed fread() 
+
 2007-03-07 Sandro Santilli <address@hidden>
 
        * server/as_object.h: new protected clearProperties() method.

Index: extensions/fileio/fileio.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/extensions/fileio/fileio.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- extensions/fileio/fileio.cpp        7 Mar 2007 13:01:01 -0000       1.6
+++ extensions/fileio/fileio.cpp        8 Mar 2007 17:47:54 -0000       1.7
@@ -47,7 +47,6 @@
 void fileio_fgetc(const fn_call& fn);
 void fileio_fgets(const fn_call& fn);
 void fileio_gets(const fn_call& fn);
-void fileio_fread(const fn_call& fn);
 void fileio_fwrite(const fn_call& fn);
 void fileio_fputc(const fn_call& fn);
 void fileio_fputs(const fn_call& fn);
@@ -202,7 +201,7 @@
     if (_stream) {
         char buf[BUFSIZE];
         memset(buf, 0, BUFSIZE);    
-        ret = ::fread(buf, BUFSIZE, 1, _stream);
+        ret = ::fread(buf, 1, BUFSIZE, _stream);
         if (ret) {
             str = buf;
         }
@@ -344,6 +343,14 @@
 //    GNASH_REPORT_FUNCTION;
     Fileio *ptr = (Fileio*)fn.this_ptr;
     assert(ptr);    
+               
+               string str;
+               int count = ptr->fread(str);
+
+               if (count<0)
+                       fn.result->set_bool(false);
+               else
+                       fn.result->set_string(str.c_str());    
 }
 
 void