diff --git a/addop.c b/addop.c
index 8367b58..55d1ceb 100644
--- a/addop.c
+++ b/addop.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.8 $
- * @(#) $Id: addop.c,v 29.8 2006/05/20 08:43:55 chongo Exp $
+ * @(#) $Revision: 29.9 $
+ * @(#) $Id: addop.c,v 29.9 2006/05/22 19:04:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/addop.c,v $
  *
  * Under source code control:	1990/02/15 01:48:10
@@ -211,7 +211,7 @@ endfunc(void)
 	if (newname[0] != '*' && (conf->traceflags & TRACE_FNCODES)) {
 		dumpnames = TRUE;
 		for (size = 0; size < fp->f_opcodecount; ) {
-			printf("%u: ", size);
+			printf("%ld: ", (unsigned long)size);
 			size += dumpop(&fp->f_opcodes[size]);
 		}
 	}
diff --git a/custom/c_argv.c b/custom/c_argv.c
index 2de8dae..18b74bf 100644
--- a/custom/c_argv.c
+++ b/custom/c_argv.c
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.6 $
- * @(#) $Id: c_argv.c,v 29.6 2006/05/19 15:26:10 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: c_argv.c,v 29.7 2006/05/22 19:04:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_argv.c,v $
  *
  * Under source code control:	1997/03/09 20:27:37
@@ -152,10 +152,10 @@ c_argv(char UNUSED *name, int count, VALUE **vals)
 				/* getsize error */
 				printf("\tsize=unknown");
 			}
-			printf("\tsizeof=%u\n", lsizeof(vals[i]));
+			printf("\tsizeof=%ld\n", (long int)lsizeof(vals[i]));
 		} else {
-			printf("\tsize=%ld\tsizeof=%u\n",
-			    elm_count(vals[i]), lsizeof(vals[i]));
+			printf("\tsize=%ld\tsizeof=%ld\n",
+			    elm_count(vals[i]), (long int)lsizeof(vals[i]));
 		}
 	}
 
diff --git a/custom/c_sysinfo.c b/custom/c_sysinfo.c
index 41ed953..dcbbb29 100644
--- a/custom/c_sysinfo.c
+++ b/custom/c_sysinfo.c
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.10 $
- * @(#) $Id: c_sysinfo.c,v 29.10 2004/03/31 05:02:10 chongo Exp $
+ * @(#) $Revision: 29.11 $
+ * @(#) $Id: c_sysinfo.c,v 29.11 2006/05/22 19:04:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/c_sysinfo.c,v $
  *
  * Under source code control:	1997/03/09 23:14:40
@@ -191,6 +191,7 @@ c_sysinfo(char UNUSED *name, int count, VALUE **vals)
 	 * we will return NULL if a value was not found
 	 */
 	result.v_type = V_NULL;
+	result.v_subtype = V_NOSUBTYPE;
 
 	/*
 	 * case 0: if no args, then dump the table with no values
diff --git a/file.c b/file.c
index 714811c..3bae0a4 100644
--- a/file.c
+++ b/file.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.14 $
- * @(#) $Id: file.c,v 29.14 2006/05/20 08:43:55 chongo Exp $
+ * @(#) $Revision: 29.15 $
+ * @(#) $Id: file.c,v 29.15 2006/05/22 19:04:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -1988,7 +1988,7 @@ showfiles(void)
 			math_chr('\n');
 			continue;
 		}
-		printf(" size = %ld\n", sizes[i]);
+		printf(" size = %lld\n", (long long int)sizes[i]);
 		for (j = i + 1; j < idnum; j++) {
 			if (listed[j] || sizes[j] == -1)
 				continue;
diff --git a/hist.c b/hist.c
index 523107f..c408f8a 100644
--- a/hist.c
+++ b/hist.c
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.10 $
- * @(#) $Id: hist.c,v 29.10 2006/05/20 08:43:55 chongo Exp $
+ * @(#) $Revision: 29.11 $
+ * @(#) $Id: hist.c,v 29.11 2006/05/22 19:04:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/hist.c,v $
  *
  * Under source code control:	1993/05/02 20:09:19
@@ -262,7 +262,7 @@ static	void	insert_string(char *str, int len);
  * the line.
  */
 size_t
-hist_getline(char *prompt, char *buf, int len)
+hist_getline(char *prompt, char *buf, size_t len)
 {
 	/*
 	 * initialize if we have not already done so
@@ -351,7 +351,7 @@ hist_init(char *filename)
 	 */
 	if (filename == NULL)
 		filename = HIST_BINDING_FILE;
-	if (opensearchfile(filename, calcpath, NULL, FALSE, FALSE) > 0)
+	if (opensearchfile(filename, calcpath, NULL, FALSE) > 0)
 		return HIST_NOFILE;
 
 	/*
diff --git a/longbits.c b/longbits.c
index 079f34e..8c56940 100644
--- a/longbits.c
+++ b/longbits.c
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: longbits.c,v 29.5 2006/05/19 15:26:10 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: longbits.c,v 29.6 2006/05/22 19:04:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/longbits.c,v $
  *
  * Under source code control:	1994/03/18 03:06:18
@@ -145,7 +145,7 @@ main(int argc, char **argv)
 	 * report size of long
 	 */
 	printf("#undef LONG_BITS\n");
-	printf("#define LONG_BITS %d\t\t/%s/\n",
+	printf("#define LONG_BITS %ld\t\t/%s/\n",
 	  long_bits, "* bit length of a long *");
 	putchar('\n');
 
diff --git a/string.c b/string.c
index b21dd87..3095954 100644
--- a/string.c
+++ b/string.c
@@ -1398,8 +1398,8 @@ showstrings(void)
 		for (j = 0; j < STRALLOC; j++, k++, sp++) {
 			if (sp->s_links > 0) {
 				++count;
-				printf("%5ld  %5ld  %6u  \"",
-					k, sp->s_links, sp->s_len);
+				printf("%5ld  %5ld  %6ld  \"",
+					k, sp->s_links, (long int)sp->s_len);
 				fitstring(sp->s_str, sp->s_len, 50);
 				printf("\"\n");
 			}
@@ -1423,8 +1423,8 @@ showliterals(void)
 		sp = stringconsttable[i];
 		if (sp->s_links > 0) {
 			++count;
-			printf("%5ld  %5ld  %6u  \"",
-				i, sp->s_links, sp->s_len);
+			printf("%5ld  %5ld  %6ld  \"",
+				i, sp->s_links, (long int)sp->s_len);
 			fitstring(sp->s_str, sp->s_len, 50);
 			printf("\"\n");
 		}
diff --git a/version.c b/version.c
index 74c59cf..a301015 100644
--- a/version.c
+++ b/version.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.57 $
- * @(#) $Id: version.c,v 29.57 2006/05/21 06:04:01 chongo Exp $
+ * @(#) $Revision: 29.58 $
+ * @(#) $Id: version.c,v 29.58 2006/05/22 19:04:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -48,7 +48,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	12	/* minor version */
 #define MAJOR_PATCH	0	/* patch level or 0 if no patch */
-#define MINOR_PATCH	0	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	1	/* test number or 0 if no minor patch */
 
 
 /*