Changeset 2c65def60e6630d515d47a2135e89e7961c4c5b9

Timestamp:

01/26/08 04:20:28 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[0268e62cb80791dd94220cf6deec916656c7cddd]

git-author:

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

Message:

take some options

Files:

• configure.in (modified) (1 diff)
• src/noit_config.h.in (modified) (1 diff)
• src/noitd.c (modified) (1 diff)

configure.in

@@ -256 +256 @@
-AC_SUBST(MODULES_DIR)
-
+AC_MSG_CHECKING([Resolving sysconfdir path...])
+fullpath=$sysconfdir
+while test "x$temppath" != "x$fullpath" ; do
+  temppath=$fullpath
+  fullpath=`eval echo ${fullpath}`
+done
+fullpath=`echo $fullpath | sed "s~NONE~$ac_default_prefix~"`
+AC_MSG_RESULT([$fullpath])
+AC_DEFINE_UNQUOTED(ETC_DIR, "${fullpath}")
+ETC_DIR=${fullpath}
+AC_SUBST(ETC_DIR)
+
-
-AC_OUTPUT([

src/noit_config.h.in

@@ -39 +39 @@
-#undef MODULEEXT
-#undef MODULES_DIR
+#undef ETC_DIR
-
-#undef HAVE_FCNTL_H

src/noitd.c

@@ -3 +3 @@
-#include <stdio.h>
-#include <stdlib.h>
+#include <unistd.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
+#include "getopt_long.h"
-#include "eventer/eventer.h"
-#include "utils/noit_log.h"
-#include "noit_listener.h"
-#include "noit_console.h"
+#include "noit_conf.h"
+
+static char *config_file = ETC_DIR "/noit.conf";
+static int debug = 0;
+
+void parse_clargs(int argc, char **argv) {
+  int c;
+  while((c = getopt(argc, argv, "c:d")) != EOF) {
+    switch(c) {
+      case 'c':
+        config_file = strdup(optarg);
+        break;
+      case 'd':
+        debug++;
+        break;
+      default:
+        break;
+    }
+  }
+}
-
-int main(int argc, char **argv) {
+  parse_clargs(argc, argv);
-
-  noit_log_init();
-
+
+
-  noit_log_stream_add_stream(noit_error, noit_stderr);
-
-  noit_conf_init();
-
+
+
+
-  if(eventer_choose("kqueue") == -1) {
-    fprintf(stderr, "Cannot choose kqueue\n");