commit 040dac1752a5c3728fc4abbb2217ecd9c011aae3
author Jürg Billeter <j@bitron.ch> Tue Jan 03 18:06:23 2006 +0100
committer H. Peter Anvin <hpa@zytor.com> Tue Jan 03 12:21:53 2006 -0800
tree c15141dd543dca18d2e39c97fa4c62f729e1dc5c
parent 49ab561194c19b980850c8f46973b317ea6e4857

Fix fstype crash

fstype is currently broken in klibc (1.1.14 and git). It segfaults on
startup when not invoked with an argument.

Attached patch fixes that.

PS: The previously reported problems with klibc 1.1.8 don't occur
anymore, thanks.

Regards,

Jürg
--
Jürg Billeter <j@bitron.ch>

utils/fstype.c

diff --git a/utils/fstype.c b/utils/fstype.c
index e9cdf28..549e1e0 100644
--- a/utils/fstype.c
+++ b/utils/fstype.c
@@ -225,12 +225,12 @@
 
 	progname = argv[0];
 
-	if (argc >= 2) {
+	if (argc > 2) {
 		fprintf(stderr, "Usage: %s [file]\n", progname);
 		return 1;
 	}
 
-	if (argc >= 1 && strcmp(argv[1], "-")) {
+	if (argc > 1 && strcmp(argv[1], "-")) {
 		fd = open(argv[1], O_RDONLY);
 		if ( fd < 0 ) {
 			perror(argv[1]);