head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.10 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.8 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.6 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.8 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.6 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.5 date 2009.11.01.14.24.32; author joerg; state dead; branches; next 1.4; 1.4 date 2005.10.03.20.34.56; author joerg; state Exp; branches; next 1.3; 1.3 date 2004.11.23.02.42.10; author tv; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.35.52; author agc; state Exp; branches; next 1.1; 1.1 date 98.06.20.23.27.49; author tv; state Exp; branches; next ; desc @@ 1.5 log @Retire archivers/zip1. It was originally needed because zip didn't include the encryption support, but that has been addressed ages ago. @ text @$NetBSD: patch-aa,v 1.4 2005/10/03 20:34:56 joerg Exp $ --- fileio.c.orig 1992-08-29 21:51:00.000000000 +0000 +++ fileio.c @@@@ -38,7 +38,6 @@@@ # define MATCH dosmatch # endif /* ?OS2 */ #else /* !MSDOS */ - extern int errno; /* error number from system functions */ # ifdef VMS # define RMDIR # define link rename @@@@ -59,16 +58,6 @@@@ #endif /* ?VMS */ -/* For now, assume DIRENT implies System V implies TERMIO */ -#ifdef DIRENT -# ifndef MINIX -# ifndef TERMIO -# define TERMIO -# endif /* !TERMIO */ -# endif /* !MINIX */ -#endif /* DIRENT */ - - #ifndef EXPORT # ifdef MSVMS # ifdef MSDOS @@@@ -77,7 +66,13 @@@@ # define getch() getc(stderr) # endif /* ?MSDOS */ # else /* !MSVMS */ -# ifdef TERMIO /* Amdahl, Cray, all SysV? */ +# if defined(TERMIOS) +# include +# define sgttyb termios +# define sg_flags c_lflag +# define GTTY(f, s) tcgetattr(f, (void *) s) +# define STTY(f, s) tcsetattr(f, TCSAFLUSH, (void *) s) +# elif defined(TERMIO) /* Amdahl, Cray, all SysV? */ # ifdef CONVEX # include # include @@@@ -99,11 +94,16 @@@@ # define GTTY gtty # define STTY stty # endif /* ?TERMIO */ +#ifdef MODERN +#include +#include +#else int isatty OF((int)); char *ttyname OF((int)); int open OF((char *, int, ...)); int close OF((int)); int read OF((int, voidp *, int)); +#endif # endif /* ?MSVMS */ #endif /* !EXPORT */ @@@@ -197,6 +197,9 @@@@ #endif /* !UTIL */ +#ifdef MODERN +#include +#else /* Library functions not in (most) header files */ char *mktemp OF((char *)); int link OF((char *, char *)); @@@@ -207,6 +210,7 @@@@ int unlink OF((char *)); * parameter is an unsigned long. */ #endif /* !CONVEX */ +#endif #ifndef UTIL /* the companion #endif is a bit of ways down ... */ @@@@ -215,11 +219,15 @@@@ int unlink OF((char *)); int utime OF((char *, time_t *)); #endif /* !__TURBOC__ */ #ifndef MSDOS +#ifdef MODERN +#include +#else int open OF((char *, int, ...)); int close OF((int)); # ifndef RMDIR int rmdir OF((char *)); # endif /* !RMDIR */ +#endif #endif /* !MSDOS */ @ 1.4 log @Don't define errno locally. Thread DragonFly like Linux and Darwin for defines. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @nb1: Turn on encryption by default for same reasons as was done to archivers/zip way back in 2000. Add modern termios support to make the encryption code build on more platforms. @ text @d3 1 a3 1 --- fileio.c.orig Sat Aug 29 21:51:00 1992 d5 9 a13 1 @@@@ -59,16 +59,6 @@@@ d30 1 a30 1 @@@@ -77,7 +67,13 @@@@ d45 1 a45 1 @@@@ -99,11 +95,16 @@@@ d62 1 a62 1 @@@@ -197,6 +198,9 @@@@ d72 1 a72 1 @@@@ -207,6 +211,7 @@@@ int unlink OF((char *)); d80 1 a80 1 @@@@ -215,11 +220,15 @@@@ int unlink OF((char *)); @ 1.2 log @Add NetBSD RCS Ids. @ text @d4 1 a4 1 +++ fileio.c Sat Jun 20 17:26:18 1998 d22 16 a37 1 @@@@ -99,11 +89,16 @@@@ d54 1 a54 1 @@@@ -197,6 +192,9 @@@@ d64 1 a64 1 @@@@ -207,6 +205,7 @@@@ d72 1 a72 1 @@@@ -215,11 +214,15 @@@@ @ 1.1 log @Add and enable zip1 (PKZIP 1.x compatible zip), with encryption support. Not conflicting with `zip' program. @ text @d1 2 @