Merge remote-tracking branch 'remotes/github/0.5-basic' into 0.5-basic0.5-basic

70 files changed, 6459 insertions, 1578 deletions

diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..7ebb73a
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,36 @@
+Changes from 0.5.5-STABLERELEASE to 0.5.6-BASIC
+- Rearanged the startup messages
+- Set 2000 as the standard port (3000 has been used before)
+- Run astyle on src/*.{h,cpp}
+- Fixed some errors in the README file
+- Added the SHORTDESC file
+- Changed Copyright to EXA Digital Solutions
+- Added .pm to scripts/stats.pl
+- Modified the README (New CVS pserver)
+- Added the headers and header rules to the Makefile
+- Added the docs directory and the containing header.txt file which
+  does have a header skel for the source files (all source files now do
+  have a new source header containgin copyrights)
+- The ychat-0.5 CVS branch now also has ychat-basic as its synonym
+- Added the replace rule to the top level Makefile
+
+Changes from 0.5.4-STABLERELEASE to 0.5.5-STABLERELEASE
+- Added scripts/version.sh (can be invoked by gmake version)
+- Fixed a bug in the session manager.
+- Removed the large animated GIF graphic.
+
+Changes from 0.5.3-LEGACYRELEASE to 0.5.4-STABLERELEASE
+- Backported reqp::get_url from yChat 0.7.8-CURRENT.
+- Tagged 0.5-STABLE
+
+Changes from 0.5.2-LEGACYRELEASE to 0.5.3-LEGACYRLEASE
+- Code cleanup
+- Added ./scripts/*
+- Added gmake stats option
+
+Changes from 0.5.1-RELEASE to 0.5.2-LEGACYRLEASE
+- Changed this branch into a LEGACY branch.
+- Rewrote the dynamic thread pool (backport from 0.7.8-CURRENT).
+- Added scripts/*
+- Code now uses ANSI C++ style with 2 space code indenting. 
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..4842efd
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,37 @@
+MAKE=gmake
+HEADER?=docs/header.txt
+all:    base 
+	@echo "Now edit the ./conf.txt file and run ./ychat!"
+install: deinstall
+uninstall: deinstall
+deinstall:
+	@echo Install/deinstall is not supported!
+	@echo Start yChat with ./ychat instead! 
+	@exit 1
+base:	
+	@${MAKE} -C ./src 
+clean_base:
+	@${MAKE} -C ./src clean
+stats:
+	@perl scripts/stats.pl
+run: 
+	./ychat
+gpl:
+	@more COPYING
+clean:	clean_base 
+debug:
+	@gdb ./ychat ychat.core
+version:
+	@sh ./scripts/version.sh
+headers:
+	@find -E ./ -regex '\./src/.*\.(h|(cpp)|(tmpl))' -exec \
+		sh -c 'export FILE={}; ${MAKE} header' \;
+header:
+	@echo "===> Processing ${FILE}"
+	@sed -n '/*:/d; w .tmp' ${FILE} 
+	@header=`sed 's/\(.*\)/ echo " \*: \1"/' ${HEADER}`; \
+		echo '/*:*' > ${FILE}; eval "$$header" >> ${FILE}; \
+		echo ' *:*/' >> ${FILE}; cat .tmp >> ${FILE}; rm -f .tmp
+replace:
+	@find ./ -type f -exec sh -c 'sed -n "s/$(FROM)/$(INTO)/g; \
+		w .tmp" {} && mv -f .tmp {}' \;
diff --git a/README b/README
index 3ae4b74..8de9114 100644
--- a/README
+++ b/README
@@ -1,7 +1,8 @@
-yChat++ Basic; Homepage: www.yChat.org; Version 0.5.1
-Copyright (C) 2003 Paul C. Buetow, Volker Richter
------------------------------------------------------------------
+yChat; Homepage: www.yChat.org; Version 0.5.6-BASIC
 
+Copyright (C) 2003, 2004 Paul C. Buetow, Volker Richter
+Copyright (C) 2005 EXA Digital Solutions GbR
+-----------------------------------------------------------------
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
@@ -18,11 +19,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 -----------------------------------------------------------------
 
-0.0.0 YCHAT++ BASIC TABLE OF CONTENTS 
+0.0.0 BASIC YCHAT 0.5 TABLE OF CONTENTS 
 1.0.0 REQUIREMENTS
 1.1.0 TESTED PLATFORMS
 1.2.0 IMPORTANT NOTES
-1.3.0 HOW TO OBTAIN YCHAT++ 
+1.3.0 HOW TO OBTAIN YCHAT
 1.3.1 INSTALLATION
 1.5.0 CUSTOMIZATION
 1.6.0 FILES
@@ -31,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 1.0.0 REQUIREMENTS: 
 
-- gcc 3.2
+- gcc 3.x
   The GNU C++ compiler.
 
 1.1.0 TESTED PLATFORMS:
@@ -39,29 +40,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 The following platforms have been tested with success:
 
 - Linux with GCC 3.2.0, GNU make 3.79.1
-- FreeBSD 5.1-RELEASE-p2, GCC 3.2.2, GNU make 3.80 ( standard make does not seem work on FreeBSD ). 
+- FreeBSD 5.1-RELEASE-p2, GCC 3.2.2, GNU make 3.80 
+- FreeBSD 5.3-RELEASE, GCC 3.4, GNU make 3.80
+- FreeBSD 5.4-RELEASE, GCC 3.4.2, GNU make 3.80
 
 1.2.0 IMPORTANT NOTES:
 
 Before you compile the source you have to be sure to use at least GCC
 version 3.x with pthreads enabled. ( Type gcc -v to check it ).
 GCC 2.95 did not work while testing on linux and WON'T BE SUPPORTED!
-If you like to support yChat++, please write us an email and tell what 
-you can/like/would help ;-]. Please also take a look at the yChat++
+If you like to support yChat please write us an email and tell what 
+you can/like/would help ;-]. Please also take a look at the yChat
 homepage which is located at http://www.yChat.org.
 
-1.3.0 HOW TO OBTAIN YCHAT++:
+1.3.0 HOW TO OBTAIN YCHAT:
 
 yChat can be downloaded as a source package or through CVS. 
 
-The packages are located at http://www.yChat.org -> Sourcecode -> 
-Packages or go to http://programming.buetow.org/CPP-yChat .
+The packages are located at http://www.yChat.org -> Release Versions
+Packages or go to http://programming.buetow.org/yChat .
+
+For CVS download type:
+
+cvs -d:pserver:anonymous@buetow.org:/cvs/cvsroot login
+( You will be asked for a password. Use "just enter" ).
+
+cvs -z3 -d:pserver:anonymous@buetow.org:/cvs/cvsroot co ychat-basic
+( The sources will be copied into your local folder )
+
+cvs -d:pserver:anonymous@buetow.org:/cvs/cvsroot logout
+( Logs your CVS session out ).
+
+Now you may continue with the installation.
 
-For CVS download type also look at the homepage please.
 
 1.3.1 INSTALLATION:
 
-Invoke "./configure" and afterwards "make", edit the conf.txt. 
+Invoke "./configure" and afterwards "gmake", edit the conf.txt. 
 
 Now we want to compile all the dynamic loadable modules of ychat.
 Invoke "cd cmnd && ./compile.sh && cd -". All command modules should get
@@ -83,6 +98,8 @@ Dynamic loadable modules can be found in the cmnd/ subdirectory.
 
 conf.txt - The yChat configuration file. ( read by conf.cpp ).
 
+Files in ./src:
+
 base.cpp - Encapsulates vector fields of room's or user ( may be later
            hash_maps ) and provides methods for manipulating data
            objects.
@@ -203,7 +220,7 @@ conf     html
 
 How to submit a good bug report?
 
-Send them to Bug@yChat.org.
+Send them to mail at yChat dot org.
 
 First you should give the following information:
 - yChat version, if CVS (or devel. tarball) then which day?
@@ -243,14 +260,19 @@ You may contact us through the following addresses:
 
 - Homepage
   The yChat homepage is located at http://www.yChat.org
+  The EXA Digital Solutions homepage is located at http://www.exa-ds.com
 
 - E-Mail
-  Paul C. Buetow: Snooper@yChat.org ( core developer )
-  Volker Richter: Rover@yChat.org ( core developer )
-  Mail@yChat.org ( reaches everybody of yChat )
+  Paul C. Buetow: Buetow at yChat dot org ( core developer )
+  Mail at yChat dot org ( reaches everybody of yChat )
  
 - ICQ
   Paul C. Buetow: 11655527
 
 - IRC
   #ychat at irc.german-elite.net  
+
+- EXA Digital Solutions GbR
+  Laubenstr. 16b
+  D-44866 Bochum
+  Germany
diff --git a/SHORTDESC b/SHORTDESC
new file mode 100644
index 0000000..fce0ad0
--- /dev/null
+++ b/SHORTDESC
@@ -0,0 +1,4 @@
+The yChat 0.5 branch is marked as BASIC and contains a very light and fast
+chat system without any special features.
+
+WWW: http://www.yChat.org
diff --git a/conf.txt b/conf.txt
index 936af92..eb7ed2f 100644
--- a/conf.txt
+++ b/conf.txt
@@ -11,15 +11,15 @@
 # all lines which do not contain a semicolon and at least two quotes 
 # or start with a # will be ignored.
 #
-# greets, paul c. buetow ( snooper@ychat.org );
+# greets, paul c. buetow ( snooper at ychat dot org );
 #
 
 # server specific configurations ( not allowed to be removed ):
 
 HTMLTEMP="html/";  # directory of the html-template files.
-THRDPOOL="50";    # thread pool size. 
-THRDQUEU="50";    # length of the thread pool queue.
-SRVRPORT="3000";   # local port on which the server listens. 
+THRDPOOL="1";      # Initial pool size. 
+THRDPMAX="52";     # Max thread pool size 
+SRVRPORT="2000";   # local port on which the server listens. 
 STRDROOM="Lounge"; # the name of the standard room.
 LANGUAGE="en"; # language of the chat outputs ( CONSOLE OUTPUT IS NOT AFFECTED )
 
@@ -48,7 +48,7 @@ LOG_LINES="10";
 
 # values which are used by the html-templates and are not sticked within the yC++ core source!
 GRAPHICS="http://paul.buetow.info/yChat"; # url for graphic files etc. 
-PGETITLE="yChat++ Basic - Fast Simple Extensible";
+PGETITLE="yChat 0.5 - Fast Simple Extensible";
 
 # do not edit beyond this line
 
diff --git a/configure b/configure
index 8c5f0a7..333efb0 100755
--- a/configure
+++ b/configure
@@ -1,1555 +1,5 @@
-#! /bin/sh
+#!/bin/sh
 
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transfor