fbuf: New data structure for buffered file I/O.

[pspp] / src / output / msglog.c

diff --git a/src/output/msglog.c b/src/output/msglog.c
index d5c68069a6f9cbe1aec0d80bc5cb3c1b6694fc46..dbbff3ee103668714abc880958d47c6142d33bf7 100644 (file)
--- a/src/output/msglog.c
+++ b/src/output/msglog.c
@@ -24,12 +24,13 @@
 #include <unistd.h>
 
 #include "data/file-name.h"
+#include "data/file-handle-def.h"
 #include "data/settings.h"
 #include "libpspp/cast.h"
+#include "libpspp/message.h"
 #include "output/driver-provider.h"
 #include "output/message-item.h"
 
-#include "gl/error.h"
 #include "gl/fwriteerror.h"
 #include "gl/xalloc.h"
 
@@ -40,7 +41,7 @@ struct msglog_driver
   {
     struct output_driver driver;
     FILE *file;
-    char *file_name;
+    struct file_handle *handle;
     char *command_name;
   };
 
@@ -60,10 +61,12 @@ msglog_create (const char *file_name)
   struct msglog_driver *ml;
   FILE *file;
 
-  file = fn_open (file_name, "w");
+  struct file_handle *handle = fh_create_file  (NULL, file_name, NULL, fh_default_properties ());
+
+  file = fn_fopen (handle, "w");
   if (file == NULL)
     {
-      error (0, errno, _("%s: open failed"), file_name);
+      msg_error (errno, _("error opening output file `%s'"), file_name);
       return NULL;
     }
 
@@ -72,9 +75,9 @@ msglog_create (const char *file_name)
           : SETTINGS_DEVICE_UNFILTERED);
 
   ml = xzalloc (sizeof *ml);
+  ml->handle = handle;
   output_driver_init (&ml->driver, &msglog_class, file_name, type);
   ml->file = file;
-  ml->file_name = xstrdup (file_name);
   ml->command_name = NULL;
 
   output_driver_register (&ml->driver);
@@ -87,9 +90,9 @@ msglog_destroy (struct output_driver *driver)
 {
   struct msglog_driver *ml = msglog_driver_cast (driver);
 
-  fn_close (ml->file_name, ml->file);
-  free (ml->file_name);
+  fn_close (ml->handle, ml->file);
   free (ml->command_name);
+  fh_unref (ml->handle);
   free (ml);
 }