Subject: Fixes for Dec-16
To: None <current-users@sun-lamp.cs.berkeley.edu>
From: None <Mark_Weaver@brown.edu>
List: current-users
Date: 12/16/1993 17:10:34
Here are some fixes for Dec-16.
diff -u src/libexec/Makefile.mhw1 src/libexec/Makefile
--- src/libexec/Makefile.mhw1 Sun Dec 5 07:16:39 1993
+++ src/libexec/Makefile Thu Dec 16 13:08:40 1993
@@ -2,7 +2,7 @@
# $Id: Makefile,v 1.8 1993/12/05 11:34:45 cgd Exp $
SUBDIR= atrun comsat crond elvispreserve fingerd ftpd getNAME \
- getty mail.local makekey rarpd rexecd rlogind rshd rpc.rstatd \
+ getty mail.local makekey rexecd rlogind rshd rpc.rstatd \
rpc.rusersd rpc.rwalld talkd telnetd tftpd uucpd
.include <bsd.subdir.mk>
diff -u src/gnu/usr.bin/gdb/readline/readline.c.mhw1 src/gnu/usr.bin/gdb/readline/readline.c
--- src/gnu/usr.bin/gdb/readline/readline.c.mhw1 Wed Dec 8 06:05:07 1993
+++ src/gnu/usr.bin/gdb/readline/readline.c Thu Dec 16 13:24:21 1993
@@ -83,7 +83,7 @@
#define HACK_TERMCAP_MOTION
-#ifndef SYSV
+#if !defined(SYSV) && !defined(__NetBSD__)
#include <sys/dir.h>
#else /* SYSV */
#ifdef hpux
diff -u src/usr.sbin/amd/amd/info_union.c.mhw1 src/usr.sbin/amd/amd/info_union.c
--- src/usr.sbin/amd/amd/info_union.c.mhw1 Sat Nov 27 16:17:22 1993
+++ src/usr.sbin/amd/amd/info_union.c Thu Dec 16 13:15:22 1993
@@ -52,7 +52,7 @@
#ifdef HAS_UNION_MAPS
-#ifdef _POSIX_SOURCE
+#if defined(_POSIX_SOURCE) || defined(__NetBSD__)
#include <dirent.h>
#define DIRENT struct dirent
#else
diff -u src/sys/arch/i386/isa/wd.c.mhw1 src/sys/arch/i386/isa/wd.c
--- src/sys/arch/i386/isa/wd.c.mhw1 Thu Dec 16 17:04:39 1993
+++ src/sys/arch/i386/isa/wd.c Thu Dec 16 13:46:03 1993
@@ -1445,7 +1445,6 @@
long cylin, head, sector, stat;
long secpertrk, secpercyl, nblocks, i;
char *addr;
- extern int Maxmem;
static wddoingadump = 0;
extern caddr_t CADDR1;
@@ -1458,7 +1457,6 @@
#endif
/* size of memory to dump */
- num = Maxmem;
lunit = wdunit(dev); /* eventually support floppies? */
part = wdpart(dev); /* file system */
/* check for acceptable drive number */
@@ -1477,7 +1475,7 @@
ctrlr = du->dk_ctrlr;
/* Convert to disk sectors */
- num = (u_long) num * NBPG / du->dk_dd.d_secsize;
+ num = (u_long) ctob(physmem) / du->dk_dd.d_secsize;
/* check if controller active */
/*if (wdtab[ctrlr].b_active)
--------------------------------------------------------------------
Email: Mark_Weaver@brown.edu | Brown University
PGP Key: finger mhw@cs.brown.edu | Dept of Computer Science
------------------------------------------------------------------------------