From c87180589e5ebca53e3ccd70798eb155ee1c40ef Mon Sep 17 00:00:00 2001
From: "Tim J. Robbins" <tjr@FreeBSD.org>
Date: Fri, 7 Jun 2002 02:30:56 +0000
Subject: [PATCH] Exit >1 when an error occurs, regardless of whether -s is
 specified (SUSv3)

---
 usr.bin/cmp/cmp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 162c6cd1476..1184abe6b87 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -116,7 +116,7 @@ endargs:
 		if (!sflag)
 			err(ERR_EXIT, "%s", file1);
 		else
-			exit(1);
+			exit(ERR_EXIT);
 	}
 	if (strcmp(file2 = argv[1], "-") == 0) {
 		if (special)
@@ -130,7 +130,7 @@ endargs:
 		if (!sflag)
 			err(ERR_EXIT, "%s", file2);
 		else
-			exit(1);
+			exit(ERR_EXIT);
 	}
 
 	skip1 = argc > 2 ? strtol(argv[2], NULL, 0) : 0;
@@ -141,7 +141,7 @@ endargs:
 			if (!sflag)
 				err(ERR_EXIT, "%s", file1);
 			else
-				exit(1);
+				exit(ERR_EXIT);
 		}
 		if (!S_ISREG(sb1.st_mode))
 			special = 1;
@@ -150,7 +150,7 @@ endargs:
 				if (!sflag)
 					err(ERR_EXIT, "%s", file2);
 				else
-					exit(1);
+					exit(ERR_EXIT);
 			}
 			if (!S_ISREG(sb2.st_mode))
 				special = 1;