PR/49850: Nikolai Lifanov: Document acronyms-o

[bsdgames-darwin.git] / caesar / caesar.c

diff --git a/caesar/caesar.c b/caesar/caesar.c
index 63b8a553f5936c14cf72d5adc0f464768f5f6ed5..1a6a8ea23f6dd961bcfba49d44c0e36d68f25cb6 100644 (file)
--- a/caesar/caesar.c
+++ b/caesar/caesar.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: caesar.c,v 1.20 2005/11/19 14:22:21 rillig Exp $       */
+/*     $NetBSD: caesar.c,v 1.22 2008/07/20 01:03:21 lukem Exp $        */
 
 /*
  * Copyright (c) 1989, 1993
@@ -40,15 +40,15 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
-       The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\
+ The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)caesar.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: caesar.c,v 1.20 2005/11/19 14:22:21 rillig Exp $");
+__RCSID("$NetBSD: caesar.c,v 1.22 2008/07/20 01:03:21 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -129,11 +129,13 @@ get_rotation(const char *arg)
 
        errno = 0;
        rot = strtol(arg, &endp, 10);
-       if (!(errno == 0 && *endp == '\0' && 0 <= rot && rot <= INT_MAX)) {
-               errx(EXIT_FAILURE, "bad rotation value: %s", arg);
-               /* NOTREACHED */
-       }
-       return (int) rot;
+       if (errno == 0 && (arg[0] == '\0' || *endp != '\0'))
+               errno = EINVAL;
+       if (errno == 0 && (rot < 0 || rot > INT_MAX))
+               errno = ERANGE;
+       if (errno)
+               err(EXIT_FAILURE, "Bad rotation value `%s'", arg);
+       return (int)rot;
 }
 
 static void