From b11e382851696221c71f2089ba916f4b47c012c3 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Mon, 19 Jun 1989 09:56:16 +0000
Subject: [PATCH] some minor corrections

---
 lang/cem/libcc/stdio/doprnt.c | 3 +--
 lang/cem/libcc/stdio/getw.c   | 2 +-
 lang/m2/comp/MakeVersion      | 2 +-
 lang/m2/comp/type.c           | 3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lang/cem/libcc/stdio/doprnt.c b/lang/cem/libcc/stdio/doprnt.c
index 55f0e2f44..6b37dbff0 100644
--- a/lang/cem/libcc/stdio/doprnt.c
+++ b/lang/cem/libcc/stdio/doprnt.c
@@ -225,9 +225,8 @@ _doprnt(fmt,ap,stream)
 			break;
 #endif
 		case 'r':
-			ap = va_arg(ap, char *);
+			ap = va_arg(ap, va_list);
 			fmt = va_arg(ap, char *);
-			fmt=oldfmt;
 			continue;
 		}
 #ifndef NOFLOAT
diff --git a/lang/cem/libcc/stdio/getw.c b/lang/cem/libcc/stdio/getw.c
index 296c08f58..40c879b49 100644
--- a/lang/cem/libcc/stdio/getw.c
+++ b/lang/cem/libcc/stdio/getw.c
@@ -11,6 +11,6 @@ int getw(iop)
 	while (cnt--) {
 		*p++ = getc(iop);
 	}
-	if (foef(iop) || ferror(iop)) return EOF;
+	if (feof(iop) || ferror(iop)) return EOF;
 	return w;
 }
diff --git a/lang/m2/comp/MakeVersion b/lang/m2/comp/MakeVersion
index 6b9d7f5e9..2ca5509a7 100755
--- a/lang/m2/comp/MakeVersion
+++ b/lang/m2/comp/MakeVersion
@@ -5,4 +5,4 @@ sed "s/\.$VERSION/.$NEWVERSION/" < Version.c > tmp$$
 mv tmp$$ Version.c
 CM "$*"
 V=`cat Version.c`
-SV > ../versions/V`expr "$V" ':' '.*\([0-9][0-9]*\.[0-9][0-9]*\).*'`
+SV > Versions/V`expr "$V" ':' '.*\([0-9][0-9]*\.[0-9][0-9]*\).*'`
diff --git a/lang/m2/comp/type.c b/lang/m2/comp/type.c
index 5842f69cf..64da373a5 100644
--- a/lang/m2/comp/type.c
+++ b/lang/m2/comp/type.c
@@ -584,11 +584,12 @@ ArraySizes(tp)
 	getbounds(index_type, &(tp->arr_low), &(tp->arr_high));
 	diff = tp->arr_high - tp->arr_low;
 
-	if (! fit(diff, (int) int_size)) {
+	if (diff < 0 || ! fit(diff, (int) int_size)) {
 		error("too many elements in array");
 	}
 
 	tp->tp_size = align((diff + 1) * tp->arr_elsize, tp->tp_align);
+	/* ??? check overflow ??? */
 	if (! ufit(tp->tp_size, (int) pointer_size)) {
 		error("array too large");
 	}
-- 
2.34.1