Changes in tests/copyfile.cfa [3f654ec:29d618e]

File:

• tests/copyfile.cfa (modified) (1 diff)

tests/copyfile.cfa

@@ -8 +8 @@
 // 
 // Author           : Peter A. Buhr
-// Created On       : Tue Jul 16 16:47:22 2019
+// Created On       : Fri Jun 19 13:44:05 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 17 18:04:44 2019
-// Update Count     : 26
+// Last Modified On : Sat Aug 15 15:00:48 2020
+// Update Count     : 6
 // 
 
 #include <fstream.hfa>
-#include <stdlib.hfa>                                                                   // new/delete
+#include <exception.hfa>
 
 int main( int argc, char * argv[] ) {
-        ifstream * in  = &stdin;                                                        // default files
-        ofstream * out = &stdout;
+        ifstream in  = stdin;                                                           // copy default files
+        ofstream out = stdout;
+
         try {
-                choose ( argc ) {
+                choose ( argc ) {                                                               // terminate if command-line errors
                   case 2, 3:
-                          in = new( (const char *)argv[1] );            // open input file first as output creates file
-                          if ( argc == 3 ) out = new( (const char *)argv[2] ); // only open output if input opens as output created if nonexistent
-                  case 1: ;                                     // use default files
-                  default:
-                          exit | "Usage [ input-file (default stdin) [ output-file (default stdout) ] ]";
+                        open( in, argv[1] );                                            // open input file first as output creates file
+                        if ( argc == 3 ) open( out, argv[2] );          // do not create output unless input opens
+                  case 1: ;                                                                             // use default files
+                  default:                                                                              // wrong number of options
+                        exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]";
                 } // choose
+        } catch( Open_Failure * ex ; ex->istream == &in ) {
+                exit | "Unable to open input file" | argv[1];
+        } catch( Open_Failure * ex ; ex->ostream == &out ) {
+                close( in );                                                                    // optional
+                exit | "Unable to open output file" | argv[2];
+        } // try
 
-                char ch;
-                *out | nlOff;                                                                   // turn off auto newline
-                *in  | nlOn;                                                                    // turn on reading newline
+        out | nlOff;                                                                            // turn off auto newline
+        in  | nlOn;                                                                                     // turn on reading newline
 
-                for () {                                                                                // read all characters
-                        *in | ch;
-                  if ( eof( *in ) ) break;                                              // eof ?
-                        *out | ch;
-                } // for
-        } finally {
-                if ( in  != &stdin  ) delete( in );                             // close file, do not delete stdin!
-                if ( out != &stdout ) delete( out );                    // close file, do not delete stdout!
-        } // try
+        char ch;
+        for () {                                                                                        // read all characters
+                in | ch;
+          if ( eof( in ) ) break;                                                       // eof ?
+                out | ch;
+        } // for
 } // main