8 files changed, 147 insertions(+), 75 deletions(-)

M port/chan.c
M port/devcons.c
M port/devproc.c
M port/error.h
M port/parse.c
M port/portdat.h
M port/portfns.h
M port/sysfile.c

@@ 1161,10 1161,8 @@ if(c->umh != nil){
 		 */
 		e.nelems++;
 		if(walk(&c, e.elems+e.nelems-1, 1, nomount) == 0){
-			if(omode&OEXCL){
-				cclose(c);
+			if(omode&OEXCL)
 				error(Eexist);
-			}
 			omode |= OTRUNC;
 			goto Open;
 		}

@@ 801,8 801,13 @@ consread(Chan *c, void *buf, long n, vlong off)
 				*bp++ = '\n';
 			}
 		}
+		if(waserror()){
+			free(b);
+			nexterror();
+		}
 		n = readstr((ulong)offset, buf, n, b);
 		free(b);
+		poperror();
 		return n;
 
 	case Qswap:


@@ 827,8 832,13 @@ consread(Chan *c, void *buf, long n, vlong off)
 		n = 0;
 		for(i = 0; devtab[i] != nil; i++)
 			n += snprint(b+n, READSTR-n, "#%C %s\n", devtab[i]->dc,  devtab[i]->name);
+		if(waserror()){
+			free(b);
+			nexterror();
+		}
 		n = readstr((ulong)offset, buf, n, b);
 		free(b);
+		poperror();
 		return n;
 
 	case Qzero:

@@ 28,6 28,24 @@ enum
 	Qprofile,
 };
 
+enum
+{
+	PCclose,
+	PCclosefiles,
+	PCfixedpri,
+	PChang,
+	PCkill,
+	PCnohang,
+	PCpri,
+	PCprivate,
+	PCprofile,
+	PCstart,
+	PCstartstop,
+	PCstop,
+	PCwaitstop,
+	PCwired,
+};
+
 #define	STATSIZE	(2*KNAMELEN+12+9*12)
 /*
  * Status, fd, and ns are left fully readable (0444) because of their use in debugging,


@@ 55,6 73,23 @@ Dirtab procdir[] =
 	"profile",	{Qprofile},	0,			0400,
 };
 
+Cmdtab proccmd[] = {
+	PCclose,		"close",		2,
+	PCclosefiles,	"closefiles",	1,
+	PCfixedpri,	"fixedpri",		2,
+	PChang,		"hang",		1,
+	PCnohang,	"nohang",		1,
+	PCkill,		"kill",		1,
+	PCpri,		"pri",			2,
+	PCprivate,		"private",		1,
+	PCprofile,		"profile",		1,
+	PCstart,		"start",		1,
+	PCstartstop,	"startstop",	1,
+	PCstop,		"stop",		1,
+	PCwaitstop,	"waitstop",	1,
+	PCwired,		"wired",		2,
+};
+
 /* Segment type from portdat.h */
 static char *sname[]={ "Text", "Data", "Bss", "Stack", "Shared", "Phys", };
 


@@ 1013,17 1048,45 @@ procctlreq(Proc *p, char *va, int n)
 {
 	Segment *s;
 	int i, npc;
-	char buf[64];
+	Cmdbuf *cb;
+	Cmdtab *ct;
 
 	if(p->kp)	/* no ctl requests to kprocs */
 		error(Eperm);
 
-	kstrcpy(buf, va, sizeof buf);
+	cb = parsecmd(va, n);
+	if(waserror()){
+		free(cb);
+		nexterror();
+	}
 
-	if(strncmp(buf, "stop", 4) == 0)
-		procstopwait(p, Proc_stopme);
-	else
-	if(strncmp(buf, "kill", 4) == 0) {
+	if(cb->nf <= 0)
+		error(Ebadctl);
+
+	ct = lookupcmd(cb, proccmd, nelem(proccmd));
+
+	switch(ct->index){
+	case PCclose:
+		procctlclosefiles(p, 0, atoi(cb->f[1]));
+		break;
+	case PCclosefiles:
+		procctlclosefiles(p, 1, 0);
+		break;
+	case PCfixedpri:
+		i = atoi(cb->f[1]);
+		if(i < 0)
+			i = 0;
+		if(i >= Nrq)
+			i = Nrq - 1;
+		if(i > p->basepri && !iseve())
+			error(Eperm);
+		p->basepri = i;
+		p->fixedpri = 1;
+		break;
+	case PChang:
+		p->hang = 1;
+		break;
+	case PCkill:
 		switch(p->state) {
 		case Broken:
 			unbreak(p);


@@ 1037,46 1100,12 @@ procctlreq(Proc *p, char *va, int n)
 			postnote(p, 0, "sys: killed", NExit);
 			p->procctl = Proc_exitme;
 		}
-	}
-	else
-	if(strncmp(buf, "hang", 4) == 0)
-		p->hang = 1;
-	else
-	if(strncmp(buf, "nohang", 6) == 0)
+		break;
+	case PCnohang:
 		p->hang = 0;
-	else
-	if(strncmp(buf, "waitstop", 8) == 0)
-		procstopwait(p, 0);
-	else
-	if(strncmp(buf, "startstop", 9) == 0) {
-		if(p->state != Stopped)
-			error(Ebadctl);
-		p->procctl = Proc_traceme;
-		ready(p);
-		procstopwait(p, Proc_traceme);
-	}
-	else
-	if(strncmp(buf, "start", 5) == 0) {
-		if(p->state != Stopped)
-			error(Ebadctl);
-		ready(p);
-	}
-	else
-	if(strncmp(buf, "closefiles", 10) == 0)
-		procctlclosefiles(p, 1, 0);
-	else
-	if(strncmp(buf, "close", 5) == 0){
-		if(n < 6)
-			error(Ebadctl);
-		procctlclosefiles(p, 0, atoi(buf+6));
-	}else
-	if(strncmp(buf, "private", 7) == 0)
-		p->privatemem = 1;
-	else
-	if(strncmp(buf, "pri", 3) == 0) {
-		if(n < 4)
-			error(Ebadctl);
-		i = atoi(buf+4);
+		break;
+	case PCpri:
+		i = atoi(cb->f[1]);
 		if(i < 0)
 			i = 0;
 		if(i >= Nrq)


@@ 1085,30 1114,11 @@ procctlreq(Proc *p, char *va, int n)
 			error(Eperm);
 		p->basepri = i;
 		p->fixedpri = 0;
-	}
-	else
-	if(strncmp(buf, "fixedpri", 8) == 0) {
-		if(n < 9)
-			error(Ebadctl);
-		i = atoi(buf+9);
-		if(i < 0)
-			i = 0;
-		if(i >= Nrq)
-			i = Nrq - 1;
-		if(i > p->basepri && !iseve())
-			error(Eperm);
-		p->basepri = i;
-		p->fixedpri = 1;
-	}
-	else
-	if(strncmp(buf, "wired", 5) == 0) {
-		if(n < 6)
-			error(Ebadctl);
-		i = atoi(buf+6);
-		procwired(p, i);
-	}
-	else
-	if(strncmp(buf, "profile", 7) == 0) {
+		break;
+	case PCprivate:
+		p->privatemem = 1;
+		break;
+	case PCprofile:
 		s = p->seg[TSEG];
 		if(s == 0 || (s->type&SG_TYPE) != SG_TEXT)
 			error(Ebadctl);


@@ 1118,9 1128,32 @@ procctlreq(Proc *p, char *va, int n)
 		s->profile = malloc(npc*sizeof(*s->profile));
 		if(s->profile == 0)
 			error(Enomem);
+		break;
+	case PCstart:
+		if(p->state != Stopped)
+			error(Ebadctl);
+		ready(p);
+		break;
+	case PCstartstop:
+		if(p->state != Stopped)
+			error(Ebadctl);
+		p->procctl = Proc_traceme;
+		ready(p);
+		procstopwait(p, Proc_traceme);
+		break;
+	case PCstop:
+		procstopwait(p, Proc_stopme);
+		break;
+	case PCwaitstop:
+		procstopwait(p, 0);
+		break;
+	case PCwired:
+		procwired(p, atoi(cb->f[1]));
+		break;
 	}
-	else
-		error(Ebadctl);
+
+	poperror();
+	free(cb);
 }
 
 int

@@ 22,6 22,7 @@ extern char Etoosmall[];	/* read or write too small */
 extern char Enoport[];		/* network port not available */
 extern char Ehungup[];		/* i/o on hungup channel */
 extern char Ebadctl[];		/* bad process or channel control request */
+extern char Eargctl[];		/* wrong number of arguments in control request */
 extern char Enodev[];		/* no free devices */
 extern char Eprocdied[];	/* process exited */
 extern char Enochild[];		/* no living children */

@@ 67,3 67,24 @@ parsecmd(char *p, int n)
 	return cb;
 }
 
+/*
+ * Look up entry in table
+ */
+Cmdtab*
+lookupcmd(Cmdbuf *cb, Cmdtab *ct, int nct)
+{
+	int i;
+
+	if(cb->nf == 0)
+		error(Ebadctl);
+
+	for(i=0; i<nct; i++, ct++){
+		if(strcmp(cb->f[0], ct->cmd) != 0)
+			continue;
+		if(ct->narg!=0 && ct->narg!=cb->nf)
+			error(Eargctl);
+		return ct;
+	}
+	error(Ebadctl);
+	return nil;
+}

@@ 2,6 2,7 @@ typedef struct Alarms	Alarms;
 typedef struct Block	Block;
 typedef struct Chan	Chan;
 typedef struct Cmdbuf	Cmdbuf;
+typedef struct Cmdtab	Cmdtab;
 typedef struct Cname	Cname;
 typedef struct Crypt	Crypt;
 typedef struct Dev	Dev;


@@ 721,6 722,13 @@ struct Cmdbuf
 	int	nf;
 };
 
+struct Cmdtab
+{
+	int	index;	/* used by client to switch on result */
+	char	*cmd;	/* command name */
+	int	narg;	/* expected #args; 0 ==> variadic */
+};
+
 /*
  *  routines to access UART hardware
  */

@@ 153,6 153,7 @@ char*		logctl(Log*, int, char**, Logflag*);
 void		logn(Log*, int, void*, int);
 long		logread(Log*, void*, ulong, long);
 void		log(Log*, int, char*, ...);
+Cmdtab*	lookupcmd(Cmdbuf*, Cmdtab*, int);
 void		vlog(Log*, int, char*, va_list);
 Page*		lookpage(Image*, ulong);
 void		machinit(void);

@@ 820,7 820,7 @@ syscreate(ulong *arg)
 	int fd;
 	Chan *c = 0;
 
-	openmode(arg[1]);	/* error check only */
+	openmode(arg[1]&~OEXCL);	/* error check only; OEXCL okay here */
 	if(waserror()) {
 		if(c)
 			cclose(c);