acid: fix format string bugs and comment line counting (from eriks patch/acid-nits patch)

6 files changed, 17 insertions, 14 deletions

diff --git a/sys/src/cmd/acid/acid.h b/sys/src/cmd/acid/acid.h
index a050bc51b..897a0cc50 100644
--- a/sys/src/cmd/acid/acid.h
+++ b/sys/src/cmd/acid/acid.h
@@ -243,6 +243,10 @@ void	yyerror(char*, ...);
 int	yylex(void);
 int	yyparse(void);
 
+#pragma	varargck	argpos	error		1
+#pragma	varargck	argpos	fatal		1
+#pragma	varargck	argpos	yyerror		1
+
 enum
 {
 	ONAME,
diff --git a/sys/src/cmd/acid/expr.c b/sys/src/cmd/acid/expr.c
index b13c625db..4ba0943c2 100644
--- a/sys/src/cmd/acid/expr.c
+++ b/sys/src/cmd/acid/expr.c
@@ -537,7 +537,7 @@ omod(Node *n, Node *res)
 	res->op = OCONST;
 	res->type = TINT;
 	if(l.type != TINT || r.type != TINT)
-		error("bad expr type %");
+		error("bad expr type %%");
 	res->ival = l.ival%r.ival;
 }
 
diff --git a/sys/src/cmd/acid/lex.c b/sys/src/cmd/acid/lex.c
index ca28548c1..0092978fa 100644
--- a/sys/src/cmd/acid/lex.c
+++ b/sys/src/cmd/acid/lex.c
@@ -329,6 +329,14 @@ loop:
 	case '\t':
 		goto loop;
 
+	case '/':
+		c = lexc();
+		if(c != '/'){
+			unlexc(c);
+			return '/';
+		}
+		eatnl();
+
 	case '\n':
 		line++;
 		if(interactive == 0)
@@ -391,15 +399,6 @@ loop:
 		unlexc(c);
 		return '+';
 
-	case '/':
-		c = lexc();
-		if(c == '/') {
-			eatnl();
-			goto loop;
-		}
-		unlexc(c);
-		return '/';
-
 	case '\'':
 		c = lexc();
 		if(c == '\\')
diff --git a/sys/src/cmd/acid/main.c b/sys/src/cmd/acid/main.c
index f5b67bd05..0ef9f65cf 100644
--- a/sys/src/cmd/acid/main.c
+++ b/sys/src/cmd/acid/main.c
@@ -162,7 +162,7 @@ attachfiles(char *aout, int pid)
 			text = open(aout, OREAD);
 
 		if(text < 0)
-			error("%s: can't open %s: %r\n", argv0, aout);
+			error("%s: can't open %s: %r", argv0, aout);
 		readtext(aout);
 	}
 	if(pid)					/* pid given */
@@ -273,7 +273,7 @@ readtext(char *s)
 		print("%s: (error) loadmap: cannot make symbol map\n", argv0);
 
 	if(syminit(text, &fhdr) < 0) {
-		print("%s: (error) syminit: %r\n", argv0);
+		print("%s: (error) syminit: %r", argv0);
 		return;
 	}
 	print("%s:%s\n", s, fhdr.name);
diff --git a/sys/src/cmd/acid/proc.c b/sys/src/cmd/acid/proc.c
index efb06d047..16661ef5f 100644
--- a/sys/src/cmd/acid/proc.c
+++ b/sys/src/cmd/acid/proc.c
@@ -87,7 +87,7 @@ nproc(char **argv)
 		open("/dev/cons", OWRITE);
 		open("/dev/cons", OWRITE);
 		exec(argv[0], argv);
-		fatal("new: exec %s: %r");
+		fatal("new: exec %s: %r", argv[0]);
 	default:
 		install(pid);
 		msg(pid, "waitstop");
diff --git a/sys/src/cmd/acid/util.c b/sys/src/cmd/acid/util.c
index c861d1994..f77e9f829 100644
--- a/sys/src/cmd/acid/util.c
+++ b/sys/src/cmd/acid/util.c
@@ -203,7 +203,7 @@ rget(Map *map, char *reg)
 		break;
 	}
 	if(ret < 0)
-		error("can't get register %s: %r\n", reg);
+		error("can't get register %s: %r", reg);
 	return v;
 }