Merge patches for OpenBSD compatibility

diff --git a/common.mk b/common.mk
index 485038b4de1cfb2c42b660e8bea87082eb8b9636..2e167c9eea9a682d13a6874e7fb987552fb44027 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -46,6 +46,13 @@ CFLAGS += -idirafter /usr/pkg/include
 LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
 endif
 
+ifeq ($(UNAME),OpenBSD)
+CFLAGS += -ftrampolines
+CFLAGS += -I${X11BASE}/include
+LDFLAGS += -liconv
+LDFLAGS += -L${X11BASE}/lib
+endif
+
 ifeq ($(UNAME),FreeBSD)
 LDFLAGS += -liconv
 endif

diff --git a/include/util.h b/include/util.h
index 0b3357493f46ca71768516e7218d379b76dd6d65..ed85d5397483ee571bc55f64a25190110ab2a5fe 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -161,4 +161,9 @@ void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode);
 Client *get_matching_client(xcb_connection_t *conn,
                             const char *window_classtitle, Client *specific);
 
+#if defined(__OpenBSD__)
+/* OpenBSD does not provide memmem(), so we provide FreeBSD’s implementation */
+void *memmem(const void *l, size_t l_len, const void *s, size_t s_len);
+#endif
+
 #endif

diff --git a/src/config.c b/src/config.c
index 2e9ff5f69842482b75451af0f4c319989aa3393c..d98f4a92e4e6e357b28eb02e678eb531316d0075 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -312,7 +312,16 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
                                         rest++;
                                 if (*rest != ' ')
                                         die("Invalid binding (keysym)\n");
+#if defined(__OpenBSD__)
+                                size_t len = strlen(sym);
+                                if (len > (rest - sym))
+                                        len = (rest - sym);
+                                new->symbol = smalloc(len + 1);
+                                memcpy(new->symbol, sym, len+1);
+                                new->symbol[len]='\0';
+#else
                                 new->symbol = strndup(sym, (rest - sym));
+#endif
                         }
                         rest++;
                         LOG("keycode = %d, symbol = %s, modifiers = %d, command = *%s*\n", new->keycode, new->symbol, modifiers, rest);

diff --git a/src/util.c b/src/util.c
index e9f5472e7ec1e1a4c0cc4e5a14817ac0fb5b0b20..64ab82a97feff4477fb1a41eb1375528a3235541 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -18,6 +18,9 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <iconv.h>
+#if defined(__OpenBSD__)
+#include <sys/cdefs.h>
+#endif
 
 #include <xcb/xcb_icccm.h>
 
@@ -472,3 +475,40 @@ done:
         FREE(to_title_ucs);
         return matching;
 }
+
+#if defined(__OpenBSD__)
+
+/*
+ * Taken from FreeBSD
+ * Find the first occurrence of the byte string s in byte string l.
+ *
+ */
+void *memmem(const void *l, size_t l_len, const void *s, size_t s_len) {
+        register char *cur, *last;
+        const char *cl = (const char *)l;
+        const char *cs = (const char *)s;
+
+        /* we need something to compare */
+        if (l_len == 0 || s_len == 0)
+                return NULL;
+
+        /* "s" must be smaller or equal to "l" */
+        if (l_len < s_len)
+                return NULL;
+
+        /* special case where s_len == 1 */
+        if (s_len == 1)
+                return memchr(l, (int)*cs, l_len);
+
+        /* the last position where its possible to find "s" in "l" */
+        last = (char *)cl + l_len - s_len;
+
+        for (cur = (char *)cl; cur <= last; cur++)
+                if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0)
+                        return cur;
+
+        return NULL;
+}
+
+#endif
+