Changeset 1d69a01311e58ce6ddb007d690b4e9aa4ac08c8c

Timestamp:

02/08/08 15:52:45 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1202485965 +0000

git-parent:

[234b2c6fe5e8099b7e55ae9a395d81c0dca51ec0]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1202485965 +0000

Message:

And make it all work on OpenBSD (ld -E ? sigh...)

Files:

• configure.in (modified) (4 diffs)
• src/eventer/eventer.c (modified) (1 diff)
• src/eventer/eventer.h (modified) (1 diff)
• src/modules/ping_icmp.c (modified) (1 diff)
• src/noit_check.c (modified) (1 diff)
• src/noit_config.h.in (modified) (2 diffs)
• src/noit_console.c (modified) (1 diff)
• src/noit_console.h (modified) (1 diff)
• src/noit_console_telnet.c (modified) (2 diffs)
• src/noit_tokenizer.c (modified) (1 diff)
• src/noitedit/term.c (modified) (1 diff)

configure.in

@@ -30 +30 @@
-        MODULEEXT=so
-        ;;
+*-*-openbsd*)
+        PICFLAGS="-fpic"
+        LDFLAGS="$LDFLAGS -Wl,-E"
+        MODULELD="$CC -shared"
+        MODULEEXT=so
+        ;;
-*)
-        PICFLAGS="-fpic"
@@ -52 +58 @@
-AC_CHECK_LIB(pthread, pthread_create, , )
-AC_CHECK_LIB(uuid, uuid_generate, , )
+AC_CHECK_LIB(util, openpty, , )
-AC_CHECK_LIB(termcap, tputs, , )
-AC_CHECK_LIB(curses, clear, , )
@@ -72 +79 @@
-
-AC_MSG_CHECKING([libserf libs])
-ibs` `apr-1-config --link-ld
+dflags --libs` `apr-1-config --link-ld --ldflags
-AC_SUBST(SERFLIBS)
-AC_MSG_RESULT([$SERFLIBS])
@@ -107 +114 @@
-                 sys/resource.h pthread.h semaphore.h pwd.h stdio.h stdlib.h string.h \
-                 ctype.h unistd.h time.h sys/stat.h sys/event.h libkern/OSAtomic.h \
-
+
+
-
-AC_CACHE_CHECK([for kqueue support], ac_cv_have_kqueue, [

src/eventer/eventer.c

@@ +1 @@
+#define _EVENTER_C_
-#include "eventer/eventer.h"
-#include "eventer/eventer_impl.h"

src/eventer/eventer.h

@@ -72 +72 @@
-
-/* This is the "chosen one" */
-
+
+
+
+
-
-API_EXPORT(int) eventer_choose(const char *name);

src/modules/ping_icmp.c

@@ -12 +12 @@
-#include <fcntl.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
-#include <netinet/in.h>
-#include <netinet/ip.h>

src/noit_check.c

@@ -118 +118 @@
-    }
-    if(!noit_conf_get_stringbuf(sec[i], "name", name, sizeof(name))) {
-cpy(name, module
+lcpy(name, module, sizeof(name)
-    }
-    if(!noit_conf_get_int(sec[i], "ancestor-or-self::node()/period", &period)) {

src/noit_config.h.in

@@ -47 +47 @@
-#undef HAVE_TERMIO_H
-#undef HAVE_TERMIOS_H
+#undef HAVE_UTIL_H
-#undef HAVE_CURSES_H
-#undef HAVE_DIRENT_H
@@ -59 +60 @@
-#undef HAVE_SYS_CDEFS_H
-#undef HAVE_LIBKERN_OSATOMIC_H
+#undef HAVE_NETINET_IN_SYSTM_H
-#undef HAVE_INT64_T
-#undef HAVE_INTXX_T

src/noit_console.c

@@ -10 +10 @@
-#include <errno.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+#ifdef HAVE_UTIL_H
-#include <util.h>
+#endif
-#include <arpa/telnet.h>
-

src/noit_console.h

@@ -11 +11 @@
-#include "noitedit/histedit.h"
-#include "noit_console_telnet.h"
+#include <stdarg.h>
-
-typedef struct __noit_console_closure {

src/noit_console_telnet.c

@@ -234 +234 @@
-        if (getit)
-                init_termbuf(ncct);
-printf((char *)slcbuf
+nprintf((char *)slcbuf, 5
-                                        IAC, SB, TELOPT_LINEMODE, LM_SLC);
-        slcptr = slcbuf + 4;
@@ -273 +273 @@
-                        return(slcptr - slcbuf - 4);
-                } else {
-printf((char *)slcptr
+nprintf((char *)slcptr, 3
-                        slcptr += 2;
-                        len = slcptr - slcbuf;

src/noit_tokenizer.c

@@ -1 @@
-3 on Tue Feb  5 23:39:54
+0 on Fri Feb  8 14:52:45
-#line 1 "noit_tokenizer.re"
-#include <stdlib.h>

src/noitedit/term.c

@@ -409 +409 @@
-        if (el->el_term.t_loc + 3 < TC_BUFSIZE) {
-                                                /* XXX strcpy is safe */
-
-
+l
+, TC_BUFSIZE - el->el_term.t_loc
-                el->el_term.t_loc += clen + 1;  /* one for \0 */
-                return;