New fdisk code with interactive (command line type)

editing code.  Rewrite from the ground up, save about
20 lines of code.  Seems to create valid partition
tables on i386 and alphas.

1 files changed, 207 insertions, 0 deletions

diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
new file mode 100644
index 00000000000..b2d84e1b8f7
--- /dev/null
+++ b/sbin/fdisk/user.c
@@ -0,0 +1,207 @@
+
+/* $OpenBSD: user.c,v 1.1 1997/09/29 22:58:19 weingart Exp $ */
+
+/*
+ * Copyright (c) 1997 Tobias Weingartner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    This product includes software developed by Tobias Weingartner.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <err.h>
+#include <util.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/disklabel.h>
+#include <machine/param.h>
+#include "user.h"
+#include "disk.h"
+#include "misc.h"
+#include "mbr.h"
+#include "cmd.h"
+
+
+/* Our command table */
+static cmd_table_t cmd_table[] = {
+	{"help",	Xhelp,		"Command help list"},
+	{"init",	Xinit,		"Initialize loaded MBR"},
+	{"disk",	Xdisk,		"Edit current drive stats"},
+	{"edit",	Xedit,		"Edit given table entry"},
+	{"flag",	Xflag,		"Flag given table entry as bootable"},
+	{"update",	Xupdate,	"Update machine code in loaded MBR"},
+	{"select",	Xselect,	"Select extended partition table entry MBR"},
+	{"print",	Xprint,		"Print loaded MBR partition table"},
+	{"write",	Xwrite,		"Write loaded MBR to disk"},
+	{"exit",	Xexit,		"Exit current level of fdisk edit"},
+	{"quit",	Xquit,		"Quit program without saving current changes"},
+	{NULL,		NULL,		NULL}
+};
+
+
+int
+USER_init(disk, tt)
+	disk_t *disk;
+	mbr_t *tt;
+{
+	int fd;
+	char mbr_buf[DEV_BSIZE];
+
+	/* Fix up given mbr for this disk */
+	tt->part[0].flag = 0;
+	tt->part[1].flag = 0;
+	tt->part[2].flag = 0;
+	tt->part[3].flag = DOSACTIVE;
+	tt->signature = DOSMBR_SIGNATURE;
+
+	/* Use whole disk, save for first head, on first cyl. */
+	tt->part[3].id = DOSPTYP_OPENBSD;
+	tt->part[3].scyl = 0;
+	tt->part[3].shead = 1;
+	tt->part[3].ssect = 1;
+
+	/* Go right to the end */
+	tt->part[3].ecyl = disk->bios->cylinders;
+	tt->part[3].ehead = disk->bios->heads;
+	tt->part[3].esect = disk->bios->sectors;
+
+	/* Fix up start/length fields */
+	PRT_fix_BN(disk, &tt->part[3]);
+
+	/* Write sector 0 */
+	fd = DISK_open(disk->name, O_RDWR);
+	MBR_make(tt, mbr_buf);
+	MBR_write(fd, (off_t)0, mbr_buf);
+	DISK_close(fd);
+
+	return(0);
+}
+
+int
+USER_modify(disk, tt, offset)
+	disk_t *disk;
+	mbr_t *tt;
+	int offset;
+{
+	char mbr_buf[DEV_BSIZE];
+	mbr_t mbr;
+	cmd_t cmd;
+	int i, st, fd, modified = 0;
+
+
+	/* Set up command table pointer */
+	cmd.table = cmd_table;
+
+	/* Read MBR & partition */
+	fd = DISK_open(disk->name, O_RDONLY);
+	MBR_read(fd, offset, mbr_buf);
+	DISK_close(fd);
+
+	/* Parse the sucker */
+	MBR_parse(mbr_buf, &mbr);
+
+
+	/* Edit cycle */
+	do {
+		printf("fdisk:%c%d> ", (modified)?'*':' ', offset);
+		fflush(stdout);
+		ask_cmd(&cmd);
+
+		for(i = 0; cmd_table[i].cmd != NULL; i++)
+			if(strstr(cmd_table[i].cmd, cmd.cmd) == cmd_table[i].cmd)
+				break;
+
+		/* Quick hack to put in '?' == 'help' */
+		if(!strcmp(cmd.cmd, "?"))
+			i = 0;
+
+		/* Check for valid command */
+		if(cmd_table[i].cmd == NULL){
+			printf("Invalid command '%s'.  Try 'help'.\n", cmd.cmd);
+			continue;
+		}else
+			strcpy(cmd.cmd, cmd_table[i].cmd);
+
+		/* Call function */
+		st = cmd_table[i].fcn(&cmd, disk, &mbr, tt, offset);
+
+		/* Update status */
+		if(st == CMD_EXIT) break;
+		if(st == CMD_CLEAN) modified = 0;
+		if(st == CMD_DIRTY) modified = 1;
+	} while(1);
+
+
+	/* XXX - Write out MBR */
+	if(modified){
+		printf("\n");
+		printf("\t-----------------------------------------------------\n");
+		printf("\t--- ATTENTION - PARTITION TABLE HAS BEEN MODIFIED ---\n");
+		printf("\t-----------------------------------------------------\n");
+		if(ask_yn("\nDo you wish to write before exit?")){
+			fd = DISK_open(disk->name, O_RDWR);
+			MBR_make(&mbr, mbr_buf);
+			MBR_write(fd, offset, mbr_buf);
+			close(fd);
+		}
+	}
+
+	return(0);
+}
+
+int
+USER_print_disk(disk)
+	disk_t *disk;
+{
+	int fd, offset, i;
+	char mbr_buf[DEV_BSIZE];
+	mbr_t mbr;
+
+	fd = DISK_open(disk->name, O_RDONLY);
+	offset = 0;
+
+	printf("Disk: %s\n", disk->name);
+	DISK_printmetrics(disk);
+
+	do {
+		MBR_read(fd, (off_t)offset, mbr_buf);
+		MBR_parse(mbr_buf, &mbr);
+
+		printf("\nDisk offset: %d\n", (int)offset);
+		MBR_print(&mbr);
+
+		/* Print out extended partitions too */
+		for(offset = i = 0; i < 4; i++)
+			if(mbr.part[i].id == DOSPTYP_EXTEND)
+				offset = mbr.part[i].bs;
+	} while(offset);
+
+	return(DISK_close(fd));
+}
+