theo said we don't need 'cd' command

remove c-r, it won't work anyways
fix c-u

4 files changed, 18 insertions, 150 deletions

diff --git a/sys/arch/i386/stand/boot/boot.c b/sys/arch/i386/stand/boot/boot.c
index 5cd3b02598b..8269b26db3e 100644
--- a/sys/arch/i386/stand/boot/boot.c
+++ b/sys/arch/i386/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.14 1997/08/21 22:04:31 mickey Exp $	*/
+/*	$OpenBSD: boot.c,v 1.15 1997/08/22 00:41:27 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -39,8 +39,8 @@
 #include "cmd.h"
 
 const char *const kernels[] = {
-	"bsd",	"bsd.gz",
-	"obsd",	"obsd.gz",
+	"/bsd",  "/bsd.gz",
+	"/obsd", "/obsd.gz",
 	NULL
 };
 
@@ -61,7 +61,6 @@ boot(bootdev)
 	strncpy(cmd.image, bootfile, sizeof(cmd.image));
 	cmd.boothowto = 0;
 	cmd.conf = "/etc/boot.conf";
-	cmd.cwd[0] = '/'; cmd.cwd[1] = '\0';
 	cmd.addr = (void *)0x100000;
 	cmd.timeout = 5;
 
diff --git a/sys/arch/i386/stand/boot/cmd.c b/sys/arch/i386/stand/boot/cmd.c
index 4910cccde66..c52350a1cff 100644
--- a/sys/arch/i386/stand/boot/cmd.c
+++ b/sys/arch/i386/stand/boot/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.28 1997/08/21 22:17:56 mickey Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.29 1997/08/22 00:41:27 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -44,7 +44,6 @@ extern int debug;
 
 static int Xaddr __P((void));
 static int Xboot __P((void));
-static int Xcd __P((void));
 static int Xdevice __P((void));
 #ifdef DEBUG
 static int Xdebug __P((void));
@@ -83,7 +82,6 @@ static const struct cmd_table cmd_set[] = {
 
 static const struct cmd_table cmd_table[] = {
 	{"boot",   CMDT_CMD, Xboot}, /* XXX must be first */
-	{"cd",     CMDT_CMD, Xcd},
 	{"echo",   CMDT_CMD, Xecho},
 	{"help",   CMDT_CMD, Xhelp},
 	{"ls",     CMDT_CMD, Xls},
@@ -248,15 +246,9 @@ readline(buf, to)
 
 	while (1) {
 		switch ((ch = getchar())) {
-		case CTRL('r'):
-			while (pe > buf)
-				putchar('\177');
-			printf(buf);
 		case CTRL('u'):
-			while (pe >= buf) {
-				pe--;
+			while (pe-- > buf)
 				putchar('\177');
-			}
 			p = pe = buf;
 			continue;
 		case '\n':
@@ -348,7 +340,6 @@ Xset()
 	register const struct cmd_table *ct;
 
 	printf("OpenBSD boot[%s]\n", version);
-	printf("cwd\t%s\n", cmd.cwd);
 	for (ct = cmd_set; ct->cmd_name != NULL; ct++) {
 		printf("%s\t ", ct->cmd_name);
 		(*ct->cmd_exec)();
@@ -518,14 +509,14 @@ Xboot()
 	} else {
 		if (bootparse(1))
 			return 0;
-		sprintf(cmd.path, "%s:%s%s", cmd.bootdev, cmd.cwd, cmd.image);
+		sprintf(cmd.path, "%s:%s", cmd.bootdev, cmd.image);
 	}
 
 	return 1;
 }
 
 /*
- * Qualifies the path adding neccessary dev&|cwd
+ * Qualifies the path adding neccessary dev
  */
 
 static char *
@@ -538,14 +529,9 @@ qualify(name)
 		if (*p == ':')
 			break;
 	if (*p == ':')
-		if (p[1] == '/')
-			sprintf(cmd.path, "%s", name);
-		else
-			sprintf(cmd.path, "%s%s", cmd.cwd, name);
-	else if (name[0] == '/')
-		sprintf(cmd.path, "%s:%s", cmd.bootdev, name);
+		strncpy(cmd.path, name, sizeof(cmd.path));
 	else
-		sprintf(cmd.path, "%s:%s%s", cmd.bootdev, cmd.cwd, name);
+		sprintf(cmd.path, "%s:%s", cmd.bootdev, name);
 	return cmd.path;
 }
 
@@ -591,57 +577,6 @@ bootparse(i)
 }
 
 static int
-Xcd()
-{
-	register char *p, *q;
-	struct stat sb;
-
-	/* cd home */
-	if (cmd.argc == 1) {
-		cmd.cwd[0] = '/';
-		cmd.cwd[1] = '\0';
-		return 0;
-	}
-
-	/* cd '.' */
-	if (cmd.argv[1][0] == '.' && cmd.argv[1][1] == '\0')
-		return 0;
-
-	/* cd '..' */
-	if (cmd.argv[1][0] == '.' && cmd.argv[1][1] == '.'
-	    && cmd.argv[1][2] == '\0') {
-		/* strrchr(cmd.cwd, '/'); */
-		for (p = cmd.cwd; *++p;);
-		for (p--; *--p != '/';);
-		p[1] = '\0';
-		return 0;
-	}
-
-	/* cd dir */
-	sprintf(cmd.path, "%s:%s%s", cmd.bootdev, cmd.cwd, cmd.argv[1]);
-
-	if (stat(cmd.path, &sb) < 0) {
-		printf("stat(%s): %s\n", cmd.argv[1], strerror(errno));
-		return 0;
-	}
-
-	if (!S_ISDIR(sb.st_mode)) {
-		printf("boot: %s: not a dir\n", cmd.argv[1]);
-		return 0;
-	}
-
-	/* change dir */
-	for (p = cmd.cwd; *p; p++);
-	for (q = cmd.argv[1]; (*p++ = *q++) != '\0';);
-	if (p[-2] != '/') {
-		p[-1] = '/';
-		p[0] = '\0';
-	}
-
-	return 0;
-}
-
-static int
 Xreboot()
 {
 	printf("Rebooting...\n");
diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c
index 5cd3b02598b..8269b26db3e 100644
--- a/sys/stand/boot/boot.c
+++ b/sys/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.14 1997/08/21 22:04:31 mickey Exp $	*/
+/*	$OpenBSD: boot.c,v 1.15 1997/08/22 00:41:27 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -39,8 +39,8 @@
 #include "cmd.h"
 
 const char *const kernels[] = {
-	"bsd",	"bsd.gz",
-	"obsd",	"obsd.gz",
+	"/bsd",  "/bsd.gz",
+	"/obsd", "/obsd.gz",
 	NULL
 };
 
@@ -61,7 +61,6 @@ boot(bootdev)
 	strncpy(cmd.image, bootfile, sizeof(cmd.image));
 	cmd.boothowto = 0;
 	cmd.conf = "/etc/boot.conf";
-	cmd.cwd[0] = '/'; cmd.cwd[1] = '\0';
 	cmd.addr = (void *)0x100000;
 	cmd.timeout = 5;
 
diff --git a/sys/stand/boot/cmd.c b/sys/stand/boot/cmd.c
index 4910cccde66..c52350a1cff 100644
--- a/sys/stand/boot/cmd.c
+++ b/sys/stand/boot/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.28 1997/08/21 22:17:56 mickey Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.29 1997/08/22 00:41:27 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -44,7 +44,6 @@ extern int debug;
 
 static int Xaddr __P((void));
 static int Xboot __P((void));
-static int Xcd __P((void));
 static int Xdevice __P((void));
 #ifdef DEBUG
 static int Xdebug __P((void));
@@ -83,7 +82,6 @@ static const struct cmd_table cmd_set[] = {
 
 static const struct cmd_table cmd_table[] = {
 	{"boot",   CMDT_CMD, Xboot}, /* XXX must be first */
-	{"cd",     CMDT_CMD, Xcd},
 	{"echo",   CMDT_CMD, Xecho},
 	{"help",   CMDT_CMD, Xhelp},
 	{"ls",     CMDT_CMD, Xls},
@@ -248,15 +246,9 @@ readline(buf, to)
 
 	while (1) {
 		switch ((ch = getchar())) {
-		case CTRL('r'):
-			while (pe > buf)
-				putchar('\177');
-			printf(buf);
 		case CTRL('u'):
-			while (pe >= buf) {
-				pe--;
+			while (pe-- > buf)
 				putchar('\177');
-			}
 			p = pe = buf;
 			continue;
 		case '\n':
@@ -348,7 +340,6 @@ Xset()
 	register const struct cmd_table *ct;
 
 	printf("OpenBSD boot[%s]\n", version);
-	printf("cwd\t%s\n", cmd.cwd);
 	for (ct = cmd_set; ct->cmd_name != NULL; ct++) {
 		printf("%s\t ", ct->cmd_name);
 		(*ct->cmd_exec)();
@@ -518,14 +509,14 @@ Xboot()
 	} else {
 		if (bootparse(1))
 			return 0;
-		sprintf(cmd.path, "%s:%s%s", cmd.bootdev, cmd.cwd, cmd.image);
+		sprintf(cmd.path, "%s:%s", cmd.bootdev, cmd.image);
 	}
 
 	return 1;
 }
 
 /*
- * Qualifies the path adding neccessary dev&|cwd
+ * Qualifies the path adding neccessary dev
  */
 
 static char *
@@ -538,14 +529,9 @@ qualify(name)
 		if (*p == ':')
 			break;
 	if (*p == ':')
-		if (p[1] == '/')
-			sprintf(cmd.path, "%s", name);
-		else
-			sprintf(cmd.path, "%s%s", cmd.cwd, name);
-	else if (name[0] == '/')
-		sprintf(cmd.path, "%s:%s", cmd.bootdev, name);
+		strncpy(cmd.path, name, sizeof(cmd.path));
 	else
-		sprintf(cmd.path, "%s:%s%s", cmd.bootdev, cmd.cwd, name);
+		sprintf(cmd.path, "%s:%s", cmd.bootdev, name);
 	return cmd.path;
 }
 
@@ -591,57 +577,6 @@ bootparse(i)
 }
 
 static int
-Xcd()
-{
-	register char *p, *q;
-	struct stat sb;
-
-	/* cd home */
-	if (cmd.argc == 1) {
-		cmd.cwd[0] = '/';
-		cmd.cwd[1] = '\0';
-		return 0;
-	}
-
-	/* cd '.' */
-	if (cmd.argv[1][0] == '.' && cmd.argv[1][1] == '\0')
-		return 0;
-
-	/* cd '..' */
-	if (cmd.argv[1][0] == '.' && cmd.argv[1][1] == '.'
-	    && cmd.argv[1][2] == '\0') {
-		/* strrchr(cmd.cwd, '/'); */
-		for (p = cmd.cwd; *++p;);
-		for (p--; *--p != '/';);
-		p[1] = '\0';
-		return 0;
-	}
-
-	/* cd dir */
-	sprintf(cmd.path, "%s:%s%s", cmd.bootdev, cmd.cwd, cmd.argv[1]);
-
-	if (stat(cmd.path, &sb) < 0) {
-		printf("stat(%s): %s\n", cmd.argv[1], strerror(errno));
-		return 0;
-	}
-
-	if (!S_ISDIR(sb.st_mode)) {
-		printf("boot: %s: not a dir\n", cmd.argv[1]);
-		return 0;
-	}
-
-	/* change dir */
-	for (p = cmd.cwd; *p; p++);
-	for (q = cmd.argv[1]; (*p++ = *q++) != '\0';);
-	if (p[-2] != '/') {
-		p[-1] = '/';
-		p[0] = '\0';
-	}
-
-	return 0;
-}
-
-static int
 Xreboot()
 {
 	printf("Rebooting...\n");