includes vereinfacht

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.

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

date/getindate.c

@@ -11,13 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#endif
+#include "istring.h"
 #include <time.h>
 #include <sys/types.h>
 #include <sys/timeb.h>

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

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 <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#endif
+#include "istring.h"
 #include <ctype.h>
 #include <errno.h>
 

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 <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#endif
+#include "istring.h"
 
 #include "apc_a2b.h"
 

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 <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#endif
+#include "istring.h"
 
 #define reg register
 

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 <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#endif
+#include "istring.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <fcntl.h>
-#if HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
+#include "idir.h"
 #include <errno.h>
 
 #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",

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

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 <ctype.h>
 #include <stdio.h> /* nur fuer sprintf(...) */
 #include <unistd.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#if HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
+#include "istring.h"
+#include "idir.h"
 #include <errno.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H

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

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 <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#endif
+#include "istring.h"
 #include <time.h>
 #include <stdarg.h>
 

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