From 620a15402ca567d1bb9f3ff04408b31d5195a26d Mon Sep 17 00:00:00 2001 From: ache Date: Mon, 29 Sep 1997 08:53:38 +0000 Subject: Upgrade to 2.31 --- contrib/opie/libmissing/Makefile.in | 4 ++-- contrib/opie/libmissing/endutent.c | 7 ++++--- contrib/opie/libmissing/getutline.c | 15 +++++++++++++-- contrib/opie/libmissing/pututline.c | 10 ++++++++-- 4 files changed, 27 insertions(+), 9 deletions(-) (limited to 'contrib/opie/libmissing') diff --git a/contrib/opie/libmissing/Makefile.in b/contrib/opie/libmissing/Makefile.in index e00ead3..1e26e64 100644 --- a/contrib/opie/libmissing/Makefile.in +++ b/contrib/opie/libmissing/Makefile.in @@ -1,8 +1,8 @@ ## # Makefile.in/Makefile: Directions for building libmissing. # -# %%% copyright-cmetz -# This software is Copyright 1996 by Craig Metz, All Rights Reserved. +# %%% copyright-cmetz-96 +# This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved. # The Inner Net License Version 2 applies to this software. # You should have received a copy of the license with this software. If # you didn't get a copy, you may request one from . diff --git a/contrib/opie/libmissing/endutent.c b/contrib/opie/libmissing/endutent.c index 4a4051c..6e86321 100644 --- a/contrib/opie/libmissing/endutent.c +++ b/contrib/opie/libmissing/endutent.c @@ -1,18 +1,19 @@ /* endutent.c: A replacement for the endutent function -%%% copyright-cmetz -This software is Copyright 1996 by Craig Metz, All Rights Reserved. +%%% copyright-cmetz-96 +This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 applies to this software. You should have received a copy of the license with this software. If you didn't get a copy, you may request one from . History: + Modified by cmetz for OPIE 2.31. Use VOIDRET macro. Created by cmetz for OPIE 2.3. */ #include "opie_cfg.h" #include "opie.h" -void endutent FUNCTION_NOARGS +VOIDRET endutent FUNCTION_NOARGS { } diff --git a/contrib/opie/libmissing/getutline.c b/contrib/opie/libmissing/getutline.c index 9653950..0ceb76b 100644 --- a/contrib/opie/libmissing/getutline.c +++ b/contrib/opie/libmissing/getutline.c @@ -1,13 +1,16 @@ /* getutline.c: A replacement for the getutline() function -%%% copyright-cmetz -This software is Copyright 1996 by Craig Metz, All Rights Reserved. +%%% copyright-cmetz-96 +This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 applies to this software. You should have received a copy of the license with this software. If you didn't get a copy, you may request one from . History: + Modified by cmetz for OPIE 2.31. If the OS won't tell us where + _PATH_UTMP is, play the SVID game, then use + Autoconf-discovered values. Created by cmetz for OPIE 2.3. */ @@ -18,6 +21,14 @@ you didn't get a copy, you may request one from . static struct utmp u; +#ifndef _PATH_UTMP +#ifdef UTMP_FILE +#define _PATH_UTMP UTMP_FILE +#else /* UTMP_FILE */ +#define _PATH_UTMP PATH_UTMP_AC +#endif /* UTMP_FILE */ +#endif /* _PATH_UTMP */ + struct utmp *getutline FUNCTION((utmp), struct utmp *utmp) { FILE *f; diff --git a/contrib/opie/libmissing/pututline.c b/contrib/opie/libmissing/pututline.c index 62da458..2b79608 100644 --- a/contrib/opie/libmissing/pututline.c +++ b/contrib/opie/libmissing/pututline.c @@ -1,13 +1,15 @@ /* pututline.c: A replacement for the pututline() function -%%% copyright-cmetz -This software is Copyright 1996 by Craig Metz, All Rights Reserved. +%%% copyright-cmetz-96 +This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 applies to this software. You should have received a copy of the license with this software. If you didn't get a copy, you may request one from . History: + Modified by cmetz for OPIE 2.31. If the OS won't tell us where + _PATH_UTMP is, use Autoconf-discovered values. Created by cmetz for OPIE 2.3. */ @@ -16,6 +18,10 @@ you didn't get a copy, you may request one from . #include #include "opie.h" +#ifndef _PATH_UTMP +#define _PATH_UTMP PATH_UTMP_AC +#endif /* _PATH_UTMP */ + void pututline FUNCTION((utmp), struct utmp *utmp) { FILE *f; -- cgit v1.1