This commit was generated by cvs2svn to compensate for changes in r59118,

which included commits to RCS files with non-trunk default branches.

5 files changed, 12 insertions, 8 deletions

diff --git a/contrib/opie/libmissing/Makefile.in b/contrib/opie/libmissing/Makefile.in
index 1e26e64..3da41ed 100644
--- a/contrib/opie/libmissing/Makefile.in
+++ b/contrib/opie/libmissing/Makefile.in
@@ -2,7 +2,7 @@
 # Makefile.in/Makefile: Directions for building libmissing.
 #
 # %%% copyright-cmetz-96
-# This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved.
+# This software is Copyright 1996-1998 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 <license@inner.net>.
diff --git a/contrib/opie/libmissing/endutent.c b/contrib/opie/libmissing/endutent.c
index 6e86321..0b4bd7a 100644
--- a/contrib/opie/libmissing/endutent.c
+++ b/contrib/opie/libmissing/endutent.c
@@ -1,7 +1,7 @@
 /* endutent.c: A replacement for the endutent function
 
 %%% copyright-cmetz-96
-This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved.
+This software is Copyright 1996-1998 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 <license@inner.net>.
diff --git a/contrib/opie/libmissing/getutline.c b/contrib/opie/libmissing/getutline.c
index 0ceb76b..59df92b 100644
--- a/contrib/opie/libmissing/getutline.c
+++ b/contrib/opie/libmissing/getutline.c
@@ -1,13 +1,15 @@
 /* getutline.c: A replacement for the getutline() function
 
 %%% copyright-cmetz-96
-This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved.
+This software is Copyright 1996-1998 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 <license@inner.net>.
 
         History:
 
+	Modified by cmetz for OPIE 2.32. Fixed check for fread() return
+		value.
 	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.
@@ -41,14 +43,14 @@ struct utmp *getutline FUNCTION((utmp), struct utmp *utmp)
   if (i = ttyslot()) {
     if (fseek(f, i * sizeof(struct utmp), SEEK_SET) < 0)
       goto ret;
-    if (fread(&u, sizeof(struct utmp), 1, f) != sizeof(struct utmp))
+    if (fread(&u, sizeof(struct utmp), 1, f) != 1)
       goto ret;
     fclose(f);
     return &u;
   }
 #endif /* HAVE_TTYSLOT */
 
-  while(fread(&u, sizeof(struct utmp), 1, f) == sizeof(struct utmp)) {
+  while(fread(&u, sizeof(struct utmp), 1, f) == 1) {
     if (!strncmp(utmp->ut_line, u.ut_line, sizeof(u.ut_line) - 1)) {
       fclose(f);
       return &u;
diff --git a/contrib/opie/libmissing/pututline.c b/contrib/opie/libmissing/pututline.c
index 2b79608..93f209b 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-96
-This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved.
+This software is Copyright 1996-1998 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 <license@inner.net>.
 
         History:
 
+	Modified by cmetz for OPIE 2.32. Fixed check for fread() return
+		value.
 	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.
@@ -40,7 +42,7 @@ void pututline FUNCTION((utmp), struct utmp *utmp)
   }
 #endif /* HAVE_TTYSLOT */
 
-  while(fread(&u, sizeof(struct utmp), 1, f) == sizeof(struct utmp)) {
+  while(fread(&u, sizeof(struct utmp), 1, f) == 1) {
     if (!strncmp(utmp->ut_line, u.ut_line, sizeof(u.ut_line) - 1)) {
       if ((i = ftell(f)) < 0)
         goto ret;
diff --git a/contrib/opie/libmissing/setutent.c b/contrib/opie/libmissing/setutent.c
index 740b8f6..ebb98e0 100644
--- a/contrib/opie/libmissing/setutent.c
+++ b/contrib/opie/libmissing/setutent.c
@@ -1,7 +1,7 @@
 /* setutent.c: A replacement for the setutent function
 
 %%% copyright-cmetz-96
-This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved.
+This software is Copyright 1996-1998 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 <license@inner.net>.