X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fpostscript.c;h=3b655e29bddb45bd919de5498d0ea8cb1f214086;hb=5e89e0049bd55f22412f547d8d7bfefc69443e98;hp=53e81104f87851069ce7d3598876f786bf141001;hpb=8444d8d47de5e5f8d076b6f43f73c2c29494031e;p=pspp-builds.git

diff --git a/src/output/postscript.c b/src/output/postscript.c
index 53e81104..3b655e29 100644
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -31,12 +31,11 @@
 #include <libpspp/compiler.h>
 #include <libpspp/freaderror.h>
 #include <libpspp/hash.h>
-#include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/start-date.h>
 #include <libpspp/version.h>
 
-#include <data/filename.h>
+#include <data/file-name.h>
 
 #include "afm.h"
 #include "chart.h"
@@ -130,7 +129,7 @@ static void setup_font (struct outp_driver *this, struct font *, int index);
 /* Driver initialization. */
 
 static bool
-ps_open_driver (struct outp_driver *this, const char *options)
+ps_open_driver (struct outp_driver *this, const struct string *options)
 {
   struct ps_driver_ext *x;
   size_t i;
@@ -425,16 +424,16 @@ handle_option (struct outp_driver *this, const char *key,
 }
 
 /* Looks for a PostScript font file or config file in all the
-   appropriate places.  Returns the filename on success, NULL on
+   appropriate places.  Returns the file name on success, NULL on
    failure. */
 static char *
 find_ps_file (const char *name)
 {
-  if (fn_absolute_p (name))
+  if (fn_is_absolute (name))
     return xstrdup (name);
   else
     {
-      char *base_name = xasprintf ("psfonts%c%s", DIR_SEPARATOR, name);
+      char *base_name = xasprintf ("psfonts/%s", name);
       char *file_name = fn_search_path (base_name, config_path, NULL);
       free (base_name);
       return file_name;