utils-std

commit: 20661a8683124d5215ecfdf8c25748fecb710834
parent 248736cbce831e8064973bbd08f3cec4a591d654
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 10 Jun 2025 20:28:24 +0200

cmd/cmp: Properly use >1 for errorneous status

Diffstat:
M
cmd/cmp.c
22
+++++++++++-----------
M
test-cmd/cmp.sh
4
++--

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cmd/cmp.c b/cmd/cmp.c
@@ -44,7 +44,7 @@ do_cmp(FILE *file1, const char *name1, FILE *file2, const char *name2)
 			        ln,
 			        name1,
 			        strerror(errno));
-			return 1;
+			return 2;
 		}
 
 		ssize_t nread2 = getline(&line2, &len2, file2);
@@ -54,7 +54,7 @@ do_cmp(FILE *file1, const char *name1, FILE *file2, const char *name2)
 			{
 				if(!opt_s) fprintf(stderr, "%s: error: EOF on %s line %ld\n", argv0, name2, ln);
 
-				return 1;
+				return 2;
 			}
 
 			fprintf(stderr,
@@ -149,7 +149,7 @@ main(int argc, char *argv[])
 			if(errno != 0)
 			{
 				fprintf(stderr, "%s: error: Failed parsing '-n %s': %s\n", argv0, optarg, strerror(errno));
-				return 1;
+				return 2;
 			}
 			if(endptr != NULL && endptr[0] != 0)
 			{
@@ -158,17 +158,17 @@ main(int argc, char *argv[])
 				        argv0,
 				        optarg,
 				        endptr);
-				return 1;
+				return 2;
 			}
 			break;
 		case ':':
 			fprintf(stderr, "%s: error: Missing operand for option: '-%c'\n", argv0, optopt);
 			usage();
-			return 1;
+			return 2;
 		case '?':
 			GETOPT_UNKNOWN_OPT
 			usage();
-			return 1;
+			return 2;
 		default:
 			abort();
 		}
@@ -180,7 +180,7 @@ main(int argc, char *argv[])
 	if(argc != 2)
 	{
 		fprintf(stderr, "%s: error: Expected 2 arguments, got %d arguments\n", argv0, argc);
-		return 1;
+		return 2;
 	}
 
 	if(strcmp(argv[0], argv[1]) == 0) return 0;
@@ -193,7 +193,7 @@ main(int argc, char *argv[])
 		if(errno != 0)
 		{
 			fprintf(stderr, "%s: error: Failed opening file '%s': %s\n", argv0, argv[0], strerror(errno));
-			return 1;
+			return 2;
 		}
 	}
 
@@ -205,7 +205,7 @@ main(int argc, char *argv[])
 		if(errno != 0)
 		{
 			fprintf(stderr, "%s: error: Failed opening file '%s': %s\n", argv0, argv[1], strerror(errno));
-			return 1;
+			return 2;
 		}
 	}
 
@@ -231,7 +231,7 @@ main(int argc, char *argv[])
 			        argv0,
 			        argv[0],
 			        strerror(errno));
-			return 1;
+			return 2;
 		}
 
 		posix_fadvise(fd1, 0, 0, POSIX_FADV_SEQUENTIAL);
@@ -248,7 +248,7 @@ main(int argc, char *argv[])
 			        argv0,
 			        argv[1],
 			        strerror(errno));
-			return 1;
+			return 2;
 		}
 
 		posix_fadvise(fd2, 0, 0, POSIX_FADV_SEQUENTIAL);
diff --git a/test-cmd/cmp.sh b/test-cmd/cmp.sh
@@ -25,8 +25,8 @@ rm foo bar
 seq 1 3 > seq_1_3
 seq 1 2 > seq_1_2
 
-t --exit=1 seq_1_3-1_2 'seq_1_3 seq_1_2' 'cmp: error: EOF on seq_1_2 line 3
+t --exit=2 seq_1_3-1_2 'seq_1_3 seq_1_2' 'cmp: error: EOF on seq_1_2 line 3
 '
-t --exit=1 s_seq_1_3-1_2 '-s seq_1_3 seq_1_2'
+t --exit=2 s_seq_1_3-1_2 '-s seq_1_3 seq_1_2'
 
 rm seq_1_3 seq_1_2