Changes in src/libcfa/fstream.c [6ba0659:d3b7937]

File:

• src/libcfa/fstream.c (modified) (2 diffs)

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 17 14:03:05 2016
-// Update Count     : 76
+// Last Modified On : Tue Jan 26 17:12:59 2016
+// Update Count     : 6
 //
 
@@ -23 +23 @@
 struct ofstream {
         FILE *file;
+        int fail;
 };
 
-#define IO_MSG "I/O error "
-
-int fail( ofstream * os ) {
-        return ferror( os->file );
-} // fail
-
-int flush( ofstream * os ) {
-        return fflush( os->file );
-} // flush
-
-void open( ofstream ** os, const char * name, const char * mode ) {
-        FILE *t = fopen( name, mode );
-        if ( t == 0 ) {                                                                         // do not change unless successful
-                perror( IO_MSG "open output" );
-                exit( EXIT_FAILURE );
-        } // if
-        (*os)->file = t;
-} // open
-
-void close( ofstream * os ) {
-        if ( os->file == stdout || os->file == stderr ) return;
-
-        if ( fclose( os->file ) == EOF ) {
-                perror( IO_MSG "close output" );
-        } // if 
-} // close
-
-ofstream * write( ofstream * os, const char * data, streamsize_type size ) {
-        if ( fail( os ) ) {
-                fprintf( stderr, "attempt write I/O on failed stream\n" );
-                exit( EXIT_FAILURE );
-        } // if
-
-        if ( fwrite( data, 1, size, os->file ) != size ) {
-                perror( IO_MSG "write" );
-                exit( EXIT_FAILURE );
+ofstream *write( ofstream *os, const char *data, streamsize_type size ) {
+        if ( ! os->fail ) {
+                fwrite( data, size, 1, os->file );
+                os->fail = ferror( os->file );
         } // if
         return os;
 } // write
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
-ofstream *sout = &soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
-ofstream *serr = &serrFile;
+int fail( ofstream *os ) {
+        return os->fail;
+} // fail
 
-//---------------------------------------
+static ofstream *make_ofstream() {
+        ofstream *new_stream = malloc( sizeof( ofstream ) );
+        new_stream->fail = 0;
+        return new_stream;
+} // make_ofstream
+
+ofstream *ofstream_stdout() {
+        ofstream *stdout_stream = make_ofstream();
+        stdout_stream->file = stdout;
+        return stdout_stream;
+} // ofstream_stdout
+
+ofstream *ofstream_stderr() {
+        ofstream *stderr_stream = make_ofstream();
+        stderr_stream->file = stderr;
+        return stderr_stream;
+} // ofstream_stderr
+
+ofstream *ofstream_fromfile( const char *name ) {
+        ofstream *file_stream = make_ofstream();
+        file_stream->file = fopen( name, "w" );
+        file_stream->fail = file_stream->file == 0;
+        return file_stream;
+}
+
+void ofstream_close( ofstream *os ) {
+        if ( os->file != stdout && os->file != stderr ) {
+                os->fail = fclose( os->file );
+        }
+        free( os );
+}
 
 struct ifstream {
         FILE *file;
+        int fail;
+        int eof;
 };
 
-int fail( ifstream * is ) {
-        return ferror( is->file );
-} // fail
+ifstream *read( ifstream *is, char *data, streamsize_type size ) {
+        if ( ! is->fail && ! is->eof ) {
+                fread( data, size, 1, is->file );
+                is->fail = ferror( is->file );
+                is->eof = feof( is->file );
+        }
+        return is;
+}
+  
+ifstream *unread( ifstream *is, char c ) {
+        if ( ! is->fail ) {
+                if ( ! EOF == ungetc( c, is->file ) ) {
+                        is->fail = 1;
+                }
+        }
+        return is;
+}
 
-int eof( ifstream * is ) {
-        return feof( is->file );
-} // eof
+int fail( ifstream *is ) {
+        return is->fail;
+}
 
-ifstream * get( ifstream * is, int * data ) {
-        if ( fscanf( is->file, "%d", data ) == EOF ) {
-                if ( ferror( is->file ) ) {
-                        fprintf( stderr, "invalid int read\n" );
-                        exit( EXIT_FAILURE );
-                } // if
-        } // if
-        return is;
-} // read
+int eof( ifstream *is ) {
+        return is->eof;
+}
 
-ifstream * read( ifstream * is, char * data, streamsize_type size ) {
-        if ( fail( is ) ) {
-                fprintf( stderr, "attempt read I/O on failed stream\n" );
-                exit( EXIT_FAILURE );
-        } // if
+static ifstream *make_ifstream() {
+        ifstream *new_stream = malloc( sizeof( ifstream ) );
+        new_stream->fail = 0;
+        new_stream->eof = 0;
+        return new_stream;
+}
 
-        if ( fread( data, size, 1, is->file ) == 0 ) {
-                perror( IO_MSG "read" );
-                exit( EXIT_FAILURE );
-        } // if
-        return is;
-} // read
-  
-ifstream *ungetc( ifstream * is, char c ) {
-        if ( fail( is ) ) {
-                fprintf( stderr, "attempt ungetc I/O on failed stream\n" );
-                exit( EXIT_FAILURE );
-        } // if
+ifstream *ifstream_stdin() {
+        ifstream *stdin_stream = make_ifstream();
+        stdin_stream->file = stdin;
+        return stdin_stream;
+}
 
-        if ( ungetc( c, is->file ) == EOF ) {
-                perror( IO_MSG "ungetc" );
-                exit( EXIT_FAILURE );
-        } // if
-        return is;
-} // ungetc
-
-void open( ifstream ** is, const char * name, const char * mode ) {
-        FILE *t = fopen( name, mode );
-        if ( t == 0 ) {                                                                         // do not change unless successful
-                perror( IO_MSG "open input" );
-                exit( EXIT_FAILURE );
-        } // if
-        (*is)->file = t;
-} // open
-
-void close( ifstream * is ) {
-        if ( is->file == stdin ) return;
-
-        if ( fclose( is->file ) == EOF ) {
-                perror( IO_MSG "close input" );
-        } // if 
-} // close
-
-static ifstream sinFile = { (FILE *)(&_IO_2_1_stdin_) };
-ifstream *sin = &sinFile;
+ifstream *ifstream_fromfile( const char *name ) {
+        ifstream *file_stream = make_ifstream();
+        file_stream->file = fopen( name, "r" );
+        file_stream->fail = file_stream->file == 0;
+        return file_stream;
+}
 
 // Local Variables: //