Catch errors creating icon pixbufs and report them with g_warning.

[pspp] / src / data / file-name.c

diff --git a/src/data/file-name.c b/src/data/file-name.c
index 23d7ee0889f2c75460e8d479eb177b7acc2f75d9..f3b168176c0c63918d741ac9637fb9e81e8f6657 100644 (file)
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -252,7 +252,7 @@ safety_violation (const char *fn)
 FILE *
 fn_open (const char *fn, const char *mode)
 {
-  assert (mode[0] == 'r' || mode[0] == 'w');
+  assert (mode[0] == 'r' || mode[0] == 'w' || mode[0] == 'a');
 
   if (mode[0] == 'r' && (!strcmp (fn, "stdin") || !strcmp (fn, "-")))
     return stdin;
@@ -267,7 +267,7 @@ fn_open (const char *fn, const char *mode)
       if (get_safer_mode ())
        return safety_violation (fn);
 
-      return popen (&fn[1], mode);
+      return popen (&fn[1], mode[0] == 'r' ? "r" : "w");
     }
   else if (*fn && fn[strlen (fn) - 1] == '|')
     {
@@ -281,7 +281,7 @@ fn_open (const char *fn, const char *mode)
       memcpy (s, fn, strlen (fn) - 1);
       s[strlen (fn) - 1] = 0;
 
-      f = popen (s, mode);
+      f = popen (s, mode[0] == 'r' ? "r" : "w");
 
       local_free (s);