]> jfr.im git - irc/thales.git/commitdiff
- server.lastsplit is not overwritten when a server rejoins.
authorlnu <lnu>
Sat, 10 Jan 2004 23:26:12 +0000 (23:26 +0000)
committerlnu <lnu>
Sat, 10 Jan 2004 23:26:12 +0000 (23:26 +0000)
- changed "Thales" to "GNU Thales" where it was relevant.
- renamed log() to mylog(), and log_perror() to mylog_perror() to prevent
  conflicts.

33 files changed:
ChangeLog
INSTALL
Makefile.in
README
README.coders
aclocal.m4
src/actions.c
src/actions.h
src/compat.c
src/compat.h
src/conf.c
src/conf.h
src/db.c
src/db.h
src/defs.h
src/hashlist.c
src/hashlist.h
src/log.c
src/log.h
src/main.c
src/memory.c
src/memory.h
src/messages.c
src/messages.h
src/misc.c
src/misc.h
src/process.c
src/process.h
src/send.c
src/send.h
src/sockutil.c
src/sockutil.h
src/thales.h

index b9bb9c3ef52b4a1f176b461b4dc3f2126f94893b..871ce9d96dc37bb5bf46b83a8e512259d1a78699 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Thales 0.9.5 (XX/XX/XXXX)
+GNU Thales 0.9.5 (XX/XX/XXXX)
+   - server.lastsplit is not overwritten when a server rejoins.
+   - changed "Thales" to "GNU Thales" where it was relevant.
+   - renamed log() to mylog(), and log_perror() to mylog_perror() to prevent
+     conflicts.
    - added TBUST to hybrid CAPAB line. Credits go to Wes Baehr
      <iwes@totalmac.net>
    - added a php script for clones detection. contributed by
diff --git a/INSTALL b/INSTALL
index bc347686cde81672f60958b8566b9e7c943fb0fe..488ba01fd791360184293b70555a6ca41e1f41e1 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Thales Installation
-===================
+GNU Thales Installation
+=======================
 
 Thales's installation is quite straightforward.
 - Untar the archive
index 3eb76d177efea278a03478fd390fd8c9f35594e2..711b75e78718f34390a69b0bc78b19e94bb9c34c 100644 (file)
@@ -53,9 +53,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
+HAVE_LIB = @HAVE_LIB@
+LIB = @LIB@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
diff --git a/README b/README
index 5dcafb4d1217f42f26bd197cea687d6e6dff9e3b..c6b469804a0e03653ca42e87ef965313e6793cd0 100644 (file)
--- a/README
+++ b/README
@@ -1,14 +1,14 @@
-Thales
-------
+GNU Thales
+----------
 by Lucas Nussbaum <lucas@lucas-nussbaum.net>
 
 -- Introduction --
 
-Thales is a IRC-to-MySQL gateway. It connects to your IRC network as a server
-(like other services), and store everything it receives in a MySQL database. It
-doesn't build stats itself, it just fills 5 MySQL tables called user, server,
-chan, ison and maxvalues. You can then query the database with SQL queries to
-retrieve the information you need.
+GNU Thales is a IRC-to-MySQL gateway. It connects to your IRC network as a
+server (like other services), and store everything it receives in a MySQL
+database. It doesn't build stats itself, it just fills 5 MySQL tables called
+user, server, chan, ison and maxvalues. You can then query the database with
+SQL queries to retrieve the information you need.
 
 To see examples of how to use Thales, please refer to the contrib/ dir.
 
index 6538ed5fdb37d3acd25432ab4a464da9494665c3..3e6f4e4d3c32cbee0b1da126ac2865efd596dcbd 100644 (file)
@@ -1,19 +1,24 @@
-Thales structures :
+GNU Thales structures :
+=======================
 
-If you are interested in improving thales, you might want to read the following about thales structure.
+If you are interested in improving thales, you might want to read the following
+about thales structure.
 
 IRC messages handling, and database handling, are done in :
 - messages.*
 - actions.*
 - db.*
 
-messages.* handles the basic IRC commands, like PING, MOTD, etc ... using m_* functions.
-When a command requires to query the database, it is forwarded to the corresponding do_* function in actions.*.
-do_* use db_* functions (in db.*) to query the database.
+messages.* handles the basic IRC commands, like PING, MOTD, etc ... using m_*
+functions.  When a command requires to query the database, it is forwarded to
+the corresponding do_* function in actions.*.  do_* use db_* functions (in
+db.*) to query the database.
 
 Patches :
 
-If you want to send a patch, please use diff -burN, and review your patch by hand. I particularly dislikes reading patches which include your config.log, makefiles, etc ... :)
+If you want to send a patch, please use diff -burN, and review your patch by
+hand. I particularly dislikes reading patches which include your config.log,
+makefiles, etc ... :)
 
 IRCD modes :
 
index 77dc3fe1149aa4489646aa5a2eee8d3eff1a5fd9..bffed29dc4457ce5769fbb3e99c0db42c16c68cd 100644 (file)
@@ -38,6 +38,825 @@ ifelse([$5], , , [$5
 fi
 ])
 
+# lib-prefix.m4 serial 3 (gettext-0.12.2)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/lib"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/lib"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+# lib-link.m4 serial 4 (gettext-0.12)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib$1-prefix],
+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux*) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux*) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+# lib-ld.m4 serial 2 (gettext-0.12)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  acl_cv_prog_gnu_ld=yes
+else
+  acl_cv_prog_gnu_ld=no
+fi])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+       ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+       test "$with_gnu_ld" != no && break
+      else
+       test "$with_gnu_ld" != yes && break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
+
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
 AC_DEFUN([AM_CONFIG_HEADER],
index 63aa91fc82ddf8ac4f4ef348a9f63a2961b15300..32ee2cb51cdc8ce77809dd54d24cbe646316611e 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@ static void do_chanmodes(int chanid, char **av, int ac)
                        {
                                if (!log_cmode[(int) *modes])
                                {
-                                       log("unknown mode : chanmode %c (in %s)", *modes, inbuf);
+                                       mylog("unknown mode : chanmode %c (in %s)", *modes, inbuf);
                                        log_cmode[(int) *modes] = TRUE;
                                }
                        }
@@ -353,7 +353,7 @@ static void do_addusers(int chanid, char *users)
                }
                else
                {
-                       log("received join of non-existing user %s on channel ID %d",
+                       mylog("received join of non-existing user %s on channel ID %d",
                                 users, chanid);
                }
                free(users);
@@ -386,7 +386,7 @@ static void do_usermodes(int nickid, char *modes)
                        {
                                if (!log_umode[(int) *modes])
                                {
-                                       log("unknown mode : usermode %c (in %s)", *modes, inbuf);
+                                       mylog("unknown mode : usermode %c (in %s)", *modes, inbuf);
                                        log_umode[(int) *modes] = TRUE;
                                }
                        }
@@ -431,7 +431,7 @@ void do_server(char *server, char *comment, char *linkedto)
        if (ServerCacheTime && ((servid = db_checkserver(server)) != -1))
        {
                db_query("UPDATE " TBL_SERV
-                                       " SET server=\"%s\", comment=\"%s\", linkedto=\"%d\", connecttime=NOW(), lastsplit=NULL, online=\"Y\" WHERE servid=\"%d\"",
+                                       " SET server=\"%s\", comment=\"%s\", linkedto=\"%d\", connecttime=NOW(), online=\"Y\" WHERE servid=\"%d\"",
                                        server, comment, db_getserver(linkedto), servid);
                db_addserver(server, servid);
                add = 0;
index 4feaaabb51ffa5822471f66bf6860d53225e2b70..8adba30f45eda6edd8cf6b1096d7c1c0682605c6 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 8dae723972ebb531c79bd83e41fe17b42221ad70..873c6d281148538de337c0811aa79472c0b76273 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 178e5682b859fe8eb371ca2fc8cd5b6e0020fe71..0c7782d8b79ea48bbc51d3e083333f635dc61b7e 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index c10ba3b7f78d243f6323ab5990a05d4dc17e2f02..8ac82403580de392b8486831c8741e35a38a1043 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -83,9 +83,9 @@ void error(int linenum, char *message, ...)
        va_start(args, message);
        vsnprintf(buf, sizeof(buf), message, args);
        if (linenum)
-               log("%s:%d: %s", THALES_CONF, linenum, buf);
+               mylog("%s:%d: %s", THALES_CONF, linenum, buf);
        else
-               log("%s: %s", THALES_CONF, buf);
+               mylog("%s: %s", THALES_CONF, buf);
        if (!debug && isatty(2))
        {
                if (linenum)
@@ -316,11 +316,11 @@ int read_config(void)
        config = fopen(THALES_CONF, "r");
        if (!config)
        {
-               log_perror("Can't open " THALES_CONF);
+               mylog_perror("Can't open " THALES_CONF);
                if (!debug && isatty(2))
                        perror("Can't open " THALES_CONF);
                else
-                       log("Can't open %s", THALES_CONF);
+                       mylog("Can't open %s", THALES_CONF);
                return 0;
        }
        while (fgets(buf, sizeof(buf), config))
index 536b6caefc43a9e29d8b9244d5c4fb25456d0e0c..2376dbbbf3407443fbc066e10d2485d82e035820 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 6de748e2419696832a319ea8e6dac9c3097963d3..81a152d6e410237ce591d6d861c8f27dbca749b3 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -122,7 +122,7 @@ int db_query(const char *fmt, ...)
        va_start(args, fmt);
        vsprintf(buf, fmt, args);
        if (verbose)
-               log(">SQL : %s", buf);
+               mylog(">SQL : %s", buf);
        if (mysql_real_query(myptr, buf, strlen(buf)))
                fatal("Query failed: %s", mysql_error(myptr));
        return 0;
index b1e4f0282c9e451f29cb5c39afc24ea94b0179fa..7fa4440c34a9c2d0eac649feff582d150fcff2d8 100644 (file)
--- a/src/db.h
+++ b/src/db.h
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-/* Thales' database interface */
+/* GNU Thales' database interface */
 
 #ifndef _DB_H_
 #define _DB_H_
index da5926a6aa3f2f2e13108f1cd227f0a99ee8e73b..f87951b8867c928ea38f94e51fd14cd409611a86 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 96373bfe07253e3f404cb17593ec6babb43cb4d4..1bd477cd32b864635209f6d41e9b980b339b6100 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -55,7 +55,7 @@ void hash_add(hashlist h, char *str, int n, int keytype)
        struct item *pin;
        int key = hash(str, keytype);
        if (verbose)
-               log("HASH : hash_add %d, %s, %d, %d", (int) h, str, n, keytype);
+               mylog("HASH : hash_add %d, %s, %d, %d", (int) h, str, n, keytype);
        pio = h[key];
        pin = (struct item *) malloc(sizeof(struct item));
        pin->str = strdup(str);
@@ -69,7 +69,7 @@ void hash_del(hashlist h, char *str, int keytype)
 {
        struct item *pi, **piold;
        if (verbose)
-               log("HASH : hash_del %d, %s, %d", (int) h, str, keytype);
+               mylog("HASH : hash_del %d, %s, %d", (int) h, str, keytype);
        for (piold = &h[hash(str, keytype)], pi = *piold; pi; pi = pi->next)
        {
                if (!strcmp(str, pi->str))
@@ -91,7 +91,7 @@ int hash_find(hashlist h, char *str, int keytype)
 {
        int res;
        if (verbose)
-               log("HASH : hash_find %d, %s, %d", (int) h, str, keytype);
+               mylog("HASH : hash_find %d, %s, %d", (int) h, str, keytype);
        res = hash_find_unsure(h, str, keytype);
        if (res != -1)
                return res;
@@ -104,7 +104,7 @@ int hash_find_unsure(hashlist h, char *str, int keytype)
 {
        struct item *pi;
        if (verbose)
-               log("HASH : hash_find_unsure %d, %s, %d", (int) h, str, keytype);
+               mylog("HASH : hash_find_unsure %d, %s, %d", (int) h, str, keytype);
        for (pi = h[hash(str, keytype)]; pi; pi = pi->next)
                if (!strcmp(str, pi->str))
                        return pi->n;
@@ -118,7 +118,7 @@ int hash_findel(hashlist h, char *str, int keytype)
        int n;
        struct item *pi, **piold;
        if (verbose)
-               log("HASH : hash_findel %d, %s, %d", (int) h, str, keytype);
+               mylog("HASH : hash_findel %d, %s, %d", (int) h, str, keytype);
 
        for (piold = &h[hash(str, keytype)], pi = *piold; pi; pi = pi->next)
        {
@@ -142,7 +142,7 @@ void hash_update(hashlist h, char *newinfo, char *str, int keytype)
        int key;
        int key2;
        if (verbose)
-               log("HASH : hash_update %d, %s, %s, %d", (int) h, newinfo, str,
+               mylog("HASH : hash_update %d, %s, %s, %d", (int) h, newinfo, str,
                         keytype);
        if ((key = hash(str, keytype)) == (key2 = hash(newinfo, keytype)))
        {
index b3f4dc5cd9ed8fc3271e96772485a312eddddb83..db99f73d0bac0b5f7517af4cd8fb02ed1b2bbe4d 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,8 @@
 #ifndef _HASHLIST_H_
 #define _HASHLIST_H_
 
+#define KEYOTHER 1
+#define KEYCHAN 2
 struct item
 {
        char *str;
index e72bce5f9ac7ab5839f901c70f3a25b28e0afb91..90975fc07ea5ff00e640709ab08cc94822b334ca 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@ void close_log(void)
 }
 
 /* Log stuff to the log file with a datestamp. errno preserved. */
-void log(const char *fmt, ...)
+void mylog(const char *fmt, ...)
 {
        va_list args;
        time_t t;
@@ -99,11 +99,11 @@ void log(const char *fmt, ...)
        errno = errno_save;
 }
 
-/* Like log(), but tack a ": " and a system error message (as returned by
+/* Like mylog(), but tack a ": " and a system error message (as returned by
  * strerror()) onto the end.
  */
 
-void log_perror(const char *fmt, ...)
+void mylog_perror(const char *fmt, ...)
 {
        va_list args;
        time_t t;
@@ -160,7 +160,7 @@ void fatal(const char *fmt, ...)
        struct tm tm;
        char buf[256], buf2[4096];
 
-       log("IRC context : %s", inbuf);
+       mylog("IRC context : %s", inbuf);
 
        va_start(args, fmt);
        time(&t);
@@ -204,7 +204,7 @@ void fatal_perror(const char *fmt, ...)
        char buf[256], buf2[4096];
        int errno_save = errno;
 
-       log("IRC context : %s", inbuf);
+       mylog("IRC context : %s", inbuf);
 
        va_start(args, fmt);
        time(&t);
index 23a121a913499d3e5f31a87cb6adea3f5ce3d34e..3eba0b7d710a99fd5cd722ce34ab4649c5e4767f 100644 (file)
--- a/src/log.h
+++ b/src/log.h
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,11 +28,11 @@ int open_log(void);
 void close_log(void);
 
 /* Log stuff to the log file with a datestamp. errno preserved. */
-void log(const char *fmt, ...);
+void mylog(const char *fmt, ...);
 
 /* Like log(), but tack a ": " and a system error message (as returned by strerror()) onto the end.
 */
-void log_perror(const char *fmt, ...);
+void mylog_perror(const char *fmt, ...);
 
 /* fatal error, log then go down */
 void fatal(const char *fmt, ...);
index 9740bf20cd85197a3dd0ebe5056084e2dc5d06f1..368dab04df212c73ce25bb8ab2a7f11de733bed4 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-/* Thales - main file */
+/* GNU Thales - main file */
 
 #include "thales.h"
 #include "conf.h"
@@ -74,7 +74,7 @@ void write_pidfile(void)
        }
        else
        {
-               log_perror("Warning: cannot write to PID file %s", PIDFilename);
+               mylog_perror("Warning: cannot write to PID file %s", PIDFilename);
        }
 }
 
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
                        verbose = 1;
                        break;
                case 'V':
-                       printf("Thales v.%s\n", VERSION);
+                       printf("GNU Thales v.%s\n", VERSION);
                        exit(0);
                        break;
                default:
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
        write_pidfile();
 
        /* Announce ourselves to the logfile. */
-       log("Thales %s starting up with %s support%s", VERSION,
+       mylog("GNU Thales %s starting up with %s support%s", VERSION,
 #if defined(IRCD_UNREAL)
                 "unreal",
 #elif defined(IRCD_HYBRID)
index 195337a9930d054c570123d760106f29649e4b25..83151f3eda0f63d4a7c7cb2b7d76eabb71d95fac 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@ void *smalloc(long size)
 
        if (!size)
        {
-               log("smalloc: Illegal attempt to allocate 0 bytes");
+               mylog("smalloc: Illegal attempt to allocate 0 bytes");
                size = 1;
        }
        buf = malloc(size);
@@ -55,7 +55,7 @@ void *scalloc(long elsize, long els)
 
        if (!elsize || !els)
        {
-               log("scalloc: Illegal attempt to allocate 0 bytes");
+               mylog("scalloc: Illegal attempt to allocate 0 bytes");
                elsize = els = 1;
        }
        buf = calloc(elsize, els);
@@ -74,7 +74,7 @@ void *srealloc(void *oldptr, long newsize)
 
        if (!newsize)
        {
-               log("srealloc: Illegal attempt to allocate 0 bytes");
+               mylog("srealloc: Illegal attempt to allocate 0 bytes");
                newsize = 1;
        }
        buf = realloc(oldptr, newsize);
index aba06535de73deb656a077e885cdd7143d35eb5c..277a431b2801863258171b0e510c794bdbe01ace 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 8d5c73f79882be4080a8993513818a134b7b7b9a..9aadebcb10a983d2f8e3d42099e740e7cbd07f8f 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -195,7 +195,7 @@ static void m_away(char *source, int ac, char **av)
 static void m_version(char *source, int ac, char **av)
 {
        if (source)
-               send_cmd(ServerName, "351 %s Thales %s %s",
+               send_cmd(ServerName, "351 %s GNU Thales %s %s",
                                        source, VERSION, ServerName);
 }
 
@@ -219,7 +219,7 @@ static void m_stats(char *source, int ac, char **av)
                {
                        int uptime;
                        uptime = time(NULL) - start_time;
-                       send_cmd(NULL, "242 %s :Thales up %d day%s, %02d:%02d:%02d",
+                       send_cmd(NULL, "242 %s :GNU Thales up %d day%s, %02d:%02d:%02d",
                                                source, uptime / 86400, (uptime / 86400 == 1) ? "" : "s",
                                                (uptime / 3600) % 24, (uptime / 60) % 60, uptime % 60);
                        send_cmd(NULL, "219 %s u :End of /STATS report.", source);
@@ -251,12 +251,12 @@ static void m_motd(char *source, int ac, char **av)
        send_cmd(ServerName, "372 %s :-  |_| |_| |_|\\__,_|_|\\___||___/",
                                source);
        send_cmd(ServerName, "372 %s :-           v. %s", source, VERSION);
-       send_cmd(ServerName, "372 %s :-    (c)2002 Lucas Nussbaum", source);
+       send_cmd(ServerName, "372 %s :-    (c)2002-2004 Lucas Nussbaum", source);
        send_cmd(ServerName, "372 %s :-", source);
-       send_cmd(ServerName, "372 %s :-Thales is an IRC to MySQL gateway.",
+       send_cmd(ServerName, "372 %s :-GNU Thales is an IRC to MySQL gateway.",
                                source);
-       send_cmd(ServerName, "372 %s :-    More info is available on", source);
-       send_cmd(ServerName, "372 %s :-http://www.lucas-nussbaum.net/thales/",
+       send_cmd(ServerName, "372 %s :-   More info is available on", source);
+       send_cmd(ServerName, "372 %s :-http://www.gnu.org/software/thales/",
                                source);
        send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
 }
@@ -394,7 +394,7 @@ static void m_sethost(char *source, int ac, char **av)
 /* REALHOST - forwarded */
 static void m_realhost(char *source, int ac, char **av)
 {
-       log("NBPARAMS : %d", ac);
+       mylog("NBPARAMS : %d", ac);
        if (ac > 1)
                do_realhost(av[0], av[1]);
        else
index d452c64bdd55b4d26b5981b157ee55cb66cb5b39..33278fa3faed2f2974317b92c98011d6ad708067 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 94022822222e1958bb7bec436dd1669ae4c68794..5cd0387222437f91ab9b82331064ae747b227369 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 10dc30da33670f09f9389e663e859b0576638529..f825952410eb8a4c15779c03811cbd5084453ba8 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 16459472a118a772bcadbd6427b598b34d53b49e..5ec14e4a9dae9074ec11bbcb7929700d552486b8 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -96,7 +96,7 @@ void process()
 
        /* If debugging, log the buffer. */
        if (verbose)
-               log("<IRC : %s", inbuf);
+               mylog("<IRC : %s", inbuf);
 
        /* First make a copy of the buffer so we have the original in case we
         * crash - in that case, we want to know what we crashed on. */
@@ -141,7 +141,7 @@ void process()
        }
        else
        {
-               log("IRC : unknown message from server (%s)", inbuf);
+               mylog("IRC : unknown message from server (%s)", inbuf);
        }
 
        /* Free argument list we created */
index 14f7f6e4aae62dbcd38b2cdff939503dbb70f654..1bed07b634a4f0f15bf58a6dbd5204f2c7c5989c 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index e79134111e949fd160415755645fb03dd5b583db..4035a4eb5e28c6a4ae5fbc5cc0f541c09952d63a 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -48,13 +48,13 @@ void vsend_cmd(const char *source, const char *fmt, va_list args)
        {
                sockprintf(servsock, ":%s %s\r\n", source, buf);
                if (verbose)
-                       log(">IRC : %s %s", source, buf);
+                       mylog(">IRC : %s %s", source, buf);
        }
        else
        {
                sockprintf(servsock, "%s\r\n", buf);
                if (verbose)
-                       log(">IRC : %s", buf);
+                       mylog(">IRC : %s", buf);
        }
 }
 
index 1930efd090c9b26dc6b48614af20ead38aaed82f..101baad1c9b25da8db98cbaf23341bd5e44ae1ab 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index d098b1b30fdf3321b95fc94b2b457577df20e279..892c2fc19242acdbd93c2aa8887b04c981e92ff7 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -79,7 +79,7 @@ static int buffered_read(int fd, char *buf, int len)
                        nread = read(fd, read_bufend, maxread);
                        errno_save = errno;
                        if (debug >= 3)
-                               log("debug: buffered_read wanted %d, got %d", maxread, nread);
+                               mylog("debug: buffered_read wanted %d, got %d", maxread, nread);
                        if (nread <= 0)
                                break;
                        read_bufend += nread;
@@ -113,7 +113,7 @@ static int buffered_read(int fd, char *buf, int len)
        total_read += len - left;
        if (debug >= 4)
        {
-               log("debug: buffered_read(%d,%p,%d) returning %d",
+               mylog("debug: buffered_read(%d,%p,%d) returning %d",
                         fd, buf, len, len - left);
        }
        errno = errno_save;
@@ -155,7 +155,7 @@ static int buffered_read_one(int fd)
                nread = read(fd, read_bufend, maxread);
                errno_save = errno;
                if (debug >= 3)
-                       log("debug: buffered_read_one wanted %d, got %d", maxread, nread);
+                       mylog("debug: buffered_read_one wanted %d, got %d", maxread, nread);
                if (nread <= 0)
                        break;
                read_bufend += nread;
@@ -165,7 +165,7 @@ static int buffered_read_one(int fd)
        if (read_curpos == read_bufend)
        {                                                                         /* No more data on socket */
                if (debug >= 4)
-                       log("debug: buffered_read_one(%d) returning %d", fd, EOF);
+                       mylog("debug: buffered_read_one(%d) returning %d", fd, EOF);
                errno = errno_save;
                return EOF;
        }
@@ -174,7 +174,7 @@ static int buffered_read_one(int fd)
                read_curpos = read_netbuf;
        total_read++;
        if (debug >= 4)
-               log("debug: buffered_read_one(%d) returning %d", fd, c);
+               mylog("debug: buffered_read_one(%d) returning %d", fd, c);
        return (int) c & 0xFF;
 }
 
@@ -227,7 +227,7 @@ static int flush_write_buffer(int wait)
                nwritten = write(write_fd, write_curpos, maxwrite);
                errno_save = errno;
                if (debug >= 3)
-                       log("debug: flush_write_buffer wanted %d, got %d", maxwrite,
+                       mylog("debug: flush_write_buffer wanted %d, got %d", maxwrite,
                                 nwritten);
                if (nwritten > 0)
                {
@@ -309,7 +309,7 @@ static int buffered_write(int fd, char *buf, int len)
 
        if (debug >= 4)
        {
-               log("debug: buffered_write(%d,%p,%d) returning %d",
+               mylog("debug: buffered_write(%d,%p,%d) returning %d",
                         fd, buf, len, len - left);
        }
        errno = errno_save;
@@ -343,7 +343,7 @@ static int buffered_write_one(int c, int fd)
                {
                        /* Write failed */
                        if (debug >= 4)
-                               log("debug: buffered_write_one(%d) returning %d", fd, EOF);
+                               mylog("debug: buffered_write_one(%d) returning %d", fd, EOF);
                        return EOF;
                }
        }
@@ -357,7 +357,7 @@ static int buffered_write_one(int c, int fd)
        flush_write_buffer(0);
 
        if (debug >= 4)
-               log("debug: buffered_write_one(%d) returning %d", fd, c);
+               mylog("debug: buffered_write_one(%d) returning %d", fd, c);
        return (int) c & 0xFF;
 }
 #endif /* 0 */
index d6e75f21c9c278002a3f71639c9c8da974f81cb1..986ccf51905d8a85a33ef77e2bb31164d042fe81 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify
index 1c63c6a0dc7a2d76bc07268bf72a44e9ed157187..5374333059ab6265cbd2fb08d272458616216e95 100644 (file)
@@ -1,4 +1,4 @@
-/*  Thales - IRC to Relational Database Gateway
+/*  GNU Thales - IRC to Relational Database Gateway
  *  Copyright (C) 2002 Lucas Nussbaum <lucas@lucas-nussbaum.net>
  *
  *  This program is free software; you can redistribute it and/or modify