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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/11/27 09:03:18

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

Log message:
        * extensions/fileio/fileio.{cpp,h}: implement feof()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4976&r2=1.4977
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/fileio.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/fileio.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4976
retrieving revision 1.4977
diff -u -b -r1.4976 -r1.4977
--- ChangeLog   27 Nov 2007 08:45:33 -0000      1.4976
+++ ChangeLog   27 Nov 2007 09:03:17 -0000      1.4977
@@ -1,3 +1,7 @@
+2007-11-27 Udo Giacomozzi <address@hidden>
+
+       * extensions/fileio/fileio.{cpp,h}: implement feof()
+
 2007-11-27 Benjamin Wolsey <address@hidden>
 
        * server/asobj/NetStreamFfmpeg.{cpp,h}: mainly visual code cleanup. 
Also make

Index: extensions/fileio/fileio.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/extensions/fileio/fileio.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- extensions/fileio/fileio.cpp        20 Nov 2007 20:59:26 -0000      1.17
+++ extensions/fileio/fileio.cpp        27 Nov 2007 09:03:18 -0000      1.18
@@ -57,6 +57,7 @@
 as_value fileio_putchar(const fn_call& fn);
 as_value fileio_fflush(const fn_call& fn);
 as_value fileio_ftell(const fn_call& fn);
+as_value fileio_feof(const fn_call& fn);
 as_value fileio_fseek(const fn_call& fn);
 as_value fileio_unlink(const fn_call& fn);
 
@@ -91,6 +92,7 @@
     obj.init_member("fflush", new builtin_function(fileio_fflush));
     obj.init_member("fseek", new builtin_function(fileio_fseek));
     obj.init_member("ftell", new builtin_function(fileio_ftell));
+    obj.init_member("feof", new builtin_function(fileio_feof));
     obj.init_member("fclose", new builtin_function(fileio_fclose));
     
     obj.init_member("unlink", new builtin_function(fileio_unlink));
@@ -192,6 +194,16 @@
 }
 
 bool
+Fileio::feof()
+{
+//    GNASH_REPORT_FUNCTION;
+    if (_stream) {
+        return ::feof(_stream);
+    }
+    return -1;
+}
+
+bool
 Fileio::fopen(const string &filespec, const string &mode)
 {
 //    GNASH_REPORT_FUNCTION;
@@ -501,6 +513,16 @@
 }
 
 as_value
+fileio_feof(const fn_call& fn)
+{
+//    GNASH_REPORT_FUNCTION;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
+    assert(ptr);
+    bool b = ptr->feof();
+    return as_value(b);
+}
+
+as_value
 fileio_unlink(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;

Index: extensions/fileio/fileio.h
===================================================================
RCS file: /cvsroot/gnash/gnash/extensions/fileio/fileio.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- extensions/fileio/fileio.h  1 Jul 2007 10:53:58 -0000       1.7
+++ extensions/fileio/fileio.h  27 Nov 2007 09:03:18 -0000      1.8
@@ -52,6 +52,7 @@
     int fseek(long offset);
     int fseek(long offset, int whence);
     long ftell();
+    bool feof();
     bool unlink(const std::string &filespec);
     void scandir(const std::string& dir, as_value* result);
 private: