Changeset librcc,53

Timestamp:

10/10/09 04:16:23 (1 month ago)

Author:

Suren A. Chilingaryan <csa@dside.dyndns.org>

branch-nick:

librcc

Message:

Support systems without lockf (OpenSolaris?), check GTK1 headers in configure.in, complain on missing macros in autogen.sh, patches by Ivan Borzenkov and Colin Watson for eglibc compatibility

Files:

• librcc/.bzrignore (modified) (1 diff)
• librcc/autogen.sh (modified) (5 diffs)
• librcc/configure.in (modified) (4 diffs)
• librcc/engines/Makefile.am (modified) (1 diff)
• librcc/src/rcclock.c (modified) (4 diffs)
• librcc/src/rccstring.h (modified) (1 diff)
• librcc/src/rccxml.c (modified) (4 diffs)

librcc/.bzrignore

@@ -33 +33 @@
-lt~obsolete.m4
-external/rccexternal
+stamp-h.in

librcc/autogen.sh

@@ -4 +4 @@
-
-KEYFILE=src/librcc.c
+
-
-# Some OS's have multiple versions (autoconf259, etc.) and don't have an 
@@ -12 +13 @@
-then
-    AUTOCONF=autoconf
-    AUTOMAKE=automake
-    ACLOCAL=aclocal
-    LIBTOOLIZE=libtoolize
-    AUTOHEADER=autoheader
@@ -19 +18 @@
-    FINDPATH=`echo ${PATH}|sed -e 's,:, ,g'` 
-    AUTOCONF=`find ${FINDPATH} -name "autoconf*"|sort -r|head -1`
-    AUTOMAKE=`find ${FINDPATH} -name "automake*"|sort -r|head -1`
-    ACLOCAL=`find ${FINDPATH} -name "aclocal*"|sort -r|head -1`
-    LIBTOOLIZE=`find ${FINDPATH} -name "libtoolize*"|sort -r|head -1`
-    AUTOHEADER=`find /usr/bin /usr/local/bin -name "autoheader*"|sort -r|head -1`
-    echo "$0: autoconf: using ${AUTOCONF}"
+    echo "$0: libtoolize: using ${LIBTOOLIZE}"
+    echo "$0: autoheader: using ${AUTOHEADER}"
+fi
+
+AUTOMAKE=`which automake`
+if test x"${AUTOMAKE}" != x -a -f "${AUTOMAKE}"
+then
+    AUTOMAKE=automake
+    ACLOCAL=aclocal
+else
+    FINDPATH=`echo ${PATH}|sed -e 's,:, ,g'` 
+    AUTOMAKE=`find ${FINDPATH} -name "automake*"|sort -r|head -1`
+    ACLOCAL=`find ${FINDPATH} -name "aclocal*"|sort -r|head -1`
-    echo "$0: automake: using ${AUTOMAKE}"
-    echo "$0: aclocal: using ${ACLOCAL}"
-    echo "$0: libtoolize: using ${LIBTOOLIZE}"
-    echo "$0: autoheader: using ${AUTOHEADER}"
-fi
-
@@ -46 +54 @@
-AUTOCONF_FLAGS=-Wno-obsolete
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    err=$?
-    echo "$PROG: exited by previous error(s), return code was $err" >&2
@@ -53 +82 @@
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# gettextize ${GETTEXTIZE_FLAGS}

librcc/configure.in

@@ -29 +29 @@
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-
+
-
-AC_PROG_CC
@@ -54 +54 @@
-AC_PATH_PROG(MV, mv, /bin/mv)
-AC_PATH_PROG(TAR, tar, /bin/tar)
+
+dnl Fixing ugly libtool, see for details
+dnl http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523750
+RM="$RM -f"
-
-dnl Checks for header files.
@@ -82 +86 @@
-dnl ***
-AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-AM_CONDITIONAL(HAVE_GTK, [ test $GTK_CONFIG != no ])
-if test $GTK_CONFIG = no; then
+    HAVE_GTK=no
+else
+    GTK1_LIBS="\`gtk-config --libs\`"
+    GTK1_INCLUDES="\`gtk-config --cflags\`"
+    
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS `gtk-config --cflags`"
+    AC_CHECK_HEADER([gtk/gtk.h], [HAVE_GTK=yes], [HAVE_GTK=no])
+    CFLAGS=$saved_CFLAGS
+fi
+
+AM_CONDITIONAL(HAVE_GTK, [ test $HAVE_GTK = yes ])
+
+if test $HAVE_GTK = no; then
-    GTK1_LIBS=""
-    GTK1_INCLUDES=""
-
-
-
-
-
-
+
+
-AC_SUBST(GTK1_LIBS)
-AC_SUBST(GTK1_INCLUDES)
@@ -362 +375 @@
-
-dnl Checks for library functions.
-
+ flock lockf
-
-AC_OUTPUT(src/Makefile engines/Makefile external/Makefile ui/Makefile examples/Makefile Makefile librcc.spec)

librcc/engines/Makefile.am

@@ -1 +1 @@
-lib_LTLIBRARIES = western_engine.la
-
-/
+
-
-if HAVE_RCD

librcc/src/rcclock.c

@@ -41 +41 @@
-# include <sys/stat.h>
-#endif /* HAVE_SYS_STAT_H */
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
-
-#include "rcchome.h"
@@ -71 +74 @@
-    if (lockfd >= 0) {
-        for (err = -1, i = 0; i < (LIBRCC_LOCK_WAIT/10); i++) {
+#if defined(HAVE_FLOCK)
-            err = flock(lockfd, LOCK_EX|LOCK_NB);
+#elif defined(HAVE_LOCKF)
+            err = lockf(lockfd, F_TLOCK, 1);
+#else
+# warning "No file locking mechanism is detected"
+            err = 0; // We must believe in best
+#endif
-            if ((err)&&(errno == EWOULDBLOCK)) nanosleep(&wait, NULL);
-            else break;
@@ -86 +96 @@
-                if (lockfd >= 0) {
-                    for (err = -1, i = 0; i < (LIBRCC_LOCK_WAIT/10); i++) {
+#if defined(HAVE_FLOCK)
-                        err = flock(lockfd, LOCK_EX|LOCK_NB);
+#elif defined(HAVE_LOCKF)
+                        err = lockf(lockfd, F_TLOCK, 1);
+#endif
-                        if ((err)&&(errno == EWOULDBLOCK)) nanosleep(&wait, NULL);
-                        else break;
@@ -122 +136 @@
-    sprintf(stmp,"%s/.rcc/locks/rcc.lock", rcc_home_dir);
-
+#if defined(HAVE_FLOCK)
-    flock(lockfd, LOCK_UN);
+#elif defined(HAVE_LOCKF)
+    lockf(lockfd, F_ULOCK, 1);
+#endif
+
-    close(lockfd);
-    lockfd = -1;

librcc/src/rccstring.h

@@ -39 +39 @@
-int rccStringChangeID(rcc_string string, rcc_language_id language_id);
-
-
-
-
-
-
+
-int rccStrnlen(const char *str, size_t size);
-
+!
-int rccIsASCII(const char *str);
-size_t rccStringSizedGetChars(const char *str, size_t size);

librcc/src/rccxml.c

@@ -341 +341 @@
-    fd = open(config, O_CREAT|O_RDWR,00644);
-    if (fd == -1) goto clear;
+
+#if defined(HAVE_FLOCK)
-    flock(fd, LOCK_EX);
+#elif defined(HAVE_LOCKF)
+    lockf(fd, F_LOCK, 1);
+#endif
-    
-    if ((!fstat(fd, &st))&&(st.st_size)) {
@@ -464 +469 @@
-            }
-            fsync(fd);
-
+
+
+
+
+
+
+
-            close(fd);
-        }
@@ -517 +528 @@
-
-    if (fd != -1) {
+#if defined(HAVE_FLOCK)
-        flock(fd, LOCK_EX);
+#elif defined(HAVE_LOCKF)
+        lockf(fd, F_LOCK, 1);
+#endif
+
-        if ((!fstat(fd, &st))&&(st.st_size)) {
-            doc = xmlReadFd(fd, name, NULL, 0);
-        } 
+
+#if defined(HAVE_FLOCK)
-        flock(fd, LOCK_UN);
+#elif defined(HAVE_LOCKF)
+        lockf(fd, F_ULOCK, 1);
+#endif
+
-        close(fd);
-    
@@ -534 +556 @@
-
-    if (sysfd != -1) {
+#if defined(HAVE_FLOCK)
-        flock(sysfd, LOCK_EX);
+#elif defined(HAVE_LOCKF)
+        lockf(sysfd, F_LOCK, 1);
+#endif
+
-        if ((!fstat(sysfd, &st))&&(st.st_size)) {
-            sysdoc = xmlReadFd(sysfd, name, NULL, 0);
-        } 
+
+#if defined(HAVE_FLOCK)
-        flock(sysfd, LOCK_UN);
+#elif defined(HAVE_LOCKF)
+        lockf(sysfd, F_ULOCK, 1);
+#endif
+
-        close(sysfd);
-