Add bits of PAO that are non-controversial.

Submitted by: Tatsumi HOSOKAWA

4 files changed, 25 insertions, 13 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 439639b54531..7a5bdf38b035 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -13,7 +13,7 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
-	msg.c network.c nfs.c options.c package.c system.c \
+	msg.c network.c nfs.c options.c package.c pccard.c system.c \
 	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	keymap.h
 
@@ -21,6 +21,12 @@ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
 CFLAGS+= -I${.CURDIR}/../../sys
 CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS
 
+PCCARD?= NO
+
+.if ${PCCARD} == "YES"
+CFLAGS+= -DPCCARD
+.endif
+
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
 
@@ -82,5 +88,4 @@ keymap.h:
 	( echo "	{ 0 }"; echo "};" ; echo "" ) >> keymap.tmp
 	mv keymap.tmp keymap.h
 
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index c05e38c53b90..c1bff516b67c 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.91 1999/05/21 04:37:48 wpaul Exp $
+ * $Id: devices.c,v 1.92 1999/05/27 10:32:43 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -88,8 +88,8 @@ static struct _devname {
     { DEVICE_TYPE_NETWORK,	"en",		"Efficient Networks ATM PCI card"				},
     { DEVICE_TYPE_NETWORK,	"de",		"DEC DE435 PCI NIC or other DC21040-AA based card"		},
     { DEVICE_TYPE_NETWORK,	"fxp",		"Intel EtherExpress Pro/100B PCI Fast Ethernet card"		},
-    { DEVICE_TYPE_NETWORK,	"ed",		"WD/SMC 80xx; Novell NE1000/2000; 3Com 3C503 card"		},
-    { DEVICE_TYPE_NETWORK,	"ep",		"3Com 3C509 ethernet card"					},
+    { DEVICE_TYPE_NETWORK,	"ed",		"Novell NE1000/2000; 3C503; NE2000-compatible PCMCIA"		},
+    { DEVICE_TYPE_NETWORK,	"ep",		"3Com 3C509 ethernet card/3C589 PCMCIA"				},
     { DEVICE_TYPE_NETWORK,	"el",		"3Com 3C501 ethernet card"					},
     { DEVICE_TYPE_NETWORK,	"ex",		"Intel EtherExpress Pro/10 ethernet card"			},
     { DEVICE_TYPE_NETWORK,	"fe",		"Fujitsu MB86960A/MB86965A ethernet card"			},
@@ -253,19 +253,19 @@ deviceGetAll(void)
 
 	/* If it's not a link entry, forget it */
 	if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK)
-	    continue;
+	    goto loopend;
 
 	/* Eliminate network devices that don't make sense */
 	if (!strncmp(ifptr->ifr_name, "lo", 2))
-	    continue;
+	    goto loopend;
 
 	/* If we have a slip device, don't register it */
 	if (!strncmp(ifptr->ifr_name, "sl", 2)) {
-	    continue;
+	    goto loopend;
 	}
 	/* And the same for ppp */
 	if (!strncmp(ifptr->ifr_name, "tun", 3) || !strncmp(ifptr->ifr_name, "ppp", 3)) {
-	    continue;
+	    goto loopend;
 	}
 	/* Try and find its description */
 	for (i = 0, descr = NULL; device_names[i].name; i++) {
@@ -288,6 +288,7 @@ deviceGetAll(void)
 	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 	    continue;
 
+loopend:
 	if (ifptr->ifr_addr.sa_len)	/* I'm not sure why this is here - it's inherited */
 	    ifptr = (struct ifreq *)((caddr_t)ifptr + ifptr->ifr_addr.sa_len - sizeof(struct sockaddr));
     }
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index c037b50dedc1..9e9745938b1e 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.236 1999/05/12 09:02:35 jkh Exp $
+ * $Id: install.c,v 1.237 1999/05/27 10:32:47 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -728,8 +728,9 @@ installFixupBin(dialogMenuItem *self)
     if (RunningAsInit) {
 	/* Fix up kernel first */
 	if (!file_readable("/kernel")) {
-	    if (file_readable("/kernel.GENERIC")) {
-		if (vsystem("cp -p /kernel.GENERIC /kernel")) {
+	    char *generic_kernel = "/kernel.GENERIC";
+	    if (file_readable(generic_kernel)) {
+		if (vsystem("cp -p %s /kernel", generic_kernel)) {
 		    msgConfirm("Unable to copy /kernel into place!");
 		    return DITEM_FAILURE;
 		}
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index 9f6c812d45ee..37f156cdbc7d 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.50 1999/01/08 00:14:22 jkh Exp $
+ * $Id: main.c,v 1.51 1999/02/05 22:15:50 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -86,6 +86,11 @@ main(int argc, char **argv)
     if (DebugFD)
 	dup2(DebugFD, 2);
 
+#ifdef PCCARD
+    /* Initialize PC-card */
+    pccardInitialize();
+#endif
+
     /* Probe for all relevant devices on the system */
     deviceGetAll();