git: 9front

Info  •  Files  •  Log  •  Branches

panic(): dont print message twice. for terminals, dont auto reboot.

--- a/sys/src/9/port/devcons.c

+++ b/sys/src/9/port/devcons.c

@@ -240,7 +240,7 @@

 void

 panic(char *fmt, ...)

 {

-	int n, s;

+	int s;

 	va_list arg;

 	char buf[PRINTSIZE];

@@ -253,7 +253,7 @@

 	s = splhi();

 	strcpy(buf, "panic: ");

 	va_start(arg, fmt);

-	n = vseprint(buf+strlen(buf), buf+sizeof(buf), fmt, arg) - buf;

+	vseprint(buf+strlen(buf), buf+sizeof(buf), fmt, arg);

 	va_end(arg);

 	iprint("%s\n", buf);

 	if(consdebug)

@@ -260,10 +260,9 @@

 		(*consdebug)();

 	splx(s);

 	prflush();

-	buf[n] = '\n';

-	putstrn(buf, n+1);

 	dumpstack();

-

+	if(!cpuserver)

+		for(;;);

 	exit(1);

 }

-- 

⑨