Remove plan9 -extensions.

Do these still work? I don't know. Someone test, please.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

sys/include/disk.h

@@ -13,7 +13,7 @@
 /* SCSI interface */
 typedef struct Scsi Scsi;
 struct Scsi {
-	QLock;
+	QLock QLock;
 	char*	inquire;
 	int	rawfd;
 	int	nchange;

sys/src/cmd/disk/9660/9660.json

@@ -1,8 +1,5 @@
 {
 	"dump9660": {
-		"CFlags": [
-		"-fplan9-extensions"
-		],
 		"Include": [
 			"../../cmd.json"
 		],

sys/src/cmd/disk/kfs/kfs.json

@@ -1,8 +1,5 @@
 {
 	"kfs": {
-		"CFlags": [
-		"-fplan9-extensions"
-		],
 		"Include": [
 			"../../cmd.json"
 		],

sys/src/cmd/disk/prep/edit.c

@@ -289,10 +289,7 @@ editwrite(Edit *edit, int argc, char **c)
 static char*
 editquit(Edit *edit, int argc, char **c)
 {
-	static int warned;
-
 	if(argc != 1) {
-		warned = 0;
 		return "args";
 	}
 

sys/src/cmd/disk/prep/fdisk.c

@@ -273,8 +273,8 @@ struct Type {
 };
 
 struct Dospart {
-	Part;
-	Tentry;
+	Part Part;
+	Tentry Tentry;
 
 	uint32_t	lba;
 	uint32_t	size;
@@ -287,57 +287,58 @@ struct Recover {
 };
 
 static Type types[256] = {
-	[TypeEMPTY]		{ "EMPTY", "" },
-	[TypeFAT12]		{ "FAT12", "dos" },
-	[TypeFAT16]		{ "FAT16", "dos" },
-	[TypeFAT32]		{ "FAT32", "dos" },
-	[TypeFAT32LBA]		{ "FAT32LBA", "dos" },
-	[TypeFAT16X]		{ "FAT16X", "dos" },
-	[TypeEXTHUGE]		{ "EXTHUGE", "" },
-	[TypeIBMRecovery]	{ "IBMRECOVERY", "ibm" },
-	[TypeEXTENDED]		{ "EXTENDED", "" },
-	[TypeFATHUGE]		{ "FATHUGE", "dos" },
-	[TypeBB]		{ "BB", "bb" },
-
-	[TypeXENIX]		{ "XENIX", "xenix" },
-	[TypeXENIXUSR]		{ "XENIX USR", "xenixusr" },
-	[TypeHPFS]		{ "HPFS", "ntfs" },
-	[TypeAIXBOOT]		{ "AIXBOOT", "aixboot" },
-	[TypeAIXDATA]		{ "AIXDATA", "aixdata" },
-	[TypeOS2BOOT]		{ "OS/2BOOT", "os2boot" },
-	[TypeUNFORMATTED]	{ "UNFORMATTED", "" },
-	[TypeHPFS2]		{ "HPFS2", "hpfs2" },
-	[TypeCPM0]		{ "CPM0", "cpm0" },
-	[TypeDMDDO]		{ "DMDDO", "dmdd0" },
-	[TypeGB]		{ "GB", "gb" },
-	[TypeSPEEDSTOR]		{ "SPEEDSTOR", "speedstor" },
-	[TypeSYSV386]		{ "SYSV386", "sysv386" },
-	[TypeNETWARE]		{ "NETWARE", "netware" },
-	[TypePCIX]		{ "PCIX", "pcix" },
-	[TypeMINIX13]		{ "MINIXV1.3", "minix13" },
-	[TypeMINIX]		{ "MINIXV1.5", "minix15" },
-	[TypeLINUXSWAP]		{ "LINUXSWAP", "linuxswap" },
-	[TypeLINUX]		{ "LINUX", "linux" },
-	[TypeLINUXEXT]		{ "LINUXEXTENDED", "" },
-	[TypeLINUXLVM]		{ "LINUXLVM", "linuxlvm" },
-	[TypeAMOEBA]		{ "AMOEBA", "amoeba" },
-	[TypeAMOEBABB]		{ "AMOEBABB", "amoebaboot" },
-	[TypeBSD386]		{ "BSD386", "bsd386" },
-	[TypeNETBSD]		{ "NETBSD", "netbsd" },
-	[TypeBSDI]		{ "BSDI", "bsdi" },
-	[TypeBSDISWAP]		{ "BSDISWAP", "bsdiswap" },
-	[TypeOTHER]		{ "OTHER", "other" },
-	[TypeCPM]		{ "CPM", "cpm" },
-	[TypeDellRecovery]	{ "DELLRECOVERY", "dell" },
-	[TypeSPEEDSTOR12]	{ "SPEEDSTOR12", "speedstor" },
-	[TypeSPEEDSTOR16]	{ "SPEEDSTOR16", "speedstor" },
-	[TypeEFIProtect]	{ "EFIPROTECT", "efiprotect" },
-	[TypeEFI]		{ "EFI", "efi" },
-	[TypeLANSTEP]		{ "LANSTEP", "lanstep" },
-
-	[Type9]			{ "PLAN9", "plan9" },
+	[TypeEMPTY] =		{ "EMPTY", "" },
+	[TypeFAT12] =		{ "FAT12", "dos" },
+	[TypeFAT16] =		{ "FAT16", "dos" },
+	[TypeFAT32] =		{ "FAT32", "dos" },
+	[TypeFAT32LBA] =		{ "FAT32LBA", "dos" },
+	[TypeFAT16X] =		{ "FAT16X", "dos" },
+	[TypeEXTHUGE] =		{ "EXTHUGE", "" },
+	[TypeIBMRecovery] =	{ "IBMRECOVERY", "ibm" },
+	[TypeEXTENDED] =		{ "EXTENDED", "" },
+	[TypeFATHUGE] =		{ "FATHUGE", "dos" },
+	[TypeBB] =		{ "BB", "bb" },
+
+	[TypeXENIX] =		{ "XENIX", "xenix" },
+	[TypeXENIXUSR] =		{ "XENIX USR", "xenixusr" },
+	[TypeHPFS] =		{ "HPFS", "ntfs" },
+	[TypeAIXBOOT] =		{ "AIXBOOT", "aixboot" },
+	[TypeAIXDATA] =		{ "AIXDATA", "aixdata" },
+	[TypeOS2BOOT] =		{ "OS/2BOOT", "os2boot" },
+	[TypeUNFORMATTED] =	{ "UNFORMATTED", "" },
+	[TypeHPFS2] =		{ "HPFS2", "hpfs2" },
+	[TypeCPM0] =		{ "CPM0", "cpm0" },
+	[TypeDMDDO] =		{ "DMDDO", "dmdd0" },
+	[TypeGB] =		{ "GB", "gb" },
+	[TypeSPEEDSTOR] =		{ "SPEEDSTOR", "speedstor" },
+	[TypeSYSV386] =		{ "SYSV386", "sysv386" },
+	[TypeNETWARE] =		{ "NETWARE", "netware" },
+	[TypePCIX] =		{ "PCIX", "pcix" },
+	[TypeMINIX13] =		{ "MINIXV1.3", "minix13" },
+	[TypeMINIX] =		{ "MINIXV1.5", "minix15" },
+	[TypeLINUXSWAP] =		{ "LINUXSWAP", "linuxswap" },
+	[TypeLINUX] =		{ "LINUX", "linux" },
+	[TypeLINUXEXT] =		{ "LINUXEXTENDED", "" },
+	[TypeLINUXLVM] =		{ "LINUXLVM", "linuxlvm" },
+	[TypeAMOEBA] =		{ "AMOEBA", "amoeba" },
+	[TypeAMOEBABB] =		{ "AMOEBABB", "amoebaboot" },
+	[TypeBSD386] =		{ "BSD386", "bsd386" },
+	[TypeNETBSD] =		{ "NETBSD", "netbsd" },
+	[TypeBSDI] =		{ "BSDI", "bsdi" },
+	[TypeBSDISWAP] =		{ "BSDISWAP", "bsdiswap" },
+	[TypeOTHER] =		{ "OTHER", "other" },
+	[TypeCPM] =		{ "CPM", "cpm" },
+	[TypeDellRecovery] =	{ "DELLRECOVERY", "dell" },
+	[TypeSPEEDSTOR12] =	{ "SPEEDSTOR12", "speedstor" },
+	[TypeSPEEDSTOR16] =	{ "SPEEDSTOR16", "speedstor" },
+	[TypeEFIProtect] =	{ "EFIPROTECT", "efiprotect" },
+	[TypeEFI] =		{ "EFI", "efi" },
+	[TypeLANSTEP] =		{ "LANSTEP", "lanstep" },
+
+	[Type9] =			{ "PLAN9", "plan9" },
 };
 
+/* wow. never used. oh well. */
 static Dospart	part[Mpart];
 static int		npart;
 
@@ -410,10 +411,10 @@ mkpart(char *name, int primary, int64_t lba, int64_t size, Tentry *t)
 
 	p = emalloc(sizeof(*p));
 	if(name)
-		p->name = estrdup(name);
+		p->Part.name = estrdup(name);
 	else{
-		p->name = emalloc(20);
-		sprint(p->name, "%c%d", primary ? 'p' : 's', ++n);
+		p->Part.name = emalloc(20);
+		sprint(p->Part.name, "%c%d", primary ? 'p' : 's', ++n);
 	}
 
 	if(t)
@@ -421,11 +422,11 @@ mkpart(char *name, int primary, int64_t lba, int64_t size, Tentry *t)
 	else
 		memset(&p->Tentry, 0, sizeof(Tentry));
 
-	p->changed = 0;
-	p->start = lba/sec2cyl;
-	p->end = (lba+size)/sec2cyl;
-	p->ctlstart = lba;
-	p->ctlend = lba+size;
+	p->Part.changed = 0;
+	p->Part.start = lba/sec2cyl;
+	p->Part.end = (lba+size)/sec2cyl;
+	p->Part.ctlstart = lba;
+	p->Part.ctlend = lba+size;
 	p->lba = lba;
 	if (p->lba != lba)
 		fprint(2, "%s: start of partition (%lld) won't fit in MBR table\n", argv0, lba);
@@ -528,7 +529,7 @@ rdpart(Edit *edit, uint64_t lba, uint64_t xbase)
 			break;
 		default:
 			p = mkpart(nil, lba==0, lba+getle32(tp->xlba), getle32(tp->xsize), tp);
-			if(err = addpart(edit, p))
+			if(err = addpart(edit, /* barf. */ (Part*)p))
 				fprint(2, "adding partition: %s\n", err);
 			break;
 		}
@@ -592,10 +593,10 @@ haveroom(Edit *edit, int primary, int64_t start)
 		p = (Dospart*)edit->part[i];
 		if(p->primary)
 			n++;
-		pend = p->end;
+		pend = p->Part.end;
 		if(i+1<edit->npart){
 			q = (Dospart*)edit->part[i+1];
-			qstart = q->start;
+			qstart = q->Part.start;
 		}else{
 			qstart = edit->end;
 			q = nil;
@@ -619,7 +620,7 @@ autopart(Edit *edit)
 	Dospart *p;
 
 	for(i=0; i<edit->npart; i++)
-		if(((Dospart*)edit->part[i])->type == Type9)
+		if(((Dospart*)edit->part[i])->Tentry.type == Type9)
 			return;
 
 	/* look for the biggest gap in which we can put a primary partition */
@@ -628,11 +629,11 @@ autopart(Edit *edit)
 	SET(bigstart);
 	for(i=0; i<edit->npart; i++) {
 		p = (Dospart*)edit->part[i];
-		if(p->start > start && p->start - start > bigsize && haveroom(edit, 1, start)) {
-			bigsize = p->start - start;
+		if(p->Part.start > start && p->Part.start - start > bigsize && haveroom(edit, 1, start)) {
+			bigsize = p->Part.start - start;
 			bigstart = start;
 		}
-		start = p->end;
+		start = p->Part.end;
 	}
 
 	if(edit->end - start > bigsize && haveroom(edit, 1, start)) {
@@ -647,7 +648,7 @@ autopart(Edit *edit)
 	/* set new partition active only if no others are */
 	active = Active;	
 	for(i=0; i<edit->npart; i++)
-		if(((Dospart*)edit->part[i])->primary && (((Dospart*)edit->part[i])->active & Active))
+		if(((Dospart*)edit->part[i])->primary && (((Dospart*)edit->part[i])->Tentry.active & Active))
 			active = 0;
 
 	/* add new plan 9 partition */
@@ -658,11 +659,11 @@ autopart(Edit *edit)
 		bigsize -= edit->disk->s;
 	}
 	p = mkpart(nil, 1, bigstart, bigsize, nil);
-	p->active = active;
-	p->changed = 1;
-	p->type = Type9;
+	p->Tentry.active = active;
+	p->Part.changed = 1;
+	p->Tentry.type = Type9;
 	edit->changed = 1;
-	if(err = addpart(edit, p)) {
+	if(err = addpart(edit, /*barf */(Part *)p)) {
 		fprint(2, "error adding plan9 partition: %s\n", err);
 		return;
 	}
@@ -683,9 +684,9 @@ plan9print(Dospart *part, int fd)
 	int64_t start, end;
 	char *sep;
 
-	vname = types[part->type].name;
+	vname = types[part->Tentry.type].name;
 	if(vname==nil || strcmp(vname, "")==0) {
-		part->ctlname = "";
+		part->Part.ctlname = "";
 		return;
 	}
 
@@ -718,7 +719,7 @@ plan9print(Dospart *part, int fd)
 	n->name = name;
 	n->link = namelist;
 	namelist = n;
-	part->ctlname = name;
+	part->Part.ctlname = name;
 
 	if(fd >= 0)
 		print("part %s %lld %lld\n", name, start, end);
@@ -778,12 +779,12 @@ cmdsum(Edit *edit, Part *vp, int64_t a, int64_t b)
 
 	p = (Dospart*)vp;
 
-	buf[0] = p && p->changed ? '\'' : ' ';
-	buf[1] = p && (p->active & Active) ? '*' : ' ';
+	buf[0] = p && p->Part.changed ? '\'' : ' ';
+	buf[1] = p && (p->Tentry.active & Active) ? '*' : ' ';
 	buf[2] = '\0';
 
-	name = p ? p->name : "empty";
-	ty = p ? typestr0(p->type) : "";
+	name = p ? p->Part.name : "empty";
+	ty = p ? typestr0(p->Tentry.type) : "";
 
 	sz = (b-a)*edit->disk->secsize*sec2cyl;
 	if(sz >= 1*TB){
@@ -824,9 +825,9 @@ cmdadd(Edit *edit, char *name, int64_t start, int64_t end)
 	if(start == 0 || name[0] != 'p')
 		start += edit->disk->s;
 	p = mkpart(name, name[0]=='p', start, end-start, nil);
-	p->changed = 1;
-	p->type = Type9;
-	return addpart(edit, p);
+	p->Part.changed = 1;
+	p->Tentry.type = Type9;
+	return addpart(edit, /* barf */(Part *)p);
 }
 
 static char*
@@ -873,16 +874,16 @@ cmdactive(Edit *edit, int nf, char **f)
 
 	for(i=0; i<edit->npart; i++) {
 		ip = (Dospart*)edit->part[i];
-		if(ip->active & Active) {
-			ip->active &= ~Active;
-			ip->changed = 1;
+		if(ip->Tentry.active & Active) {
+			ip->Tentry.active &= ~Active;
+			ip->Part.changed = 1;
 			edit->changed = 1;
 		}
 	}
 
-	if((p->active & Active) == 0) {
-		p->active |= Active;
-		p->changed = 1;
+	if((p->Tentry.active & Active) == 0) {
+		p->Tentry.active |= Active;
+		p->Part.changed = 1;
 		edit->changed = 1;
 	}
 
@@ -945,9 +946,9 @@ cmdtype(Edit *edit, int nf, char **f)
 	for(i=0; i<256; i++)
 		if(types[i].desc && strcmp(types[i].desc, q) == 0)
 			break;
-	if(i < 256 && p->type != i) {
-		p->type = i;
-		p->changed = 1;
+	if(i < 256 && p->Tentry.type != i) {
+		p->Tentry.type = i;
+		p->Part.changed = 1;
 		edit->changed = 1;
 	}
 	return nil;
@@ -1048,7 +1049,7 @@ wrextend(Edit *edit, int i, int64_t xbase, int64_t startlba,
 
 	p = (Dospart*)edit->part[i];
 	if(p->primary){
-		*endlba = (int64_t)p->start*sec2cyl;
+		*endlba = (int64_t)p->Part.start*sec2cyl;
 		goto Finish;
 	}
 
@@ -1057,15 +1058,15 @@ wrextend(Edit *edit, int i, int64_t xbase, int64_t startlba,
 	tp = table.entry;
 	ep = tp+NTentry;
 
-	ni = wrextend(edit, i+1, xbase, p->end*sec2cyl, endlba);
+	ni = wrextend(edit, i+1, xbase, p->Part.end*sec2cyl, endlba);
 
 	*tp = p->Tentry;
-	wrtentry(disk, tp, p->type, startlba, startlba+disk->s, p->end*sec2cyl);
+	wrtentry(disk, tp, p->Tentry.type, startlba, startlba+disk->s, p->Part.end*sec2cyl);
 	tp++;
 
-	if(p->end*sec2cyl != *endlba){
+	if(p->Part.end*sec2cyl != *endlba){
 		memset(tp, 0, sizeof *tp);
-		wrtentry(disk, tp, TypeEXTENDED, xbase, p->end*sec2cyl, *endlba);
+		wrtentry(disk, tp, TypeEXTENDED, xbase, p->Part.end*sec2cyl, *endlba);
 		tp++;
 	}
 
@@ -1098,17 +1099,17 @@ wrpart(Edit *edit)
 	ep = tp+NTentry;
 	for(i=0; i<edit->npart && tp<ep; ) {
 		p = (Dospart*)edit->part[i];
-		if(p->start == 0)
+		if(p->Part.start == 0)
 			s = disk->s;
 		else
-			s = p->start*sec2cyl;
+			s = p->Part.start*sec2cyl;
 		if(p->primary) {
 			*tp = p->Tentry;
-			wrtentry(disk, tp, p->type, 0, s, p->end*sec2cyl);
+			wrtentry(disk, tp, p->Tentry.type, 0, s, p->Part.end*sec2cyl);
 			tp++;
 			i++;
 		} else {
-			ni = wrextend(edit, i, p->start*sec2cyl, p->start*sec2cyl, &endlba);
+			ni = wrextend(edit, i, p->Part.start*sec2cyl, p->Part.start*sec2cyl, &endlba);
 			memset(tp, 0, sizeof *tp);
 			if(endlba >= 1024*sec2cyl)
 				t = TypeEXTHUGE;

sys/src/cmd/disk/prep/fdisk.json

@@ -1,8 +1,5 @@
 {
 	"fdisk": {
-		"CFlags": [
-		"-fplan9-extensions"
-		],
 		"Include": [
 			"../../cmd.json"
 		],

sys/src/cmd/disk/prep/prep.json

@@ -1,8 +1,5 @@
 {
 	"prep": {
-		"CFlags": [
-		"-fplan9-extensions"
-		],
 		"Include": [
 			"../../cmd.json"
 		],

sys/src/libdisk/build.json

@@ -1,7 +1,6 @@
 {
 	"libdisk": {
 		"Cflags": [
-		    "-fplan9-extensions",
 			"-Werror"
 		],
 		"Include": [

sys/src/libdisk/scsi.c

@@ -137,11 +137,11 @@ _scsicmd(Scsi *s, uint8_t *cmd, int ccount, void *data, int dcount,
 	int32_t status;
 
 	if(dolock)
-		qlock(s);
+		qlock(&s->QLock);
 	if(write(s->rawfd, cmd, ccount) != ccount) {
 		werrstr("cmd write: %r");
 		if(dolock)
-			qunlock(s);
+			qunlock(&s->QLock);
 		return -1;
 	}
 
@@ -170,11 +170,11 @@ _scsicmd(Scsi *s, uint8_t *cmd, int ccount, void *data, int dcount,
 	if(read(s->rawfd, resp, sizeof(resp)) < 0) {
 		werrstr("resp read: %r\n");
 		if(dolock)
-			qunlock(s);
+			qunlock(&s->QLock);
 		return -1;
 	}
 	if(dolock)
-		qunlock(s);
+		qunlock(&s->QLock);
 
 	resp[sizeof(resp)-1] = '\0';
 	status = atoi((char*)resp);
@@ -199,7 +199,7 @@ _scsiready(Scsi *s, int dolock)
 	int status, i;
 
 	if(dolock)
-		qlock(s);
+		qlock(&s->QLock);
 	werrstr("");
 	for(i=0; i<3; i++) {
 		memset(cmd, 0, sizeof(cmd));
@@ -220,7 +220,7 @@ _scsiready(Scsi *s, int dolock)
 		status = atoi((char*)resp);
 		if(status == 0 || status == 0x02) {
 			if(dolock)
-				qunlock(s);
+				qunlock(&s->QLock);
 			return 0;
 		}
 		if(scsiverbose)
@@ -230,7 +230,7 @@ _scsiready(Scsi *s, int dolock)
 	if(err[0] == '\0')
 		werrstr("unit did not become ready");
 	if(dolock)
-		qunlock(s);
+		qunlock(&s->QLock);
 	return -1;
 }
 
@@ -249,11 +249,11 @@ scsi(Scsi *s, uint8_t *cmd, int ccount, void *v, int dcount, int io)
 
 	data = v;
 	SET(key); SET(code);
-	qlock(s);
+	qlock(&s->QLock);
 	for(tries=0; tries<2; tries++) {
 		n = _scsicmd(s, cmd, ccount, data, dcount, io, 0);
 		if(n >= 0) {
-			qunlock(s);
+			qunlock(&s->QLock);
 			return n;
 		}
 
@@ -275,7 +275,7 @@ scsi(Scsi *s, uint8_t *cmd, int ccount, void *v, int dcount, int io)
 		key = sense[2] & 0xf;
 		code = sense[12];			/* asc */
 		if(code == Recovnoecc || code == Recovecc) { /* recovered errors */
-			qunlock(s);
+			qunlock(&s->QLock);
 			return dcount;
 		}
 
@@ -297,10 +297,10 @@ scsi(Scsi *s, uint8_t *cmd, int ccount, void *v, int dcount, int io)
 	if(cmd[0] == Readtoc && key == Sensenotrdy &&
 	    (code == Nomedium || code == Lunnotrdy)) {
 		s->changetime = 0;
-		qunlock(s);
+		qunlock(&s->QLock);
 		return -1;
 	}
-	qunlock(s);
+	qunlock(&s->QLock);
 
 	if(cmd[0] == Readtoc && key == Sensebadreq && code == Badcdb)
 		return -1;			/* blank media */