Changeset 1549

Timestamp:

Apr 22, 2016, 10:40:43 PM (9 years ago)

Author:

dmik

Message:

fontconfig: Fix broken cache file replacing on OS/2.

This was a 2.11.95 regression.

Location:

fontconfig/trunk

Files:

• configure.ac (modified) (1 diff)
• src/fcatomic.c (modified) (2 diffs)
• src/fccache.c (modified) (5 diffs)

fontconfig/trunk/configure.ac ¶

@@ -114 +114 @@
 esac
 AM_CONDITIONAL(OS_OS2, test "$os_os2" = "yes")
+
+if test "$os_os2" = "yes"; then
+  # urpo is needed for renameForce.
+  AC_CHECK_LIB([urpo], [renameForce])
+fi
 
 AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])

fontconfig/trunk/src/fcatomic.c ¶

@@ -58 +58 @@
 #include <direct.h>
 #define mkdir(path,mode) _mkdir(path)
+#endif
+#ifdef __OS2__
+#include <urpo.h>
 #endif
 
@@ -198 +201 @@
     unlink ((const char *) atomic->file);
 #endif
+#if defined(__OS2__)
+    /*
+     * rename in urpo doesn't expect EACCES (which it may get due FcDirCacheLock
+     * called before initiating the cache update procedure), so force it.
+     */
+    if (renameForce ((char *) atomic->new, (char *) atomic->file) < 0)
+#else
     if (rename ((char *) atomic->new, (char *) atomic->file) < 0)
+#endif
         return FcFalse;
     return FcTrue;

fontconfig/trunk/src/fccache.c ¶

@@ -38 +38 @@
 #include <sys/locking.h>
 #endif
+#if defined(__OS2__)
+#include <share.h>
+#include <io.h>
+#endif
 
 #ifndef O_BINARY
@@ -1173 +1177 @@
         if (!cache_hashed)
             break;
+#if defined(__OS2__)
+        fd = sopen ((const char *)cache_hashed, O_RDWR, SH_DENYRW);
+#else
         fd = FcOpen ((const char *)cache_hashed, O_RDWR);
+#endif
         FcStrFree (cache_hashed);
         /* No caches in that directory. simply retry with another one */
         if (fd != -1)
         {
+#if !defined(__OS2__)
 #if defined(_WIN32)
             if (_locking (fd, _LK_LOCK, 1) == -1)
@@ -1192 +1201 @@
                 goto bail;
 #endif
+#endif
             break;
         }
     }
     return fd;
+#if !defined(__OS2__)
 bail:
     if (fd != -1)
         close (fd);
     return -1;
+#endif
 }
 
@@ -1207 +1219 @@
     if (fd != -1)
     {
+#if !defined(__OS2__)
 #if defined(_WIN32)
         _locking (fd, _LK_UNLCK, 1);
@@ -1218 +1231 @@
         fl.l_pid = getpid ();
         fcntl (fd, F_SETLK, &fl);
+#endif
 #endif
         close (fd);