[src/trunk]: src/usr.sbin/ndbootd Merge in ndbootd-0.5.

[fredette <fredette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa3bb11cb587
branches:  trunk
changeset: 511176:fa3bb11cb587
user:      fredette <fredette%NetBSD.org@localhost>
date:      Wed Jun 13 21:38:30 2001 +0000

description:
Merge in ndbootd-0.5.

diffstat:

 usr.sbin/ndbootd/README    |   4 ++--
 usr.sbin/ndbootd/config.h  |   4 ++--
 usr.sbin/ndbootd/ndbootd.c |  15 ++++++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r b9adfada49fe -r fa3bb11cb587 usr.sbin/ndbootd/README
--- a/usr.sbin/ndbootd/README   Wed Jun 13 21:35:57 2001 +0000
+++ b/usr.sbin/ndbootd/README   Wed Jun 13 21:38:30 2001 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: README,v 1.2 2001/05/22 14:41:59 fredette Exp $
+#      $NetBSD: README,v 1.3 2001/06/13 21:38:30 fredette Exp $
 
-README for ndbootd-0.1
+README for ndbootd-0.5
 
 Copyright (c) 2001 Matthew Fredette.  All rights reserved.
 
diff -r b9adfada49fe -r fa3bb11cb587 usr.sbin/ndbootd/config.h
--- a/usr.sbin/ndbootd/config.h Wed Jun 13 21:35:57 2001 +0000
+++ b/usr.sbin/ndbootd/config.h Wed Jun 13 21:38:30 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.h,v 1.3 2001/05/23 02:59:35 fredette Exp $      */
+/*     $NetBSD: config.h,v 1.4 2001/06/13 21:38:30 fredette Exp $      */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -70,5 +70,5 @@
 #define PACKAGE "ndbootd"
 
 /* Version number of package */
-#define VERSION "0.4"
+#define VERSION "0.5"
 
diff -r b9adfada49fe -r fa3bb11cb587 usr.sbin/ndbootd/ndbootd.c
--- a/usr.sbin/ndbootd/ndbootd.c        Wed Jun 13 21:35:57 2001 +0000
+++ b/usr.sbin/ndbootd/ndbootd.c        Wed Jun 13 21:38:30 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ndbootd.c,v 1.3 2001/05/23 02:59:35 fredette Exp $     */
+/*     $NetBSD: ndbootd.c,v 1.4 2001/06/13 21:38:30 fredette Exp $     */
 
 /* ndbootd.c - the Sun Network Disk (nd) daemon: */
 
@@ -25,10 +25,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* <<Header: /data/home/fredette/project/THE-WEIGHT-CVS/ndbootd/ndbootd.c,v 1.8 2001/05/23 02:35:36 fredette Exp >> */
+/* <<Header: /data/home/fredette/project/THE-WEIGHT-CVS/ndbootd/ndbootd.c,v 1.9 2001/06/13 21:19:11 fredette Exp >> */
 
 /*
  * <<Log: ndbootd.c,v >>
+ * Revision 1.9  2001/06/13 21:19:11  fredette
+ * (main): Don't assume that a successful, but short, read
+ * leaves a zero in errno.  Instead, just check for the short
+ * read by looking at the byte count that read returned.
+ *
  * Revision 1.8  2001/05/23 02:35:36  fredette
  * Changed many debugging printfs to compile quietly on the
  * alpha.  Patch from Andrew Brown <atatat%atatdot.net@localhost>.
@@ -72,7 +77,7 @@
  *
  */
 
-static const char _ndbootd_c_rcsid[] = "<<Id: ndbootd.c,v 1.8 2001/05/23 02:35:36 fredette Exp >>";
+static const char _ndbootd_c_rcsid[] = "<<Id: ndbootd.c,v 1.9 2001/06/13 21:19:11 fredette Exp >>";
 
 /* includes: */
 #include "ndbootd.h"
@@ -866,7 +871,7 @@
                                         * first-stage boot program is a
                                         * multiple of NDBOOT_BSIZE: */
                                        if (byte_count_read != byte_count_wanted
-                                           && errno == 0
+                                           && byte_count_read > 0
                                            && file_offset + byte_count_read == boot1_byte_count) {
                                                byte_count_read = byte_count_wanted;
                                        }
@@ -914,7 +919,7 @@
                                         * second-stage boot program is a
                                         * multiple of NDBOOT_BSIZE: */
                                        if (byte_count_read != byte_count_wanted
-                                           && errno == 0
+                                           && byte_count_read > 0
                                            && file_offset + byte_count_read == boot2_byte_count) {
                                                byte_count_read = byte_count_wanted;
                                        }