Small libc5 compile glitches.

diff --git a/CHANGES b/CHANGES
index 7c1973a635a76470a6a5741f5b93fa84e4419eb2..a04296ac7babb59e001cce562ee085c41f489433 100644 (file)
--- 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
 
 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 
+       <sadlowsk@Mathematik.Uni-Bielefeld.DE> 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)
 ====================================================================
 
 Changes between versions 0.4b8 and 0.4b9 (released November 5, 1999)
 ====================================================================

diff --git a/THANKS b/THANKS
index 26e643593f59609cfbf08c7fcc3c17827d6e12eb..900d186f0fc13990c4e2794ec151dae709abbb3f 100644 (file)
--- 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.
 
 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):
 
 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
 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
 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
 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 dd0a196c1630a4629ae499c432a40231e45063ef..76d40026caaca078572158c4233d57a89c90efcc 100644 (file)
--- a/compat/include/compaterr.h
+++ b/compat/include/compaterr.h
@@ -4,7 +4,7 @@
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 1999 
  *
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 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.
  */
 
  * SUCH DAMAGE.
  */
 

-#ifndef _ERR_H_
-#define        _ERR_H_
+#ifndef _COMPATERR_H_
+#define        _COMPATERR_H_

 
 #include <config.h>
 
 
 #include <config.h>
 


@@ -88,4 +88,4 @@ void          vwarnx __P((const char *, _BSD_VA_LIST_));
 #endif
 __END_DECLS
 
 #endif
 __END_DECLS
 

-#endif /* !_ERR_H_ */
+#endif /* !_COMPATERR_H_ */

diff --git a/compat/include/compatglob.h b/compat/include/compatglob.h
index 2ccbbe496741c1ed50c4479e0748142a9565e513..70a70a91d91648793c3f8c722edf376432a7fed4 100644 (file)
--- a/compat/include/compatglob.h
+++ b/compat/include/compatglob.h
@@ -4,7 +4,7 @@
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 1999 
  *
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 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.
  */
 
  * SUCH DAMAGE.
  */
 

-#ifndef _GLOB_H_
-#define        _GLOB_H_
+#ifndef _COMPATGLOB_H_
+#define        _COMPATGLOB_H_

 
 #include <config.h>
 
 
 #include <config.h>
 


@@ -98,6 +98,6 @@ int   glob __P((const char *, int, int (*)(const char *, int), glob_t *));
 void   globfree __P((glob_t *));
 __END_DECLS
 
 void   globfree __P((glob_t *));
 __END_DECLS
 

-#endif /* !_GLOB_H_ */
-

 #endif /* HAVE_GLOB */
 #endif /* HAVE_GLOB */

+
+#endif /* !_COMPATGLOB_H_ */

diff --git a/restore/tape.c b/restore/tape.c
index 754da610152cb9732c855c854209486f4466c3ff..ba772a72fff19d0ea652052c04231ec43170c2c3 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -45,7 +45,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #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 <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -566,9 +566,11 @@ extractfile(char *name)
                return (genliteraldir(name, curfile.ino));
 
        case IFLNK:
                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;
                gid_t lgid = curfile.dip->di_gid;

-
+#endif

                lnkbuf[0] = '\0';
                pathlen = 0;
                getfile(xtrlnkfile, xtrlnkskip);
                lnkbuf[0] = '\0';
                pathlen = 0;
                getfile(xtrlnkfile, xtrlnkskip);

diff --git a/rmt/rmt.c b/rmt/rmt.c
index fc1a5d1acc01a2d10ab3c5e3c5b9a8d3eea8c3bc..7d55b2d60c3c1577d157e67147e93a8a82203f98 100644 (file)
--- a/rmt/rmt.c
+++ b/rmt/rmt.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #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 */
 
 /*
 #endif /* not linux */
 
 /*


@@ -51,7 +51,9 @@ static const char rcsid[] =
 #include <sys/mtio.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/mtio.h>
 #include <errno.h>
 #include <fcntl.h>

+#ifndef __linux__

 #include <sgtty.h>
 #include <sgtty.h>

+#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>