Merge patches for OpenBSD compatibility

2009-09-02 22:25:50 +02:00
parent ae2371ee58
commit a8352a8988
4 changed files with 61 additions and 0 deletions
--- 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);