head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.96 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.94 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.92 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.90 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.88 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.86 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.84 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.82 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.80 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.78 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.76 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.74 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.72 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.70 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.68 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.66 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.64 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.62 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.60 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.58 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.56 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.54 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.52 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.48 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.28 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.50 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.46 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.44 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.42 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.40 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.38 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.36 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.34 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.32 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.30 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.26 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.24 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.22 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.20 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.18 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.16 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.14 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.12 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.10 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.8 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.6 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.4 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.2 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.5.0.40 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.38 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.36 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.34 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.32 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.30 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.28 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.26 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.24 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.22 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.20 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.18 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.16 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.14 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.12 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.10 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.8 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.6 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.4 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.2 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.4.0.56 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.54 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.52 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.50 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.48 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.46 pkgsrc-2008Q1:1.4.0.44 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.42 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.40 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.38 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.36 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.34 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.32 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.30 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.28 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.26 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.24 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.22 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.20 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1997-09-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.6 date 2014.06.29.03.24.33; author dholland; state Exp; branches; next 1.5; commitid dAOCmZVKKArfNmGx; 1.5 date 2009.04.25.23.46.47; author gdt; state Exp; branches; next 1.4; 1.4 date 2000.09.04.14.54.06; author kim; state Exp; branches; next 1.3; 1.3 date 99.11.12.05.17.20; author hubertf; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.35.53; author agc; state Exp; branches; next 1.1; 1.1 date 97.10.27.02.19.08; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.27.02.19.08; author hubertf; state Exp; branches; next ; desc @@ 1.6 log @Assorted basic legacy code fixes - ctype.h stuff, implicit int, use standard headers, etc. "time_t" is not "long". Don't issue own declarations of standard functions. Should fix Solaris build. @ text @$NetBSD: patch-aa,v 1.5 2009/04/25 23:46:47 gdt Exp $ - use standard headers - don't redeclare memmove --- ar.h.orig 1993-05-01 04:04:22.000000000 +0000 +++ ar.h @@@@ -7,6 +7,7 @@@@ Adapted from "ar" archiver written by Ha ***********************************************************/ #include +#include #ifdef ANSI_HDRS # include @@@@ -15,11 +16,15 @@@@ Adapted from "ar" archiver written by Ha /* uchar should be 8 bits or more */ /* typedef unsigned char uchar; -- already in zoo.h */ +#if !(defined(__FreeBSD__) && __FreeBSD__ < 3) && !defined(__OpenBSD__) && !defined(__NetBSD__) typedef unsigned int uint; /* 16 bits or more */ #if !defined(__386BSD__) || !defined(_TYPES_H_) typedef unsigned short ushort; /* 16 bits or more */ #endif typedef unsigned long ulong; /* 32 bits or more */ +#else +# include +#endif /* T_UINT16 must be #defined in options.h to be a 16-bit unsigned integer type */ @@@@ -116,7 +121,6 @@@@ int make_tree void move_left(); #else # define MOVE_LEFT memmove - extern VOIDPTR memmove(); #endif #if 0 @ 1.5 log @Apply massive patch from PR pkgsrc/38449 by Olaf 'Rhialto' Seibert. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2000/09/04 14:54:06 kim Exp $ d3 4 a6 1 --- ar.h.orig 1993-05-01 06:04:22.000000000 +0200 d8 9 a16 1 @@@@ -15,11 +15,15 @@@@ Adapted from "ar" archiver written by Ha d32 8 @ 1.4 log @Make this compile again. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- ar.h.orig Sat May 1 00:04:22 1993 +++ ar.h Mon Sep 4 10:41:33 2000 @@@@ -15,11 +15,15 @@@@ @ 1.3 log @Fix patch fuzz insanity @ text @d3 3 a5 3 --- ./ar.h Sat May 1 06:04:22 1993 +++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/ar.h Fri Nov 12 06:19:39 1999 @@@@ -15,9 +15,11 @@@@ a12 1 +#endif d15 3 d19 2 @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 14 a16 232 *** bsd.c.old Thu Aug 8 09:34:07 1991 --- bsd.c Thu Jan 5 05:20:03 1995 *************** *** 69,76 **** } /* Function gettz() returns the offset from GMT in seconds */ ! long gettz() { #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) static long retval = INV_VALUE; /* cache, init to impossible value */ --- 69,80 ---- } /* Function gettz() returns the offset from GMT in seconds */ ! long gettz(t) ! long t; { + #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + return -localtime(&t)->tm_gmtoff; + #else #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) static long retval = INV_VALUE; /* cache, init to impossible value */ *************** *** 83,88 **** --- 87,93 ---- /* Timezone fix thanks to Bill Davidsen */ retval = tzp.tz_minuteswest * 60 - tzp.tz_dsttime * 3600L; return retval; + #endif } /* Standard UNIX-compatible time routines */ *************** *** 91,105 **** /* Standard UNIX-specific file attribute routines */ #include "nixmode.i" #ifndef SEEK_CUR # define SEEK_CUR 1 #endif /* Truncate a file. */ int zootrunc(f) FILE *f; { ! extern long lseek(); ! long seekpos; int fd = fileno(f); seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) --- 96,114 ---- /* Standard UNIX-specific file attribute routines */ #include "nixmode.i" + #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + #include + #else #ifndef SEEK_CUR # define SEEK_CUR 1 #endif + #endif /* Truncate a file. */ int zootrunc(f) FILE *f; { ! extern off_t lseek(); ! off_t seekpos; int fd = fileno(f); seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) *** misc2.c.old Thu Aug 8 09:34:48 1991 --- misc2.c Thu Jan 5 05:37:06 1995 *************** *** 314,323 **** { long diff_tz; long longtime; if (direntry->tz == NO_TZ) /* none stored */ return; ! diff_tz = (long) direntry->tz * (3600/4) - gettz(); /* diff. in seconds */ ! longtime = mstonix (direntry->date, direntry->time) + diff_tz; /* adj tz */ mstime (longtime, &direntry->date, &direntry->time); } #endif /* GETTZ */ --- 314,325 ---- { long diff_tz; long longtime; + long t; if (direntry->tz == NO_TZ) /* none stored */ return; ! t = mstonix (direntry->date, direntry->time); ! diff_tz = (long) direntry->tz * (3600/4) - gettz(t); /* diff. in seconds */ ! longtime = t + diff_tz; /* adj tz */ mstime (longtime, &direntry->date, &direntry->time); } #endif /* GETTZ */ *** nixtime.i.old Thu Aug 8 09:34:57 1991 --- nixtime.i Thu Jan 5 05:16:28 1995 *************** *** 52,58 **** long mstonix(); long gettz(); long utimbuf[2]; ! utimbuf[0] = utimbuf[1] = gettz() + mstonix (date, time); return (utime (path, utimbuf)); } --- 52,59 ---- long mstonix(); long gettz(); long utimbuf[2]; ! long t = mstonix (date, time); ! utimbuf[0] = utimbuf[1] = t + gettz(t); return (utime (path, utimbuf)); } *** zoolist.c.old Thu Aug 8 09:36:09 1991 --- zoolist.c Thu Jan 5 05:41:47 1995 *************** *** 539,548 **** { long gettz(); int diff_tz; /* timezone difference */ if (file_tz == NO_TZ) /* if no timezone stored ..*/ printf (" "); /* .. just pad with blanks */ else { ! diff_tz = (file_tz / 4) - (int) (gettz() / 3600); if (diff_tz == 0) printf (" "); /* print nothing if same */ else if (diff_tz > 0) /* else print signed difference */ --- 539,550 ---- { long gettz(); int diff_tz; /* timezone difference */ + long t; if (file_tz == NO_TZ) /* if no timezone stored ..*/ printf (" "); /* .. just pad with blanks */ else { ! time(&t); ! diff_tz = (file_tz / 4) - (int) (gettz(t) / 3600); if (diff_tz == 0) printf (" "); /* print nothing if same */ else if (diff_tz > 0) /* else print signed difference */ *** zoofns.h.bak Thu Aug 8 09:36:02 1991 --- zoofns.h Thu Jan 5 06:03:04 1995 *************** *** 94,100 **** --- 94,104 ---- void fixslash PARMS ((char *)); void makelist PARMS ((int, char *[], char *[], int, char *, char *, char *, int *)); void memerr PARMS ((unsigned int)); + #ifdef STDARG + void prterror(int level, char *format, ...); + #else void prterror PARMS ((int, char *, ...)); + #endif void rootname PARMS ((char *, char *)); void skip_files PARMS ((ZOOFILE, unsigned int *, unsigned int *, int *, char [], long *)); *** options.h.orig Sat May 1 08:27:59 1993 --- options.h Thu Jan 5 06:51:56 1995 *************** *** 96,102 **** #define NIXTIME #define NIXFNAME #define NEEDCTYP - #define NOENUM #define REN_STDC #define SETBUF #define GETTZ --- 96,101 ---- *************** *** 110,115 **** --- 109,115 ---- #define ANSI_PROTO #define VOIDPTR void * #else + #define NOENUM #define NOSTRCHR /* not really needed for 4.3BSD */ #define T_SIGNAL int #define VARARGS *** zooadd2.c.orig Sat Jul 20 02:38:10 1991 --- zooadd2.c Thu Jan 5 06:55:40 1995 *************** *** 258,269 **** register struct direntry *direntry; { #ifdef GETTZ long gettz(); #endif direntry->zoo_tag = ZOO_TAG; direntry->type = 2; /* type is now 2 */ #ifdef GETTZ ! direntry->tz = gettz() / (15 * 60); /* seconds => 15-min units */ #else direntry->tz = NO_TZ; /* timezone unknown */ #endif --- 258,272 ---- register struct direntry *direntry; { #ifdef GETTZ + long mstonix(); long gettz(); + long t; #endif direntry->zoo_tag = ZOO_TAG; direntry->type = 2; /* type is now 2 */ #ifdef GETTZ ! t = mstonix (direntry->date, direntry->time); ! direntry->tz = gettz(t) / (15 * 60); /* seconds => 15-min units */ #else direntry->tz = NO_TZ; /* timezone unknown */ #endif *** ar.h.orig Sat May 1 08:04:22 1993 --- ar.h Thu Jan 5 07:05:36 1995 *************** *** 15,23 **** --- 15,25 ---- /* uchar should be 8 bits or more */ /* typedef unsigned char uchar; -- already in zoo.h */ + #if !(defined(__FreeBSD__) && __FreeBSD__ < 3) && !defined(__OpenBSD__) && !defined(__NetBSD__) typedef unsigned int uint; /* 16 bits or more */ #if !defined(__386BSD__) || !defined(_TYPES_H_) typedef unsigned short ushort; /* 16 bits or more */ + #endif #endif typedef unsigned long ulong; /* 32 bits or more */ @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @File archivers, ports from FreeBSD @ text @@