From: Alexander Barton Date: Mon, 13 Jan 2003 12:20:16 +0000 (+0000) Subject: - new library "libngtool", reorganized code and directory structure therefore. X-Git-Tag: rel-0-7-0-pre1~86 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=0f3e84f4154676dc05a09bd0b1ad9d3d43574d48 - new library "libngtool", reorganized code and directory structure therefore. --- diff --git a/configure.in b/configure.in index a82df087..1b4233c1 100644 --- a/configure.in +++ b/configure.in @@ -2,14 +2,13 @@ # ngIRCd -- The Next Generation IRC Daemon # Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# 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 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # -# $Id: configure.in,v 1.77 2003/01/04 13:07:54 alex Exp $ +# $Id: configure.in,v 1.78 2003/01/13 12:20:16 alex Exp $ # # -- Initialisierung -- @@ -224,6 +223,7 @@ AC_OUTPUT([ \ MacOSX/ngircd.pbproj/Makefile \ src/Makefile \ src/portab/Makefile \ + src/tool/Makefile \ src/ngircd/Makefile \ src/testsuite/Makefile \ man/Makefile \ diff --git a/src/Makefile.am b/src/Makefile.am index bc6f268d..a24e96ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,17 +2,16 @@ # ngIRCd -- The Next Generation IRC Daemon # Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# 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 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # -# $Id: Makefile.am,v 1.4 2002/09/09 10:00:15 alex Exp $ +# $Id: Makefile.am,v 1.5 2003/01/13 12:20:16 alex Exp $ # -SUBDIRS = portab ngircd testsuite +SUBDIRS = portab tool ngircd testsuite maintainer-clean-local: rm -f Makefile Makefile.in config.h config.h.in stamp-h.in diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am index 62458e40..3336d53a 100644 --- a/src/ngircd/Makefile.am +++ b/src/ngircd/Makefile.am @@ -2,19 +2,18 @@ # ngIRCd -- The Next Generation IRC Daemon # Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# 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 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # -# $Id: Makefile.am,v 1.35 2003/01/04 10:39:14 alex Exp $ +# $Id: Makefile.am,v 1.36 2003/01/13 12:20:16 alex Exp $ # AUTOMAKE_OPTIONS = ../portab/ansi2knr -INCLUDES = -I$(srcdir)/../portab +INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN @@ -22,17 +21,16 @@ sbin_PROGRAMS = ngircd ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c conn-zip.c conn-func.c \ hash.c irc.c irc-channel.c irc-info.c irc-login.c irc-mode.c irc-op.c \ - irc-oper.c irc-server.c irc-write.c lists.c log.c match.c parse.c resolve.c \ - tool.c + irc-oper.c irc-server.c irc-write.c lists.c log.c match.c parse.c resolve.c -ngircd_LDFLAGS = -L../portab +ngircd_LDFLAGS = -L../portab -L../tool -ngircd_LDADD = -lngportab +ngircd_LDADD = -lngportab -lngtool noinst_HEADERS = ngircd.h channel.h client.h conf.h conn.h conn-zip.h conn-func.h \ hash.h irc.h irc-channel.h irc-info.h irc-login.h irc-mode.h irc-op.h \ irc-oper.h irc-server.h irc-write.h lists.h log.h match.h parse.h resolve.h \ - tool.h messages.h defines.h + messages.h defines.h clean-local: rm -f check-version check-help lint.out cvs-version.* diff --git a/src/ngircd/tool.c b/src/ngircd/tool.c deleted file mode 100644 index 440fcb4b..00000000 --- a/src/ngircd/tool.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) - * - * 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 of the License, or - * (at your option) any later version. - * Please read the file COPYING, README and AUTHORS for more information. - * - * Tool functions - */ - - -#include "portab.h" - -static char UNUSED id[] = "$Id: tool.c,v 1.10 2002/12/12 12:24:18 alex Exp $"; - -#include "imp.h" -#include -#include -#include -#include - -#include "exp.h" -#include "tool.h" - - -GLOBAL VOID -ngt_TrimStr( CHAR *String ) -{ - /* Mit ngt_TrimStr() werden fuehrende und folgende Leerzeichen, - * Tabulatoren und Zeilenumbrueche (ASCII 10 und ASCII 13) aus - * dem String entfernt. */ - - CHAR *start, *ptr; - - assert( String != NULL ); - - start = String; - - /* Zeichen am Anfang pruefen ... */ - while(( *start == ' ' ) || ( *start == 9 )) start++; - - /* Zeichen am Ende pruefen ... */ - ptr = strchr( start, '\0' ) - 1; - while((( *ptr == ' ' ) || ( *ptr == 9 ) || ( *ptr == 10 ) || ( *ptr == 13 )) && ptr >= start ) ptr--; - *(++ptr) = '\0'; - - memmove( String, start, strlen( start ) + 1 ); -} /* ngt_TrimStr */ - - -GLOBAL CHAR * -ngt_LowerStr( CHAR *String ) -{ - /* String in Kleinbuchstaben konvertieren. Der uebergebene - * Speicherbereich wird durch das Ergebnis ersetzt, zusaetzlich - * wird dieser auch als Pointer geliefert. */ - - CHAR *ptr; - - assert( String != NULL ); - - /* Zeichen konvertieren */ - ptr = String; - while( *ptr ) - { - *ptr = tolower( *ptr ); - ptr++; - } - - return String; -} /* ngt_LowerStr */ - - -/* -eof- */ diff --git a/src/ngircd/tool.h b/src/ngircd/tool.h deleted file mode 100644 index f094eb35..00000000 --- a/src/ngircd/tool.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) - * - * 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 of the License, or - * (at your option) any later version. - * Please read the file COPYING, README and AUTHORS for more information. - * - * $Id: tool.h,v 1.9 2002/12/12 12:23:43 alex Exp $ - * - * Tool functions (Header) - */ - - -#ifndef __tool_h__ -#define __tool_h__ - - -GLOBAL VOID ngt_TrimStr PARAMS((CHAR *String )); - -GLOBAL CHAR *ngt_LowerStr PARAMS((CHAR *String )); - - -#endif - - -/* -eof- */ diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am new file mode 100644 index 00000000..5f1e97ad --- /dev/null +++ b/src/tool/Makefile.am @@ -0,0 +1,27 @@ +# +# ngIRCd -- The Next Generation IRC Daemon +# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) +# +# 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 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. +# +# $Id: Makefile.am,v 1.1 2003/01/13 12:20:16 alex Exp $ +# + +AUTOMAKE_OPTIONS = ansi2knr + +INCLUDES = -I$(srcdir)/../portab + +noinst_LIBRARIES = libngtool.a + +libngtool_a_SOURCES = tool.c + +noinst_HEADERS = tool.h + +maintainer-clean-local: + rm -f Makefile Makefile.in + +# -eof- diff --git a/src/tool/tool.c b/src/tool/tool.c new file mode 100644 index 00000000..3b66d7f8 --- /dev/null +++ b/src/tool/tool.c @@ -0,0 +1,77 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * + * 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 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + * + * Tool functions + */ + + +#include "portab.h" + +static char UNUSED id[] = "$Id: tool.c,v 1.1 2003/01/13 12:20:16 alex Exp $"; + +#include "imp.h" +#include +#include +#include +#include + +#include "exp.h" +#include "tool.h" + + +GLOBAL VOID +ngt_TrimStr( CHAR *String ) +{ + /* Mit ngt_TrimStr() werden fuehrende und folgende Leerzeichen, + * Tabulatoren und Zeilenumbrueche (ASCII 10 und ASCII 13) aus + * dem String entfernt. */ + + CHAR *start, *ptr; + + assert( String != NULL ); + + start = String; + + /* Zeichen am Anfang pruefen ... */ + while(( *start == ' ' ) || ( *start == 9 )) start++; + + /* Zeichen am Ende pruefen ... */ + ptr = strchr( start, '\0' ) - 1; + while((( *ptr == ' ' ) || ( *ptr == 9 ) || ( *ptr == 10 ) || ( *ptr == 13 )) && ptr >= start ) ptr--; + *(++ptr) = '\0'; + + memmove( String, start, strlen( start ) + 1 ); +} /* ngt_TrimStr */ + + +GLOBAL CHAR * +ngt_LowerStr( CHAR *String ) +{ + /* String in Kleinbuchstaben konvertieren. Der uebergebene + * Speicherbereich wird durch das Ergebnis ersetzt, zusaetzlich + * wird dieser auch als Pointer geliefert. */ + + CHAR *ptr; + + assert( String != NULL ); + + /* Zeichen konvertieren */ + ptr = String; + while( *ptr ) + { + *ptr = tolower( *ptr ); + ptr++; + } + + return String; +} /* ngt_LowerStr */ + + +/* -eof- */ diff --git a/src/tool/tool.h b/src/tool/tool.h new file mode 100644 index 00000000..65817779 --- /dev/null +++ b/src/tool/tool.h @@ -0,0 +1,29 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * + * 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 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + * + * $Id: tool.h,v 1.1 2003/01/13 12:20:16 alex Exp $ + * + * Tool functions (Header) + */ + + +#ifndef __tool_h__ +#define __tool_h__ + + +GLOBAL VOID ngt_TrimStr PARAMS((CHAR *String )); + +GLOBAL CHAR *ngt_LowerStr PARAMS((CHAR *String )); + + +#endif + + +/* -eof- */