Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in ndbootd-0.5.

This commit is contained in:
fredette 2001-06-13 21:38:30 +00:00
parent 74cc4fdaac
commit fd8d9e615b
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/ndbootd/README
View File

@ -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.

4
usr.sbin/ndbootd/config.h
View File

@ -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"

15
usr.sbin/ndbootd/ndbootd.c
View File

@ -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>.
@ -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 @@ where OPTIONS are:\n\
* 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 @@ where OPTIONS are:\n\
* 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;
}