Changeset 761

Timestamp:

07/09/06 16:30:33 (6 years ago)

Author:

wd

Message:

Update for scons build conversion (M1: working build of base tools)

Location:

branches/ithildin-scons

Files:

• SConstruct (added)
• include/ithildin/ithildin.h (modified) (4 diffs)
• lib (added)
• lib/conf.c (moved) (moved from branches/ithildin-scons/source/conf.c)
• lib/contrib (moved) (moved from branches/ithildin-scons/source/contrib)
• lib/event.c (moved) (moved from branches/ithildin-scons/source/event.c)
• lib/global.c (moved) (moved from branches/ithildin-scons/source/global.c) (1 diff)
• lib/hash.c (moved) (moved from branches/ithildin-scons/source/hash.c)
• lib/log.c (moved) (moved from branches/ithildin-scons/source/log.c)
• lib/malloc.c (moved) (moved from branches/ithildin-scons/source/malloc.c)
• lib/md5.c (moved) (moved from branches/ithildin-scons/source/md5.c)
• lib/module.c (moved) (moved from branches/ithildin-scons/source/module.c)
• lib/poller_devpoll.c (moved) (moved from branches/ithildin-scons/source/poller_devpoll.c)
• lib/poller_kqueue.c (moved) (moved from branches/ithildin-scons/source/poller_kqueue.c)
• lib/poller_poll.c (moved) (moved from branches/ithildin-scons/source/poller_poll.c)
• lib/poller_select.c (moved) (moved from branches/ithildin-scons/source/poller_select.c)
• lib/socket.c (moved) (moved from branches/ithildin-scons/source/socket.c)
• lib/string.c (moved) (moved from branches/ithildin-scons/source/string.c)
• lib/timer.c (moved) (moved from branches/ithildin-scons/source/timer.c)
• lib/util.c (moved) (moved from branches/ithildin-scons/source/util.c)
• modules/Makefile.in (deleted)
• source/Makefile.am (deleted)
• source/main.c (modified) (5 diffs)

branches/ithildin-scons/include/ithildin/ithildin.h

@@ -11 +11 @@
 #define STAND_H
 
+#include <ithildin/config.h>
 #ifdef MODULE
 /* Include these if it is a module build.  modconfig.h must be supplied by
  * the module, it is intended to provide overrides to config.h */
-#include <ithildin/config.h>
-
-/* We undefine these to prevent spurious warnings. */
-#undef PACKAGE
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef VERSION
-
-#include "modconfig.h"
-#else
-/* This is the config.h generated by the GNU toolchain, used only during
- * base build. */
-#include "config.h"
+# include "modconfig.h"
 #endif
 
@@ -36 +23 @@
  * THEM. */
 #ifdef HAVE_FEATURES_H
-#define _GNU_SOURCE
+# define _GNU_SOURCE
 #endif
 
 /* global config files are included here */
 #include <ctype.h>
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifdef HAVE_MATH_H
-# include <math.h>
-#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <math.h>
 #ifdef HAVE_MEMORY_H
 # include <memory.h>
@@ -61 +40 @@
 #include <signal.h>
 #include <stdarg.h>
-
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# undef bool
-# undef true
-# undef false
-# define false 0
-# define true 1
-# define bool _Bool
-# if __STDC_VERSION__ < 199901L
-typedef int _Bool;
-# endif
-#endif
-
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
@@ -104 +67 @@
 # include <sys/stat.h>
 #endif
-#if TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
+#endif
+#ifdef HAVE_TIME_H
 # include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
 

branches/ithildin-scons/lib/global.c

@@ -10 +10 @@
 
 #include <ithildin/ithildin.h>
+#ifdef HAVE_OPENSSL
+# include <openssl/err.h>
+# include <openssl/rand.h>
+# include <openssl/ssl.h>
+#endif
 
 IDSTRING(rcsid, "$Id: main.c 652 2006-01-02 15:23:35Z wd $");

branches/ithildin-scons/source/main.c

@@ -83 +83 @@
 
     me.started = me.now = time(NULL);
+    /*
     strncpy(me.conf_path, PACKAGE_PATH_SYSCONF, PATH_MAX);
     strncpy(me.lib_path, PACKAGE_PATH_LIB "/modules", PATH_MAX);
@@ -89 +90 @@
     sprintf(me.version, "%s-%s", PACKAGE_NAME, PACKAGE_VERSION);
     me.revision = PACKAGE_REPOSITORY_VERSION;
+    */
     me.fork = 1; /* by default we fork */
 
@@ -301 +303 @@
                 strncpy(me.conf_path, optarg, PATH_MAX);
                 break;
+                /*
             case 'v':
                 printf("%s (r%d)\n", me.version, me.revision);
@@ -315 +318 @@
 
                 exit(0);
+                */
             case '?':
                 printf(usage, me.execname);
@@ -613 +617 @@
                     if (getegid() != grp->gr_gid) {
                         log_error("could not change effective gid to %s (%d)",
-                                gr->gr_name, gr->gid);
+                                grp->gr_name, grp->gr_gid);
                         return false;
                     }