===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cal/cal.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- src/usr.bin/cal/cal.c	2006/03/24 03:44:14	1.19
+++ src/usr.bin/cal/cal.c	2006/04/25 05:18:26	1.20
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cal.c,v 1.19 2006/03/24 03:44:14 ray Exp $	*/
+/*	$OpenBSD: cal.c,v 1.20 2006/04/25 05:18:26 tedu Exp $	*/
 /*	$NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)cal.c	8.4 (Berkeley) 4/2/94";
 #else
-static const char rcsid[] = "$OpenBSD: cal.c,v 1.19 2006/03/24 03:44:14 ray Exp $";
+static const char rcsid[] = "$OpenBSD: cal.c,v 1.20 2006/04/25 05:18:26 tedu Exp $";
 #endif
 #endif /* not lint */
 
@@ -137,6 +137,7 @@
 	struct tm *local_time;
 	time_t now;
 	int ch, month, year, yflag;
+	const char *errstr;
 
 	yflag = year = 0;
 	while ((ch = getopt(argc, argv, "jy")) != -1)
@@ -170,7 +171,8 @@
 			local_time = localtime(&now);
 			year = local_time->tm_year + TM_YEAR_BASE;
 		} else {
-			if ((year = atoi(*argv)) < 1 || year > 9999)
+			year = strtonum(*argv, 1, 9999, &errstr);
+			if (errstr)
 				errx(1, "illegal year value: use 1-9999");
 		}
 		break;