From 2e765ccfc01f8b35a937f94bdd9911318599e9f1 Mon Sep 17 00:00:00 2001 From: dm Date: Fri, 14 Jan 2000 21:31:29 +0000 Subject: [PATCH] includes vereinfacht --- CHANGES | 4 ++ date/Makefile | 3 +- date/getindate.c | 8 +--- gate/Makefile | 89 +++++++++++++++++++++++--------------------- gate/alias.c | 14 ++----- gate/apc_a2b.c | 14 ++----- gate/atob.c | 14 ++----- gate/gtools.c | 29 ++------------- gate/iso2pc.c | 6 +-- gate/mime.c | 31 +++------------ gate/pc2iso.c | 6 +-- gate/testeda.c | 10 +---- gate/testmime.c | 4 +- gate/uuapprove.c | 14 ++----- gate/uuconv.c | 8 +--- gate/uurnews.c | 8 +--- gate/uursmtp.c | 8 +--- gate/uuwnews.c | 8 +--- gate/uuwsmtp.c | 16 +++----- gate/zconv.c | 18 +++------ hdlib/Makefile | 37 ++++++++++-------- hdlib/crc.c | 6 +-- hdlib/delheader.c | 6 +-- hdlib/find.c | 6 +-- hdlib/freepara.c | 6 +-- hdlib/gperf.prefix | 8 +--- hdlib/hash.epilogue | 4 +- hdlib/joinheader.c | 14 ++----- hdlib/rdpara.c | 14 ++----- hdlib/testheader.c | 14 ++----- hdlib/uurdpara.c | 14 ++----- hdlib/wrpara.c | 6 +-- lib/Makefile | 27 ++++++++------ lib/backup.c | 25 +------------ lib/hayes.c | 8 ++-- lib/lockwait.c | 6 +-- lib/ministat.c | 8 +--- lib/pattern.c | 14 ++----- lib/rawtty.c | 8 ++-- lib/readonedir.c | 25 +------------ lib/stccpy.c | 2 +- lib/strdup.c | 14 ++----- lib/stricmp.c | 6 +-- lib/strlwr.c | 6 +-- lib/strupr.c | 6 +-- lib/track.c | 14 ++----- lib/utility.c | 8 +--- lib/uudebug.c | 12 ++---- lib/uufatal.c | 8 ++-- lib/uulog.c | 10 ++--- online/Makefile | 13 ++++--- online/action.c | 6 +-- online/call.c | 6 +-- online/common.c | 6 +-- online/filedialog.c | 6 +-- online/filemaster.c | 6 +-- online/import.c | 17 +-------- online/januslogin.c | 2 +- online/myself.c | 6 +-- online/pingpong.c | 6 +-- online/prepare.c | 6 +-- online/prologue.c | 6 +-- online/receiver.c | 4 +- online/sysdialog.c | 6 +-- online/sysmaster.c | 6 +-- online/xprog.c | 18 +-------- rsmtp/Makefile | 5 ++- rsmtp/bsmtp.c | 2 +- rsmtp/rsmtp.c | 12 +----- tools/Makefile | 12 +++--- tools/list-systems.c | 29 ++------------- tools/zconsplit.c | 12 ++---- 72 files changed, 289 insertions(+), 557 deletions(-) diff --git a/CHANGES b/CHANGES index cadccd7..4df8a09 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,10 @@ Aenderungen an UnixConnect seit 0.88 +- include/istring.h, include/idir.h, + */*.c: (Dirk Meyer) + includes vereinfacht. + - shell/auspack.in, shell/einpack.in: (Dirk Meyer) unrar und unarj eingebaut. zip0 zip1 und zip2 werden auch erkannt. diff --git a/date/Makefile b/date/Makefile index 5a615e4..5af6c18 100644 --- a/date/Makefile +++ b/date/Makefile @@ -57,5 +57,6 @@ datelib.a: $(OBJS) # automatic depend dateabstoks.o: dateabstoks.c datetok.h -getindate.o: getindate.c datetok.h ../include/datelib.h +getindate.o: getindate.c ../include/istring.h datetok.h \ + ../include/datelib.h # eof diff --git a/date/getindate.c b/date/getindate.c index e186e56..06afaf9 100644 --- a/date/getindate.c +++ b/date/getindate.c @@ -11,13 +11,7 @@ #include #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include #include diff --git a/gate/Makefile b/gate/Makefile index 136dd61..76e3c1a 100644 --- a/gate/Makefile +++ b/gate/Makefile @@ -82,51 +82,54 @@ testeda: testeda.o $(DATELIB) Makefile $(CC) $(CFLAGS) -o testeda testeda.o $(DATELIB) $(LDFLAGS) # automatic depend -alias.o: alias.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../hdlib/hd_def.h ../hdlib/hd_nam.h \ - ../include/uulog.h ../include/alias.h ../include/sysdep.h \ - ../include/ministat.h -apc_a2b.o: apc_a2b.c ../include/apc_a2b.h -atob.o: atob.c -gtools.o: gtools.c ../include/gtools.h ../include/version.h \ - ../include/sysexits2.h +alias.o: alias.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ + ../hdlib/hd_nam.h ../include/uulog.h ../include/alias.h \ + ../include/sysdep.h ../include/ministat.h +apc_a2b.o: apc_a2b.c ../include/istring.h ../include/apc_a2b.h +atob.o: atob.c ../include/istring.h +gtools.o: gtools.c ../include/istring.h ../include/idir.h \ + ../include/gtools.h ../include/version.h ../include/sysexits2.h iso2pc.o: iso2pc.c ../include/lib.h -mime.o: mime.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/mime.h ../hdlib/hd_def.h \ - ../include/uulog.h ../include/sysexits2.h +mime.o: mime.c ../include/istring.h ../include/idir.h \ + ../include/utility.h ../include/crc.h ../include/header.h \ + ../include/mime.h ../hdlib/hd_def.h ../include/uulog.h \ + ../include/sysexits2.h pc2iso.o: pc2iso.c ../include/lib.h -testeda.o: testeda.c ../include/datelib.h +testeda.o: testeda.c ../include/istring.h ../include/datelib.h testmime.o: testmime.c -uuapprove.o: uuapprove.c ../include/utility.h ../include/uulog.h \ - ../include/uuapprove.h -uuconv.o: uuconv.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../hdlib/hd_def.h ../hdlib/hd_nam.h \ - ../include/boxstat.h ../include/version.h ../include/uulog.h \ - ../include/alias.h ../include/sysdep.h ../include/mime.h \ - ../include/uuconv.h ../include/lib.h ../include/datelib.h -uurnews.o: uurnews.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h ../hdlib/hd_nam.h \ - ../hdlib/hd_def.h ../include/boxstat.h ../include/ministat.h \ - ../include/mime.h ../include/lib.h ../include/uuconv.h \ - ../include/gtools.h ../include/sysexits2.h -uursmtp.o: uursmtp.c ../include/boxstat.h ../include/ministat.h \ - ../include/utility.h ../include/crc.h ../include/header.h \ - ../hdlib/hd_nam.h ../hdlib/hd_def.h ../include/uulog.h \ - ../include/mime.h ../include/lib.h ../include/uuconv.h \ - ../include/gtools.h ../include/sysexits2.h -uuwnews.o: uuwnews.c ../include/utility.h ../include/lib.h \ - ../include/boxstat.h ../include/ministat.h ../include/crc.h \ - ../include/header.h ../hdlib/hd_def.h ../hdlib/hd_nam.h \ - ../include/uuapprove.h ../include/uulog.h ../include/mime.h \ - ../include/zconv.h ../include/gtools.h ../include/sysexits2.h -uuwsmtp.o: uuwsmtp.c ../include/utility.h ../include/lib.h \ - ../include/boxstat.h ../include/ministat.h ../include/crc.h \ - ../include/header.h ../hdlib/hd_def.h ../hdlib/hd_nam.h \ - ../include/uulog.h ../include/mime.h ../include/zconv.h \ - ../include/gtools.h ../include/sysexits2.h -zconv.o: zconv.c ../include/utility.h ../include/lib.h \ +uuapprove.o: uuapprove.c ../include/istring.h ../include/utility.h \ + ../include/uulog.h ../include/uuapprove.h +uuconv.o: uuconv.c ../include/istring.h ../include/utility.h \ ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ - ../hdlib/hd_nam.h ../include/uulog.h ../include/alias.h \ - ../include/sysdep.h ../include/version.h ../include/boxstat.h \ - ../include/mime.h ../include/zconv.h + ../hdlib/hd_nam.h ../include/boxstat.h ../include/version.h \ + ../include/uulog.h ../include/alias.h ../include/sysdep.h \ + ../include/mime.h ../include/uuconv.h ../include/lib.h \ + ../include/datelib.h +uurnews.o: uurnews.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h \ + ../hdlib/hd_nam.h ../hdlib/hd_def.h ../include/boxstat.h \ + ../include/ministat.h ../include/mime.h ../include/lib.h \ + ../include/uuconv.h ../include/gtools.h ../include/sysexits2.h +uursmtp.o: uursmtp.c ../include/istring.h ../include/boxstat.h \ + ../include/ministat.h ../include/utility.h ../include/crc.h \ + ../include/header.h ../hdlib/hd_nam.h ../hdlib/hd_def.h \ + ../include/uulog.h ../include/mime.h ../include/lib.h \ + ../include/uuconv.h ../include/gtools.h ../include/sysexits2.h +uuwnews.o: uuwnews.c ../include/istring.h ../include/utility.h \ + ../include/lib.h ../include/boxstat.h ../include/ministat.h \ + ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ + ../hdlib/hd_nam.h ../include/uuapprove.h ../include/uulog.h \ + ../include/mime.h ../include/zconv.h ../include/gtools.h \ + ../include/sysexits2.h +uuwsmtp.o: uuwsmtp.c ../include/istring.h ../include/utility.h \ + ../include/lib.h ../include/boxstat.h ../include/ministat.h \ + ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ + ../hdlib/hd_nam.h ../include/uulog.h ../include/mime.h \ + ../include/zconv.h ../include/gtools.h ../include/sysexits2.h +zconv.o: zconv.c ../include/istring.h ../include/utility.h \ + ../include/lib.h ../include/crc.h ../include/header.h \ + ../hdlib/hd_def.h ../hdlib/hd_nam.h ../include/uulog.h \ + ../include/alias.h ../include/sysdep.h ../include/version.h \ + ../include/boxstat.h ../include/mime.h ../include/zconv.h # eof diff --git a/gate/alias.c b/gate/alias.c index 6f13249..2145915 100644 --- a/gate/alias.c +++ b/gate/alias.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -45,13 +45,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include diff --git a/gate/apc_a2b.c b/gate/apc_a2b.c index 14c698c..fdd44fd 100644 --- a/gate/apc_a2b.c +++ b/gate/apc_a2b.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1995 Moritz Both - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1995 Moritz Both + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -38,13 +38,7 @@ /* apc_a2b.c - Funktion fuer APC Binaernachrichten-Wandlung */ -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "apc_a2b.h" diff --git a/gate/atob.c b/gate/atob.c index b4c5a32..b406a87 100644 --- a/gate/atob.c +++ b/gate/atob.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1995 Moritz Both - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1995 Moritz Both + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999 2000 Dirk Meyer * * 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 @@ -47,13 +47,7 @@ Angepasst an UnixConnect von Moritz Both */ -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #define reg register diff --git a/gate/gtools.c b/gate/gtools.c index 429413c..56b0541 100644 --- a/gate/gtools.c +++ b/gate/gtools.c @@ -1,7 +1,7 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1996-99 Dirk Meyer + * Copyright (C) 1996-2000 Dirk Meyer * * 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 @@ -43,33 +43,12 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include #include #include -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif +#include "idir.h" #include #include "gtools.h" @@ -111,7 +90,7 @@ open_new_file( const char *name, const char *dir, const char *ext ) if ((statrc = stat(dir, &st)) || !S_ISDIR(st.st_mode)) { if(!statrc) errno=ENOTDIR; #ifdef ENABLE_AUTO_CREATE - if (mkdir(datei, 02775) != 0) { + if (mkdir(dir, 02775) != 0) { #endif fprintf( stderr, "%s: error create file in output dir %s: %s\n", diff --git a/gate/iso2pc.c b/gate/iso2pc.c index bcc783d..8070180 100644 --- a/gate/iso2pc.c +++ b/gate/iso2pc.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/gate/mime.c b/gate/mime.c index a4ab35b..7e51366 100644 --- a/gate/mime.c +++ b/gate/mime.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1995 Moritz Both - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1995 Moritz Both + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -47,29 +47,8 @@ #include #include /* nur fuer sprintf(...) */ #include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif +#include "istring.h" +#include "idir.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/gate/pc2iso.c b/gate/pc2iso.c index 86cd6cf..e1d13eb 100644 --- a/gate/pc2iso.c +++ b/gate/pc2iso.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/gate/testeda.c b/gate/testeda.c index 7219560..7be2b6b 100644 --- a/gate/testeda.c +++ b/gate/testeda.c @@ -1,7 +1,7 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1996-99 Dirk Meyer + * Copyright (C) 1996-2000 Dirk Meyer * * 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 @@ -36,13 +36,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include diff --git a/gate/testmime.c b/gate/testmime.c index ae010df..79e6bc5 100644 --- a/gate/testmime.c +++ b/gate/testmime.c @@ -1,8 +1,8 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/gate/uuapprove.c b/gate/uuapprove.c index afb48bd..3258d9c 100644 --- a/gate/uuapprove.c +++ b/gate/uuapprove.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -44,13 +44,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include "utility.h" diff --git a/gate/uuconv.c b/gate/uuconv.c index 07fb4d5..eed8a92 100644 --- a/gate/uuconv.c +++ b/gate/uuconv.c @@ -46,13 +46,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/gate/uurnews.c b/gate/uurnews.c index 4fe82aa..ad48100 100644 --- a/gate/uurnews.c +++ b/gate/uurnews.c @@ -47,13 +47,7 @@ #include #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include diff --git a/gate/uursmtp.c b/gate/uursmtp.c index 5659243..eeaefd3 100644 --- a/gate/uursmtp.c +++ b/gate/uursmtp.c @@ -47,13 +47,7 @@ #include #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include diff --git a/gate/uuwnews.c b/gate/uuwnews.c index 68db945..3087d36 100644 --- a/gate/uuwnews.c +++ b/gate/uuwnews.c @@ -45,13 +45,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #ifdef HAVE_LIMITS_H #include diff --git a/gate/uuwsmtp.c b/gate/uuwsmtp.c index 77df32c..a1327b7 100644 --- a/gate/uuwsmtp.c +++ b/gate/uuwsmtp.c @@ -1,10 +1,10 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Andreas Barth, Option "-p" - * Copyright (C) 1996-99 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999 Andreas Barth, Option "-p" + * Copyright (C) 1996-2000 Dirk Meyer * * 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 @@ -45,13 +45,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include #include diff --git a/gate/zconv.c b/gate/zconv.c index cc92c4b..f301607 100644 --- a/gate/zconv.c +++ b/gate/zconv.c @@ -1,11 +1,11 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Andreas Barth, Pfad bei Pointsystemen - * Copyright (C) 1999 Moritz Both - * Copyright (C) 1996-99 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999 Andreas Barth, Pfad bei Pointsystemen + * Copyright (C) 1999 Moritz Both + * Copyright (C) 1996-2000 Dirk Meyer * * 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 @@ -46,13 +46,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include diff --git a/hdlib/Makefile b/hdlib/Makefile index 25a99f4..8c115ff 100644 --- a/hdlib/Makefile +++ b/hdlib/Makefile @@ -117,22 +117,27 @@ delheader.o: delheader.c ../include/crc.h ../include/header.h \ find.o: find.c ../include/crc.h ../include/header.h freepara.o: freepara.c ../include/crc.h ../include/header.h \ ../include/utility.h -hash.o: hash.c hd_def.h ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h hd_nam.h hd_nlist.h -joinheader.o: joinheader.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h -pkread.o: pkread.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h +hash.o: hash.c ../include/istring.h hd_def.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h hd_nam.h \ + hd_nlist.h +joinheader.o: joinheader.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h +pkread.o: pkread.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h pkwrite.o: pkwrite.c ../include/crc.h ../include/header.h hd_nam.h -rdpara.o: rdpara.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h -smtprd.o: smtprd.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h ../include/sysexits2.h -testheader.o: testheader.c ../include/utility.h ../include/uulog.h \ - ../include/crc.h ../include/header.h hd_def.h hd_nam.h -uurd.o: uurd.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h ../include/sysexits2.h -uurdpara.o: uurdpara.c ../include/utility.h ../include/crc.h \ - ../include/header.h ../include/uulog.h ../include/sysexits2.h +rdpara.o: rdpara.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h +smtprd.o: smtprd.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h \ + ../include/sysexits2.h +testheader.o: testheader.c ../include/istring.h ../include/utility.h \ + ../include/uulog.h ../include/crc.h ../include/header.h hd_def.h \ + hd_nam.h +uurd.o: uurd.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h \ + ../include/sysexits2.h +uurdpara.o: uurdpara.c ../include/istring.h ../include/utility.h \ + ../include/crc.h ../include/header.h ../include/uulog.h \ + ../include/sysexits2.h wrpara.o: wrpara.c ../include/crc.h ../include/header.h hd_nam.h # eof diff --git a/hdlib/crc.c b/hdlib/crc.c index 0aec849..6ee79b0 100644 --- a/hdlib/crc.c +++ b/hdlib/crc.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/hdlib/delheader.c b/hdlib/delheader.c index 67aba72..44899ef 100644 --- a/hdlib/delheader.c +++ b/hdlib/delheader.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/hdlib/find.c b/hdlib/find.c index 369e6d9..4df14bc 100644 --- a/hdlib/find.c +++ b/hdlib/find.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/hdlib/freepara.c b/hdlib/freepara.c index 0e33eac..4c8ceb8 100644 --- a/hdlib/freepara.c +++ b/hdlib/freepara.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/hdlib/gperf.prefix b/hdlib/gperf.prefix index d2f9ed5..8d5f2d4 100644 --- a/hdlib/gperf.prefix +++ b/hdlib/gperf.prefix @@ -1,11 +1,5 @@ %{ -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "hd_def.h" %} struct predefd { const char *header; int code; }; diff --git a/hdlib/hash.epilogue b/hdlib/hash.epilogue index bb05f22..ab04a6b 100644 --- a/hdlib/hash.epilogue +++ b/hdlib/hash.epilogue @@ -1,8 +1,8 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/hdlib/joinheader.c b/hdlib/joinheader.c index ce4b61c..ac2c1a3 100644 --- a/hdlib/joinheader.c +++ b/hdlib/joinheader.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -46,13 +46,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "utility.h" #include "crc.h" diff --git a/hdlib/rdpara.c b/hdlib/rdpara.c index 4abb03b..2b439c0 100644 --- a/hdlib/rdpara.c +++ b/hdlib/rdpara.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -46,13 +46,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include "utility.h" diff --git a/hdlib/testheader.c b/hdlib/testheader.c index 7dedd43..8f16ed2 100644 --- a/hdlib/testheader.c +++ b/hdlib/testheader.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-95 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1995 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -39,13 +39,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "utility.h" #include "uulog.h" diff --git a/hdlib/uurdpara.c b/hdlib/uurdpara.c index d228c0e..ae37425 100644 --- a/hdlib/uurdpara.c +++ b/hdlib/uurdpara.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -56,13 +56,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include "utility.h" diff --git a/hdlib/wrpara.c b/hdlib/wrpara.c index 2f5e93f..85b1095 100644 --- a/hdlib/wrpara.c +++ b/hdlib/wrpara.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/lib/Makefile b/lib/Makefile index 68b94fb..4fb4ab6 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -72,27 +72,29 @@ strlib.a: $(STROBJS) Makefile $(RANLIB) strlib.a # automatic depend -backup.o: backup.c ../include/utility.h ../include/calllib.h \ - ../include/uulog.h ../include/uudebug.h +backup.o: backup.c ../include/idir.h ../include/istring.h \ + ../include/utility.h ../include/calllib.h ../include/uulog.h \ + ../include/uudebug.h ../include/ministat.h hayes.o: hayes.c ../include/config.h ../include/sysdep.h \ ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ ../hdlib/hd_nam.h ../include/ministat.h ../include/hayes.h \ ../include/track.h lockwait.o: lockwait.c ../include/config.h ../include/sysdep.h \ ../include/utility.h -ministat.o: ministat.c ../include/utility.h ../include/boxstat.h \ - ../include/crc.h ../include/header.h ../hdlib/hd_nam.h \ - ../hdlib/hd_def.h ../include/uulog.h ../include/ministat.h +ministat.o: ministat.c ../include/istring.h ../include/utility.h \ + ../include/boxstat.h ../include/crc.h ../include/header.h \ + ../hdlib/hd_nam.h ../hdlib/hd_def.h ../include/uulog.h \ + ../include/ministat.h pattern.o: pattern.c ../include/config.h ../include/sysdep.h \ - ../include/utility.h ../include/pattern.h + ../include/istring.h ../include/utility.h ../include/pattern.h rawtty.o: rawtty.c ../include/config.h ../include/sysdep.h \ ../include/line.h -readonedir.o: readonedir.c ../include/utility.h ../include/calllib.h \ - ../include/uulog.h +readonedir.o: readonedir.c ../include/idir.h ../include/istring.h \ + ../include/utility.h ../include/calllib.h ../include/uulog.h stccpy.o: stccpy.c ../include/config.h ../include/sysdep.h \ ../include/utility.h strdup.o: strdup.c ../include/config.h ../include/sysdep.h \ - ../include/utility.h ../include/uulog.h + ../include/istring.h ../include/utility.h ../include/uulog.h stricmp.o: stricmp.c ../include/config.h ../include/sysdep.h \ ../include/utility.h strlwr.o: strlwr.c ../include/config.h ../include/sysdep.h \ @@ -100,13 +102,14 @@ strlwr.o: strlwr.c ../include/config.h ../include/sysdep.h \ strupr.o: strupr.c ../include/config.h ../include/sysdep.h \ ../include/utility.h track.o: track.c ../include/config.h ../include/sysdep.h \ - ../include/utility.h ../include/track.h + ../include/istring.h ../include/utility.h ../include/track.h trap.o: trap.c ../include/config.h ../include/sysdep.h \ ../include/trap.h ../include/ministat.h utility.o: utility.c ../include/config.h ../include/sysdep.h \ - ../include/boxstat.h ../include/uulog.h ../include/utility.h + ../include/istring.h ../include/boxstat.h ../include/uulog.h \ + ../include/utility.h uudebug.o: uudebug.c ../include/config.h ../include/sysdep.h \ - ../include/uulog.h ../include/uudebug.h + ../include/istring.h ../include/uulog.h ../include/uudebug.h uufatal.o: uufatal.c ../include/uulog.h ../include/sysexits2.h uulog.o: uulog.c ../include/uulog.h # eof diff --git a/lib/backup.c b/lib/backup.c index 7c5eefe..28f7921 100644 --- a/lib/backup.c +++ b/lib/backup.c @@ -55,35 +55,14 @@ #include #include #include -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif +#include "idir.h" #ifdef HAVE_SYS_FCNTL_H #include #endif #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif +#include "istring.h" #include #include diff --git a/lib/hayes.c b/lib/hayes.c index 521f4e9..5638772 100644 --- a/lib/hayes.c +++ b/lib/hayes.c @@ -1,10 +1,10 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer - * Copyright (C) 1999 Matthias Andree + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999 Matthias Andree + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/lib/lockwait.c b/lib/lockwait.c index 53b308f..366259a 100644 --- a/lib/lockwait.c +++ b/lib/lockwait.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/lib/ministat.c b/lib/ministat.c index ac2c729..c2c6b8f 100644 --- a/lib/ministat.c +++ b/lib/ministat.c @@ -58,13 +58,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include "utility.h" diff --git a/lib/pattern.c b/lib/pattern.c index d78cdd9..959461b 100644 --- a/lib/pattern.c +++ b/lib/pattern.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -49,13 +49,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "utility.h" #include "pattern.h" diff --git a/lib/rawtty.c b/lib/rawtty.c index 1ad90f5..f320b10 100644 --- a/lib/rawtty.c +++ b/lib/rawtty.c @@ -1,10 +1,10 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer - * Copyright (C) 1999 Matthias Andree + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1999 Matthias Andree * * 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 diff --git a/lib/readonedir.c b/lib/readonedir.c index 95cb8e7..32df87d 100644 --- a/lib/readonedir.c +++ b/lib/readonedir.c @@ -47,35 +47,14 @@ #include #include #include -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif +#include "idir.h" #ifdef HAVE_SYS_FCNTL_H #include #endif #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif +#include "istring.h" #include "utility.h" #include "calllib.h" diff --git a/lib/stccpy.c b/lib/stccpy.c index a5bc572..bdfdc0a 100644 --- a/lib/stccpy.c +++ b/lib/stccpy.c @@ -1,7 +1,7 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1999 Matthias Andree + * Copyright (C) 1999 Matthias Andree * * 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 diff --git a/lib/strdup.c b/lib/strdup.c index 5d61d62..b4f75c3 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -50,13 +50,7 @@ #include "config.h" -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif +#include "istring.h" #include "utility.h" #include "uulog.h" diff --git a/lib/stricmp.c b/lib/stricmp.c index 4551c9b..f319c30 100644 --- a/lib/stricmp.c +++ b/lib/stricmp.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/lib/strlwr.c b/lib/strlwr.c index 0677ca2..bb89bd3 100644 --- a/lib/strlwr.c +++ b/lib/strlwr.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/lib/strupr.c b/lib/strupr.c index b10ed14..8c62a24 100644 --- a/lib/strupr.c +++ b/lib/strupr.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/lib/track.c b/lib/track.c index 60447c2..2a5941b 100644 --- a/lib/track.c +++ b/lib/track.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -49,13 +49,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "utility.h" #include "track.h" diff --git a/lib/utility.c b/lib/utility.c index 5a34940..c6331af 100644 --- a/lib/utility.c +++ b/lib/utility.c @@ -45,13 +45,7 @@ #include "config.h" #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "boxstat.h" #include "uulog.h" diff --git a/lib/uudebug.c b/lib/uudebug.c index be81ee9..869799e 100644 --- a/lib/uudebug.c +++ b/lib/uudebug.c @@ -1,8 +1,8 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1999 Matthias Andree - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1999 Matthias Andree + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -49,13 +49,7 @@ #include #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include "uulog.h" #include "uudebug.h" diff --git a/lib/uufatal.c b/lib/uufatal.c index e83ac38..87a1f74 100644 --- a/lib/uufatal.c +++ b/lib/uufatal.c @@ -1,10 +1,10 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1994 Peter Much - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1994 Peter Much + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/lib/uulog.c b/lib/uulog.c index 32198d1..8492011 100644 --- a/lib/uulog.c +++ b/lib/uulog.c @@ -1,11 +1,11 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1994 Peter Much - * Copyright (C) 1999 Andreas Barth - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1994 Peter Much + * Copyright (C) 1999 Andreas Barth + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/Makefile b/online/Makefile index c2557d4..6022c9d 100644 --- a/online/Makefile +++ b/online/Makefile @@ -101,14 +101,14 @@ import.o: import.c ../include/config.h ../include/sysdep.h zconnect.h \ ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ ../hdlib/hd_nam.h ../include/version.h ../include/track.h \ ../include/line.h ../include/boxstat.h ../include/ministat.h \ - ../include/uulog.h ../include/utility.h ../include/xprog.h \ - ../include/calllib.h ../include/uudebug.h + ../include/uulog.h ../include/idir.h ../include/utility.h \ + ../include/xprog.h ../include/calllib.h ../include/uudebug.h januslogin.o: januslogin.c ../include/config.h ../include/sysdep.h \ zconnect.h ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ ../hdlib/hd_nam.h ../include/version.h ../include/track.h \ ../include/line.h ../include/boxstat.h ../include/ministat.h \ - ../include/uulog.h ../include/utility.h ../include/xprog.h \ - locknames.h + ../include/uulog.h ../include/idir.h ../include/utility.h \ + ../include/xprog.h locknames.h ../include/calllib.h lock.o: lock.c ../include/config.h ../include/sysdep.h zconnect.h \ ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ ../hdlib/hd_nam.h ../include/version.h ../include/track.h \ @@ -156,6 +156,7 @@ sysmaster.o: sysmaster.c ../include/config.h ../include/sysdep.h \ ../include/line.h ../include/boxstat.h ../include/ministat.h \ ../include/uulog.h ../include/utility.h xprog.o: xprog.c ../include/config.h ../include/sysdep.h \ - ../include/utility.h ../include/boxstat.h ../include/ministat.h \ - ../include/xprog.h ../include/uudebug.h + ../include/iwait.h ../include/istring.h ../include/utility.h \ + ../include/boxstat.h ../include/ministat.h ../include/xprog.h \ + ../include/uudebug.h ../include/uulog.h # eof diff --git a/online/action.c b/online/action.c index b31f4fd..a60702f 100644 --- a/online/action.c +++ b/online/action.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/call.c b/online/call.c index 7b3faea..8e8d220 100644 --- a/online/call.c +++ b/online/call.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1999 Dirk Meyer - * Copyright (C) 1999 Matthias Andree + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1999 Matthias Andree * * 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 diff --git a/online/common.c b/online/common.c index 8005bb5..3eab739 100644 --- a/online/common.c +++ b/online/common.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/filedialog.c b/online/filedialog.c index c13036b..6429f87 100644 --- a/online/filedialog.c +++ b/online/filedialog.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/filemaster.c b/online/filemaster.c index 15a71e7..85ff6fe 100644 --- a/online/filemaster.c +++ b/online/filemaster.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/import.c b/online/import.c index 59692ab..0002421 100644 --- a/online/import.c +++ b/online/import.c @@ -55,22 +55,7 @@ #include #include #include -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif +#include "idir.h" #ifdef HAVE_SYS_FCNTL_H #include #endif diff --git a/online/januslogin.c b/online/januslogin.c index 1448aa1..c210d75 100644 --- a/online/januslogin.c +++ b/online/januslogin.c @@ -58,7 +58,7 @@ #endif #include #include -#include +#include "idir.h" #include "utility.h" #include "xprog.h" diff --git a/online/myself.c b/online/myself.c index a1030b1..607f068 100644 --- a/online/myself.c +++ b/online/myself.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/pingpong.c b/online/pingpong.c index 3eba775..8743a3b 100644 --- a/online/pingpong.c +++ b/online/pingpong.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/prepare.c b/online/prepare.c index 87bad92..b957b5b 100644 --- a/online/prepare.c +++ b/online/prepare.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995-98 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995-1998 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/prologue.c b/online/prologue.c index 46bbb79..8df28c6 100644 --- a/online/prologue.c +++ b/online/prologue.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/receiver.c b/online/receiver.c index b7494dd..6bb3755 100644 --- a/online/receiver.c +++ b/online/receiver.c @@ -1,8 +1,8 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/sysdialog.c b/online/sysdialog.c index 74dedcb..6c93db7 100644 --- a/online/sysdialog.c +++ b/online/sysdialog.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/sysmaster.c b/online/sysmaster.c index 8cf0154..c19b783 100644 --- a/online/sysmaster.c +++ b/online/sysmaster.c @@ -1,9 +1,9 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1995 Christopher Creutzig - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1995 Christopher Creutzig + * Copyright (C) 1999-2000 Dirk Meyer * * 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 diff --git a/online/xprog.c b/online/xprog.c index 7cc8e59..cef9b60 100644 --- a/online/xprog.c +++ b/online/xprog.c @@ -44,28 +44,14 @@ #include #include #include -#if HAVE_SYS_WAIT_H -# include -#endif -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif +#include "iwait.h" #ifdef HAVE_SYS_FCNTL_H #include #endif #ifdef HAVE_UNISTD_H #include #endif -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include #include diff --git a/rsmtp/Makefile b/rsmtp/Makefile index d5d7cbe..550f089 100644 --- a/rsmtp/Makefile +++ b/rsmtp/Makefile @@ -65,6 +65,7 @@ $(BINDIR)/bsmtp: bsmtp # end of makefile # automatic depend -bsmtp.o: bsmtp.c ../include/sysexits2.h version.h -rsmtp.o: rsmtp.c ../include/sysexits2.h version.h +bsmtp.o: bsmtp.c ../include/istring.h ../include/sysexits2.h version.h +rsmtp.o: rsmtp.c ../include/istring.h ../include/iwait.h \ + ../include/sysexits2.h version.h # eof diff --git a/rsmtp/bsmtp.c b/rsmtp/bsmtp.c index ae56f3d..9ba129f 100644 --- a/rsmtp/bsmtp.c +++ b/rsmtp/bsmtp.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include "istring.h" #include #include #include diff --git a/rsmtp/rsmtp.c b/rsmtp/rsmtp.c index 7ee9000..a0cb0d9 100644 --- a/rsmtp/rsmtp.c +++ b/rsmtp/rsmtp.c @@ -51,20 +51,12 @@ #include #include -#include +#include "istring.h" #include #include #include #include -#if HAVE_SYS_WAIT_H -# include -#endif -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif +#include "iwait.h" /*---------------------------------------------------------------------------* * configuration diff --git a/tools/Makefile b/tools/Makefile index 04218bb..210c567 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -62,11 +62,11 @@ zconsplit: zconsplit.o $(LIBS) Makefile # automatic depend list-systems.o: list-systems.c ../include/config.h ../include/sysdep.h \ - ../include/utility.h ../include/crc.h ../include/header.h \ - ../hdlib/hd_def.h ../hdlib/hd_nam.h ../include/boxstat.h \ - ../include/ministat.h -zconsplit.o: zconsplit.c ../include/config.h ../include/sysdep.h \ + ../include/istring.h ../include/idir.h ../include/utility.h \ ../include/crc.h ../include/header.h ../hdlib/hd_def.h \ - ../hdlib/hd_nam.h ../include/boxstat.h ../include/ministat.h \ - ../include/utility.h + ../hdlib/hd_nam.h ../include/boxstat.h ../include/ministat.h +zconsplit.o: zconsplit.c ../include/config.h ../include/sysdep.h \ + ../include/istring.h ../include/crc.h ../include/header.h \ + ../hdlib/hd_def.h ../hdlib/hd_nam.h ../include/boxstat.h \ + ../include/ministat.h ../include/utility.h # eof diff --git a/tools/list-systems.c b/tools/list-systems.c index 26c9166..e7b8505 100644 --- a/tools/list-systems.c +++ b/tools/list-systems.c @@ -1,8 +1,8 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -46,29 +46,8 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif -#if HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif +#include "istring.h" +#include "idir.h" #include "utility.h" #include "crc.h" diff --git a/tools/zconsplit.c b/tools/zconsplit.c index b0b8707..20f77d6 100644 --- a/tools/zconsplit.c +++ b/tools/zconsplit.c @@ -1,8 +1,8 @@ /* $Id$ */ /* * UNIX-Connect, a ZCONNECT(r) Transport and Gateway/Relay. - * Copyright (C) 1993-94 Martin Husemann - * Copyright (C) 1999 Dirk Meyer + * Copyright (C) 1993-1994 Martin Husemann + * Copyright (C) 1999-2000 Dirk Meyer * * 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 @@ -49,13 +49,7 @@ #include #include -#ifdef HAVE_STRING_H -# include -#else -#ifdef HAVE_STRINGS_H -# include -#endif -#endif +#include "istring.h" #include #include #include