Module Name:    src
Committed By:   abs
Date:           Wed Mar 10 23:16:16 UTC 2010

Added Files:
        src/distrib/utils/edlabel: Makefile edlabel.c

Log Message:
Relegate edlabel to use in extremely memory constrained install
ramdisks and prefer disklabel elsewhere.
Based on discussion on affected port lists (port-sparc port-sparc64
port-sun3 port-sun2 port-atari port-mvme68k).
All listed ports plus amd64 test built after change


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/utils/edlabel/Makefile \
    src/distrib/utils/edlabel/edlabel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/distrib/utils/edlabel/Makefile
diff -u /dev/null src/distrib/utils/edlabel/Makefile:1.1
--- /dev/null	Wed Mar 10 23:16:16 2010
+++ src/distrib/utils/edlabel/Makefile	Wed Mar 10 23:16:16 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/03/10 23:16:16 abs Exp $
+# edlabel (Edit Disk LABEL)
+
+NOMAN=	# defined
+
+PROG=	edlabel
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
+
+.include <bsd.prog.mk>
Index: src/distrib/utils/edlabel/edlabel.c
diff -u /dev/null src/distrib/utils/edlabel/edlabel.c:1.1
--- /dev/null	Wed Mar 10 23:16:16 2010
+++ src/distrib/utils/edlabel/edlabel.c	Wed Mar 10 23:16:16 2010
@@ -0,0 +1,535 @@
+/*	$NetBSD: edlabel.c,v 1.1 2010/03/10 23:16:16 abs Exp $	*/
+
+/*
+ * Copyright (c) 1995 Gordon W. Ross
+ * 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.
+ *
+ * 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 <sys/cdefs.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#define FSTYPENAMES
+#include <sys/disklabel.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <util.h>
+#include <stdlib.h>
+
+/*
+ * Machine dependent constants you want to retrieve only once...
+ */
+int rawpartition, maxpartitions;
+
+/*
+ * This is a data-driven program
+ */
+struct field {
+	const char *f_name;
+	int f_offset;
+	int f_type;	/* 1:char, 2:short, 4:int, >4:string */
+};
+
+/* Table describing fields in the head of a disklabel. */
+#define	dloff(f) (int)(&((struct disklabel *)0)->f)
+struct field label_head[] = {
+  { "        type_num", dloff(d_type), 2 },
+  { "        sub_type", dloff(d_subtype), 2 },
+  { "       type_name", dloff(d_typename), 16 },
+  { "       pack_name", dloff(d_packname),  16 },
+  { "    bytes/sector", dloff(d_secsize), 4 },
+  { "   sectors/track", dloff(d_nsectors), 4 },
+  { " tracks/cylinder", dloff(d_ntracks),  4 },
+  { "       cylinders", dloff(d_ncylinders), 4 },
+  { "sectors/cylinder", dloff(d_secpercyl), 4 },
+  /* Don't care about the others until later... */
+  { .f_name = NULL },
+};
+#undef dloff
+
+void	check_divisors(struct disklabel *);
+u_short	dkcksum(struct disklabel *);
+void	edit_geo(struct disklabel *);
+void	edit_head_all(struct disklabel *, int);
+void	edit_head_field(void *, struct field *, int);
+void	edit_partition(struct disklabel *, int, int);
+void	get_fstype(char *, u_int8_t *);
+void	get_val_cts(struct disklabel *, char *, u_int32_t *);
+void	label_modify(struct disklabel *, char *);
+void	label_print(struct disklabel *, char *);
+void	label_quit(struct disklabel *, char *);
+void	label_read(struct disklabel *, char *);
+void	label_write(struct disklabel *, char *);
+void	menu(void);
+void	print_val_cts(struct disklabel *, u_long val);
+
+char	tmpbuf[64];
+
+void
+edit_head_field(void *v, struct field *f, int modify /* also modify */)
+{
+	u_int8_t  *cp;
+	u_int tmp;
+
+	cp = v;
+	cp += f->f_offset;
+
+	printf("%s: ", f->f_name);
+
+	/* Print current value... */
+	switch (f->f_type) {
+	case 1:
+		tmp = *cp;
+		printf("%d", tmp);
+		break;
+	case 2:
+		tmp = *((u_int16_t *)cp);
+		printf("%d", tmp);
+		break;
+	case 4:
+		tmp = *((u_int32_t *)cp);
+		printf("%d", tmp);
+		break;
+
+	default:
+		/* must be a string. */
+		strlcpy(tmpbuf, (char*)cp, sizeof(tmpbuf));
+		printf("%s", tmpbuf);
+		break;
+	}
+
+	if (modify == 0) {
+		printf("\n");
+		return;
+	}
+	printf(" ? ");
+	fflush(stdout);
+
+	tmpbuf[0] = '\0';
+	if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+		return;
+	if ((tmpbuf[0] == '\0') || (tmpbuf[0] == '\n')) {
+		/* no new value supplied. */
+		return;
+	}
+
+	/* store new value */
+	if (f->f_type <= 4)
+		if (sscanf(tmpbuf, "%d", &tmp) != 1)
+			return;
+
+	switch (f->f_type) {
+	case 1:
+		*cp = tmp;
+		break;
+	case 2:
+		*((u_int16_t *)cp) = tmp;
+		break;
+	case 4:
+		*((u_int32_t *)cp) = tmp;
+		break;
+	default:
+		/* Get rid of the trailing newline. */
+		tmp = strlen(tmpbuf);
+		if (tmp < 1)
+			break;
+		if (tmpbuf[tmp-1] == '\n')
+			tmpbuf[tmp-1] = '\0';
+		strncpy((char*)cp, tmpbuf, f->f_type);
+		break;
+	}
+}
+
+void
+edit_head_all(struct disklabel *d, int modify)
+{
+	struct field *f;
+
+	/* Edit head stuff. */
+	for (f = label_head; f->f_name; f++)
+		edit_head_field(d, f, modify);
+}
+
+void
+edit_geo(struct disklabel *d)
+{
+	int nsect, ntrack, ncyl, spc;
+
+	nsect = ntrack = ncyl = spc = 0;
+
+	printf("Sectors/track: ");
+	fflush(stdout);
+	if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+		return;
+	if (sscanf(tmpbuf, "%d", &nsect) != 1)
+		nsect = d->d_nsectors;
+	printf("Track/cyl: ");
+	fflush(stdout);
+	if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+		return;
+	if (sscanf(tmpbuf, "%d", &ntrack) != 1)
+		ntrack = d->d_ntracks;
+	if (!nsect || !ntrack)
+		return;
+	spc = nsect * ntrack;
+	if (!(ncyl = d->d_secperunit / spc))
+		return;
+	d->d_nsectors   = nsect;
+	d->d_ntracks    = ntrack;
+	d->d_ncylinders = ncyl;
+	d->d_secpercyl  = spc;
+}
+
+void
+print_val_cts(struct disklabel *d, u_long val)
+{
+	int	sects, trks, cyls;
+	char	marker;
+	char	buf[80];
+
+	marker = (val % d->d_secpercyl) ? '*' : ' ';
+	sects  = val % d->d_nsectors;
+	cyls   = val / d->d_nsectors;
+	trks   = cyls % d->d_ntracks;
+	cyls  /= d->d_ntracks;
+	snprintf(buf, sizeof(buf), "(%d/%02d/%02d)%c", cyls, trks, sects,
+	    marker);
+	printf(" %9ld %16s", val, buf);
+}
+
+void
+get_val_cts(struct disklabel *d, char *buf, u_int32_t *result)
+{
+	u_long tmp;
+	int	cyls, trks, sects;
+
+	tmp = sscanf(buf, "%d/%d/%d", &cyls, &trks, &sects);
+	if (tmp == 1)
+		*result = cyls;	/* really nblks! */
+	if (tmp == 3) {
+		tmp = cyls;
+		tmp *= d->d_ntracks;
+		tmp += trks;
+		tmp *= d->d_nsectors;
+		tmp += sects;
+		*result = tmp;
+	}
+}
+
+void
+get_fstype(char *buf, u_int8_t *fstype)
+{
+	int	i, len;
+
+	/* An empty response retains previous value */
+	if (buf[0] == '\n')
+		return;
+	for (i = 0, len = strlen(buf) - 1; i < FSMAXTYPES; i++) {
+		if (!strncasecmp(buf, fstypenames[i], len)) {
+			*fstype = i;
+			return;
+		}
+	}
+}
+
+void
+edit_partition(struct disklabel *d, int idx, int modify)
+{
+	struct partition *p;
+	char letter;
+	const char *comment;
+
+	if ((idx < 0) || (idx >= maxpartitions)) {
+		printf("bad partition index\n");
+		return;
+	}
+	
+	p = &d->d_partitions[idx];
+	letter = 'a' + idx;
+
+	/* Set hint about partition type */
+	if (idx == rawpartition)
+		comment = "disk";
+	else {
+		comment = "user";
+		switch(idx) {
+			case 0:
+				comment = "root";
+			break;
+			case 1:
+				comment = "swap";
+				break;
+		}
+	}
+
+	/* Print current value... */
+	printf(" %c (%s) ", letter, comment);
+	print_val_cts(d, p->p_offset);
+	print_val_cts(d, p->p_size);
+	printf(" %s\n", fstypenames[p->p_fstype]);
+
+	if (modify == 0)
+		return;
+
+	/* starting block, or cyls/trks/sects */
+	printf("start as <blkno> or <cyls/trks/sects> : ");
+	fflush(stdout);
+	if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+		return;
+	get_val_cts(d, tmpbuf, &p->p_offset);
+
+	/* number of blocks, or cyls/trks/sects */
+	printf("length as <nblks> or <cyls/trks/sects> : ");
+	fflush(stdout);
+	if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+		return;
+	get_val_cts(d, tmpbuf, &p->p_size);
+	/* partition type */
+	printf("type: ");
+	fflush(stdout);
+	if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+		return;
+	get_fstype(tmpbuf, &p->p_fstype);
+}
+
+/*****************************************************************/
+
+void
+check_divisors(struct disklabel *d)
+{
+	if (d->d_nsectors == 0) {
+		d->d_nsectors = 1;
+		printf("bad sect/trk, set to 1\n");
+	}
+	if (d->d_ntracks == 0) {
+		d->d_ntracks = 1;
+		printf("bad trks/cyl, set to 1\n");
+	}
+	if (d->d_ncylinders == 0) {
+		d->d_ncylinders = 1;
+		printf("bad cyls, set to 1\n");
+	}
+	if (d->d_secpercyl == 0) {
+		d->d_secpercyl = (d->d_nsectors * d->d_ntracks);
+		printf("bad sect/cyl, set to %d\n", d->d_secpercyl);
+	}
+
+}
+
+u_short
+dkcksum(struct disklabel *d)
+{
+	u_short *start, *end;
+	u_short sum = 0;
+
+	start = (u_short *)d;
+	end = (u_short *)&d->d_partitions[d->d_npartitions];
+	while (start < end)
+		sum ^= *start++;
+	return (sum);
+}
+
+void
+label_write(struct disklabel *d, char *dn)
+{
+	int fd;
+
+	d->d_magic = DISKMAGIC;
+	d->d_magic2 = DISKMAGIC;
+	d->d_checksum = 0;
+	d->d_checksum = dkcksum(d);
+
+	fd = open(dn, O_RDWR, 0);
+	if (fd < 0) {
+		perror(dn);
+		return;
+	}
+	if (ioctl(fd, DIOCWDINFO, d) < 0) {
+		perror("ioctl DIOCWDINFO");
+	}
+	close(fd);
+}
+
+void
+label_read(struct disklabel *dl, char *dn)
+{
+	int fd;
+
+	fd = open(dn, O_RDONLY, 0);
+	if (fd < 0) {
+		perror(dn);
+		exit(1);
+	}
+	if (ioctl(fd, DIOCGDINFO, dl) < 0) {
+		if (errno == ESRCH)
+			fprintf(stderr, "edlabel: No disk label on disk\n");
+		else
+		    	perror("ioctl DIOCGDINFO");
+		exit(1);
+	}
+
+	/* Make sure divisors are non-zero. */
+	check_divisors(dl);
+
+	close(fd);
+}
+
+/*****************************************************************/
+
+void
+label_print(struct disklabel *dl, char *dn)
+{
+	int i;
+
+	/* Print out head stuff. */
+	edit_head_all(dl, 0);
+
+	/* And the partition header. */
+	printf("partition%6sstart%9s(c/t/s)%6snblks%9s(c/t/s)  type\n\n"
+							"", "", "", "", "");
+	for (i = 0; i < dl->d_npartitions; i++)
+		edit_partition(dl, i, 0);
+}
+
+char modify_cmds[] = "modify subcommands:\n\
+ @   : modify disk parameters\n\
+ a-%c : modify partition\n%s\
+ q   : quit this subcommand\n";
+
+void
+label_modify(struct disklabel *dl, char *dn)
+{
+	int c, i;
+	int scsi_fict = 0;
+
+	if (!strcmp(dl->d_typename, "SCSI disk")
+	     && !strcmp(dl->d_packname, "fictitious"))
+		scsi_fict = 1;
+
+	printf(modify_cmds, 'a' + maxpartitions - 1,
+		scsi_fict ? " s   : standardize geometry\n" : "");
+	for (;;) {
+		printf("edlabel/modify> ");
+		fflush(stdout);
+		if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+			break;
+		c = tmpbuf[0];
+		if ((c == '\0') || (c == '\n'))
+			continue;	/* blank line */
+		if (c == 'q')
+			break;
+		if (c == '@') {
+			edit_head_all(dl, 1);
+			check_divisors(dl);
+			continue;
+		}
+		if ((c == 's') && scsi_fict) {
+			edit_geo(dl);
+			continue;
+		}
+		if ((c < 'a') || (c > 'q')) {
+			printf("bad input.  ");
+			printf(modify_cmds, 'a' + maxpartitions - 1,
+			    scsi_fict ? " s   : standardize geometry\n" : "");
+			continue;
+		}
+		edit_partition(dl, c - 'a', 1);
+	}
+	/* Set the d_npartitions field correctly */
+	for (i = 0; i < maxpartitions; i++) {
+		if (dl->d_partitions[i].p_size)
+			dl->d_npartitions = i + 1;
+	}
+
+}
+
+void
+label_quit(struct disklabel *dl, char *dn)
+{
+	exit(0);
+}
+
+struct cmd {
+	void (*cmd_func)(struct disklabel *, char *);
+	const char *cmd_name;
+	const char *cmd_descr;
+} cmds[] = {
+	{ label_print,  "print",  "display the current disk label" },
+	{ label_modify, "modify", "prompt for changes to the label" },
+	{ label_write,  "write",  "write the new label to disk" },
+	{ label_quit,   "quit",   "terminate program" },
+	{ .cmd_func = 0 },
+};
+
+void
+menu(void)
+{
+	struct cmd *cmd;
+
+	printf("edlabel menu:\n");
+	for (cmd = cmds; cmd->cmd_func; cmd++)
+		printf("%s\t- %s\n", cmd->cmd_name, cmd->cmd_descr);
+}
+
+int
+main(int argc, char **argv)
+{
+	struct disklabel dl;
+	struct cmd *cmd;
+	char *dev_name;
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: edlabel RAWDISK\n");
+		exit(1);
+	}
+	dev_name = argv[1];
+
+	rawpartition = getrawpartition();
+	maxpartitions = getmaxpartitions();
+
+	label_read(&dl, dev_name);
+
+	menu();
+
+	for (;;) {
+		printf("edlabel> ");
+		fflush(stdout);
+		if (fgets(tmpbuf, sizeof(tmpbuf), stdin) == NULL)
+			break;
+		for (cmd = cmds; cmd->cmd_func; cmd++)
+			if (cmd->cmd_name[0] == tmpbuf[0])
+				goto found;
+		printf("Invalid command.  ");
+		menu();
+		continue;
+
+	found:
+		cmd->cmd_func(&dl, dev_name);
+	}
+	exit(0);
+}

Reply via email to