X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fmsglog.c;h=20cfe3a3b2a74384b9073a64bf8ea3daf9881189;hb=3d188ce69f19490938b8e961f289a050f648f39d;hp=4042b460e7e9e2b701195240cc1341d41723621b;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp

diff --git a/src/output/msglog.c b/src/output/msglog.c
index 4042b460e7..20cfe3a3b2 100644
--- 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 "output/output-item.h"
 
-#include "gl/error.h"
 #include "gl/fwriteerror.h"
 #include "gl/xalloc.h"
 
@@ -40,8 +41,7 @@ struct msglog_driver
   {
     struct output_driver driver;
     FILE *file;
-    char *file_name;
-    char *command_name;
+    struct file_handle *handle;
   };
 
 static const struct output_driver_class msglog_class;
@@ -57,13 +57,14 @@ struct output_driver *
 msglog_create (const char *file_name)
 {
   enum settings_output_devices type;
-  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_open (handle, "w");
   if (file == NULL)
     {
-      error (0, errno, _("error opening output file `%s'"), file_name);
+      msg_error (errno, _("error opening output file `%s'"), file_name);
       return NULL;
     }
 
@@ -71,11 +72,10 @@ msglog_create (const char *file_name)
           ? SETTINGS_DEVICE_TERMINAL
           : SETTINGS_DEVICE_UNFILTERED);
 
-  ml = xzalloc (sizeof *ml);
+  struct msglog_driver *ml = XZALLOC (struct msglog_driver);
+  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 +87,8 @@ 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);
-  free (ml->command_name);
+  fn_close (ml->handle, ml->file);
+  fh_unref (ml->handle);
   free (ml);
 }
 
@@ -98,13 +97,9 @@ msglog_submit (struct output_driver *driver, const struct output_item *item)
 {
   struct msglog_driver *ml = msglog_driver_cast (driver);
 
-  output_driver_track_current_command (item, &ml->command_name);
-
-  if (is_message_item (item))
+  if (item->type == OUTPUT_ITEM_MESSAGE)
     {
-      const struct message_item *message_item = to_message_item (item);
-      const struct msg *msg = message_item_get_msg (message_item);
-      char *s = msg_to_string (msg, ml->command_name);
+      char *s = msg_to_string (item->message);
       fprintf (ml->file, "%s\n", s);
       free (s);
     }
@@ -112,8 +107,7 @@ msglog_submit (struct output_driver *driver, const struct output_item *item)
 
 static const struct output_driver_class msglog_class =
   {
-    "msglog",
-    msglog_destroy,
-    msglog_submit,
-    NULL
+    .name = "msglog",
+    .destroy = msglog_destroy,
+    .submit = msglog_submit,
   };