Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-core

2 files changed, 12 insertions, 3 deletions

diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index 205e03c95863..2b02a4d5a421 100755
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -41,6 +41,13 @@ LIBSALCPPRT=$(0)
 
 .INCLUDE .IGNORE : icuversion.mk
 
+.IF "$(OS)"=="MACOSX"
+
+dummy:
+    @echo "Pagein disabled for mac"
+
+.ELSE
+
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
@@ -185,3 +192,5 @@ $(MISC)$/$(TARGET)-common : makefile.mk
 # stoc bits
     @-echo $(DLLPRE)sfx$(DFTDLLPOST)             >> $@
     @-echo $(DLLPRE)sofficeapp$(DLLPOST)         >> $@
+
+.ENDIF
\ No newline at end of file
diff --git a/desktop/source/pagein/pagein.c b/desktop/source/pagein/pagein.c
index 23585eb026ca..3ba12f9437a2 100755
--- a/desktop/source/pagein/pagein.c
+++ b/desktop/source/pagein/pagein.c
@@ -44,7 +44,7 @@ static int do_pagein (const char * filename, size_t * size)
 
     if ((result = file_image_pagein (&image)) != 0)
     {
-        fprintf (stderr, "file_image_pagein: %s\n", strerror(result));
+        fprintf (stderr, "file_image_pagein %s: %s\n", filename, strerror(result));
         goto cleanup_and_leave;
     }
 
@@ -94,7 +94,7 @@ int pagein_execute (int argc, char **argv)
                 case 'L':
                     /* search path */
                     if (chdir (&(argv[i][2])) == -1)
-                        fprintf (stderr, "chdir: %s\n", strerror(errno));
+                        fprintf (stderr, "chdir %s: %s\n", &(argv[i][2]), strerror(errno));
                     break;
                 default:
                     /* ignored */
@@ -110,7 +110,7 @@ int pagein_execute (int argc, char **argv)
             char path[1024];
             if ((fp = fopen (&(argv[i][1]), "r")) == 0)
             {
-                fprintf (stderr, "fopen: %s\n", strerror(errno));
+                fprintf (stderr, "fopen %s: %s\n", &(argv[i][1]), strerror(errno));
                 continue;
             }
             while (fgets (path, sizeof(path), fp) != 0)