From a95c4c36f95b3a959bf31d5d9aa9528f7e12ab99 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Thu, 11 Nov 1999 16:13:57 +0000 Subject: [PATCH] Small libc5 compile glitches. --- CHANGES | 7 +++++-- THANKS | 5 ++++- compat/include/compaterr.h | 8 ++++---- compat/include/compatglob.h | 10 +++++----- restore/tape.c | 8 +++++--- rmt/rmt.c | 4 +++- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index 7c1973a..a04296a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,11 +1,14 @@ -$Id: CHANGES,v 1.14 1999/11/07 18:53:33 tiniou Exp $ +$Id: CHANGES,v 1.15 1999/11/11 16:13:57 tiniou Exp $ Changes between versions 0.4b9 and 0.4b10 (released ???????????????) ==================================================================== 1. Make configure test if the system glob routines support extended syntax (ALTDIRFUNC). If not, use the internal glob - routines instead of system ones. + routines instead of system ones. Thanks to Bernhard Sadlowski + for reporting the bug + and helping me resolve this and other minor libc5 compiling + glitches. Changes between versions 0.4b8 and 0.4b9 (released November 5, 1999) ==================================================================== diff --git a/THANKS b/THANKS index 26e6435..900d186 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -$Id: THANKS,v 1.7 1999/10/22 18:12:26 tiniou Exp $ +$Id: THANKS,v 1.8 1999/11/11 16:13:57 tiniou Exp $ Dump and restore were written by the people of the CSRG at the University of California, Berkeley. @@ -22,6 +22,7 @@ Thanks to people who reported problems with the port, sent patches, and suggested various improvements. Here is a partial list of them (if I have forgotten someone, please complain): +Stephen Carr sgcarr@civeng.adelaide.edu.au Abhijit Dasgupta abhijit@ans.net Eirik Fuller eirik@netcom.com Henry Katz hkatz@hkatz.dialup.access.net @@ -34,6 +35,8 @@ David Monro davidm@cs.su.oz.au Lukas Nellen L.Nellen@ThPhys.Uni-Heidelberg.DE Nuno Oliveira nuno@eq.uc.pt Brent Olson night@halcyon.com +Bernhard Sadlowski sadlowsk@Mathematik.Uni-Bielefeld.DE +Chris Siebenmann cks@utcc.utoronto.ca Bob Snyder rsnyder@janet.advsys.com Stephen Tweedie sct@dcs.ed.ac.uk Daniel Veillard Daniel.Veillard@imag.fr diff --git a/compat/include/compaterr.h b/compat/include/compaterr.h index dd0a196..76d4002 100644 --- a/compat/include/compaterr.h +++ b/compat/include/compaterr.h @@ -4,7 +4,7 @@ * Remy Card , 1994-1997 * Stelian Pop , 1999 * - * $Id: compaterr.h,v 1.4 1999/10/13 09:57:18 stelian Exp $ + * $Id: compaterr.h,v 1.5 1999/11/11 16:14:01 tiniou Exp $ */ /*- @@ -40,8 +40,8 @@ * SUCH DAMAGE. */ -#ifndef _ERR_H_ -#define _ERR_H_ +#ifndef _COMPATERR_H_ +#define _COMPATERR_H_ #include @@ -88,4 +88,4 @@ void vwarnx __P((const char *, _BSD_VA_LIST_)); #endif __END_DECLS -#endif /* !_ERR_H_ */ +#endif /* !_COMPATERR_H_ */ diff --git a/compat/include/compatglob.h b/compat/include/compatglob.h index 2ccbbe4..70a70a9 100644 --- a/compat/include/compatglob.h +++ b/compat/include/compatglob.h @@ -4,7 +4,7 @@ * Remy Card , 1994-1997 * Stelian Pop , 1999 * - * $Id: compatglob.h,v 1.3 1999/10/13 09:57:18 stelian Exp $ + * $Id: compatglob.h,v 1.4 1999/11/11 16:14:01 tiniou Exp $ */ /* @@ -43,8 +43,8 @@ * SUCH DAMAGE. */ -#ifndef _GLOB_H_ -#define _GLOB_H_ +#ifndef _COMPATGLOB_H_ +#define _COMPATGLOB_H_ #include @@ -98,6 +98,6 @@ int glob __P((const char *, int, int (*)(const char *, int), glob_t *)); void globfree __P((glob_t *)); __END_DECLS -#endif /* !_GLOB_H_ */ - #endif /* HAVE_GLOB */ + +#endif /* !_COMPATGLOB_H_ */ diff --git a/restore/tape.c b/restore/tape.c index 754da61..ba772a7 100644 --- a/restore/tape.c +++ b/restore/tape.c @@ -45,7 +45,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.7 1999/11/05 22:02:19 tiniou Exp $"; + "$Id: tape.c,v 1.8 1999/11/11 16:14:01 tiniou Exp $"; #endif /* not lint */ #include @@ -566,9 +566,11 @@ extractfile(char *name) return (genliteraldir(name, curfile.ino)); case IFLNK: - { uid_t luid = curfile.dip->di_uid; + { +#ifdef HAVE_LCHOWN + uid_t luid = curfile.dip->di_uid; gid_t lgid = curfile.dip->di_gid; - +#endif lnkbuf[0] = '\0'; pathlen = 0; getfile(xtrlnkfile, xtrlnkskip); diff --git a/rmt/rmt.c b/rmt/rmt.c index fc1a5d1..7d55b2d 100644 --- a/rmt/rmt.c +++ b/rmt/rmt.c @@ -40,7 +40,7 @@ #ifndef lint static const char rcsid[] = - "$Id: rmt.c,v 1.6 1999/10/13 09:57:22 stelian Exp $"; + "$Id: rmt.c,v 1.7 1999/11/11 16:14:01 tiniou Exp $"; #endif /* not linux */ /* @@ -51,7 +51,9 @@ static const char rcsid[] = #include #include #include +#ifndef __linux__ #include +#endif #include #include #include -- 2.39.5