From c7a53338c0aa967bb607b8fdc183e8c3f348df84 Mon Sep 17 00:00:00 2001
From: szaka <szaka>
Date: Wed, 5 Apr 2006 12:43:06 +0000
Subject: [PATCH] Fix all incorrect getopt_long() return value usages.

---
 ChangeLog                | 1 +
 ntfsprogs/mkntfs.c       | 4 ++--
 ntfsprogs/ntfscat.c      | 4 ++--
 ntfsprogs/ntfsclone.c    | 4 ++--
 ntfsprogs/ntfscluster.c  | 4 ++--
 ntfsprogs/ntfscmp.c      | 4 ++--
 ntfsprogs/ntfscp.c       | 4 ++--
 ntfsprogs/ntfsdecrypt.c  | 4 ++--
 ntfsprogs/ntfsfix.c      | 4 ++--
 ntfsprogs/ntfsinfo.c     | 4 ++--
 ntfsprogs/ntfslabel.c    | 2 +-
 ntfsprogs/ntfsls.c       | 4 ++--
 ntfsprogs/ntfsmount.c    | 4 ++--
 ntfsprogs/ntfsmove.c     | 2 +-
 ntfsprogs/ntfsresize.c   | 4 ++--
 ntfsprogs/ntfsrm.c       | 2 +-
 ntfsprogs/ntfsundelete.c | 4 ++--
 ntfsprogs/ntfswipe.c     | 2 +-
 18 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c1a8726..fdd65ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@ xx/xx/2006 - 1.13.1-WIP
 	- libntfs: add ntfs_str2ucs(), ntfs_freeucs(), ntfs_mft_usn_dec()
 	  and ntfs_inode_badclus_bad() functions, and convert all copy-pastes
 	  to use them.  (Szaka)
+	- Fix all incorrect getopt_long() return value usages.  (Szaka)
 
 27/02/2006 - 1.13.0 - Lots and lots and lots of fixes and enhancements.
 
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 2bb882e4..481ef94e 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -372,7 +372,7 @@ static BOOL mkntfs_parse_options(int argc, char *argv[], struct mkntfs_options *
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c = -1;
+	int c = -1;
 	int lic = 0;
 	int err = 0;
 	int ver = 0;
@@ -384,7 +384,7 @@ static BOOL mkntfs_parse_options(int argc, char *argv[], struct mkntfs_options *
 
 	opterr = 0; /* We'll handle the errors, thank you. */
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:		/* A device, or a number of sectors */
 			if (!opts2->dev_name)
diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c
index 85115349..b744237a 100644
--- a/ntfsprogs/ntfscat.c
+++ b/ntfsprogs/ntfscat.c
@@ -169,7 +169,7 @@ static int parse_options(int argc, char **argv)
 		{ NULL,		    0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -183,7 +183,7 @@ static int parse_options(int argc, char **argv)
 	opts.attr_name = NULL;
 	opts.attr_name_len = 0;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c
index a9e19b3b..3b0177f6 100644
--- a/ntfsprogs/ntfsclone.c
+++ b/ntfsprogs/ntfsclone.c
@@ -297,11 +297,11 @@ static void parse_options(int argc, char **argv)
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c;
+	int c;
 
 	memset(&opt, 0, sizeof(opt));
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (opt.volume)
diff --git a/ntfsprogs/ntfscluster.c b/ntfsprogs/ntfscluster.c
index 2ca1db1e..d7c13f8a 100644
--- a/ntfsprogs/ntfscluster.c
+++ b/ntfsprogs/ntfscluster.c
@@ -127,7 +127,7 @@ static int parse_options(int argc, char **argv)
 		{ NULL,		0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -140,7 +140,7 @@ static int parse_options(int argc, char **argv)
 	opts.range_begin = -1;
 	opts.range_end   = -1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfscmp.c b/ntfsprogs/ntfscmp.c
index dc64578a..777208ea 100644
--- a/ntfsprogs/ntfscmp.c
+++ b/ntfsprogs/ntfscmp.c
@@ -177,12 +177,12 @@ static void parse_options(int argc, char **argv)
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c;
+	int c;
 
 	memset(&opt, 0, sizeof(opt));
 	opt.show_progress = 1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opt.vol1) {
diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c
index 97bd0156..f8e703e3 100644
--- a/ntfsprogs/ntfscp.c
+++ b/ntfsprogs/ntfscp.c
@@ -134,7 +134,7 @@ static int parse_options(int argc, char **argv)
 	};
 
 	char *s;
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -150,7 +150,7 @@ static int parse_options(int argc, char **argv)
 
 	opterr = 0; /* We'll handle the errors, thank you. */
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char) -1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfsdecrypt.c b/ntfsprogs/ntfsdecrypt.c
index 22faa2c7..49e95052 100644
--- a/ntfsprogs/ntfsdecrypt.c
+++ b/ntfsprogs/ntfsdecrypt.c
@@ -195,7 +195,7 @@ static int parse_options(int argc, char **argv)
 		{NULL, 0, NULL, 0}
 	};
 
-	char c = -1;
+	int c = -1;
 	int err = 0;
 	int ver = 0;
 	int help = 0;
@@ -204,7 +204,7 @@ static int parse_options(int argc, char **argv)
 
 	opts.inode = -1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device)
diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c
index b27b5ff2..71a3d3a0 100644
--- a/ntfsprogs/ntfsfix.c
+++ b/ntfsprogs/ntfsfix.c
@@ -130,7 +130,7 @@ static void version(void)
  */
 static void parse_options(int argc, char **argv)
 {
-	char c;
+	int c;
 	static const char *sopt = "-hV";
 	static const struct option lopt[] = {
 		{ "help",	no_argument,	NULL, 'h' },
@@ -140,7 +140,7 @@ static void parse_options(int argc, char **argv)
 
 	memset(&opt, 0, sizeof(opt));
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opt.volume)
diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index f6be583e..d76b05a2 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -166,7 +166,7 @@ static int parse_options(int argc, char *argv[])
 		{ NULL,		 0,			NULL,  0  }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -177,7 +177,7 @@ static int parse_options(int argc, char *argv[])
 	opts.inode = -1;
 	opts.filename = NULL;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		ntfs_log_trace("optind=%d; c='%c' optarg=\"%s\".\n", optind, c,
 				optarg);
 		switch (c) {
diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c
index 9d016698..f219eb6a 100644
--- a/ntfsprogs/ntfslabel.c
+++ b/ntfsprogs/ntfslabel.c
@@ -122,7 +122,7 @@ static int parse_options(int argc, char *argv[])
 		{ NULL, 0, NULL, 0 },
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
diff --git a/ntfsprogs/ntfsls.c b/ntfsprogs/ntfsls.c
index 046c5604..40f291b6 100644
--- a/ntfsprogs/ntfsls.c
+++ b/ntfsprogs/ntfsls.c
@@ -210,7 +210,7 @@ static int parse_options(int argc, char *argv[])
 		{ NULL, 0, NULL, 0 },
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -222,7 +222,7 @@ static int parse_options(int argc, char *argv[])
 	opts.device = NULL;
 	opts.path = "/";
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:
 			if (!opts.device)
diff --git a/ntfsprogs/ntfsmount.c b/ntfsprogs/ntfsmount.c
index 51ac13a3..0018b103 100644
--- a/ntfsprogs/ntfsmount.c
+++ b/ntfsprogs/ntfsmount.c
@@ -1675,7 +1675,7 @@ static char *realpath(const char *path, char *resolved_path)
 static int parse_options(int argc, char *argv[])
 {
 	int err = 0, help = 0;
-	char c = -1;
+	int c = -1;
 
 	static const char *sopt = "-o:h?qv";
 	static const struct option lopt[] = {
@@ -1692,7 +1692,7 @@ static int parse_options(int argc, char *argv[])
 	opts.options = NULL;
 	opts.device = NULL;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfsmove.c b/ntfsprogs/ntfsmove.c
index 6b2999af..050a8586 100644
--- a/ntfsprogs/ntfsmove.c
+++ b/ntfsprogs/ntfsmove.c
@@ -121,7 +121,7 @@ static int parse_options(int argc, char **argv)
 		{ NULL,		0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c
index 58758f12..520be42f 100644
--- a/ntfsprogs/ntfsresize.c
+++ b/ntfsprogs/ntfsresize.c
@@ -453,7 +453,7 @@ static int parse_options(int argc, char **argv)
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c;
+	int c;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
@@ -461,7 +461,7 @@ static int parse_options(int argc, char **argv)
 	memset(&opt, 0, sizeof(opt));
 	opt.show_progress = 1;
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!err && !opt.volume)
diff --git a/ntfsprogs/ntfsrm.c b/ntfsprogs/ntfsrm.c
index b5e853d8..c121eae1 100644
--- a/ntfsprogs/ntfsrm.c
+++ b/ntfsprogs/ntfsrm.c
@@ -126,7 +126,7 @@ static int parse_options(int argc, char **argv)
 		{ NULL,			0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	int err  = 0;
 	int ver  = 0;
 	int help = 0;
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index ed88f322..b18d149b 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -450,7 +450,7 @@ static int parse_options(int argc, char *argv[])
 		{ NULL, 0, NULL, 0 }
 	};
 
-	char c = -1;
+	int c = -1;
 	char *end = NULL;
 	int err  = 0;
 	int ver  = 0;
@@ -463,7 +463,7 @@ static int parse_options(int argc, char *argv[])
 	opts.uinode   = -1;
 	opts.percent  = -1;
 	opts.fillbyte = -1;
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c
index 094d132c..da713ca0 100644
--- a/ntfsprogs/ntfswipe.c
+++ b/ntfsprogs/ntfswipe.c
@@ -209,7 +209,7 @@ static int parse_options(int argc, char *argv[])
 		{ NULL,		0,			NULL, 0   }
 	};
 
-	char c = -1;
+	int c = -1;
 	char *end;
 	int err  = 0;
 	int ver  = 0;