diff -ur e2fsprogs-1.10/debugfs/debugfs.c e2fsprogs-1.10.new/debugfs/debugfs.c
--- e2fsprogs-1.10/debugfs/debugfs.c	Fri Apr 11 04:48:16 1997
+++ e2fsprogs-1.10.new/debugfs/debugfs.c	Sat Nov  8 12:07:49 1997
@@ -74,7 +74,7 @@
 void do_open_filesys(int argc, char **argv)
 {
 	const char	*usage = "Usage: open [-w] <device>";
-	char	c;
+	int	c;
 	int open_flags = 0;
 	
 	optind = 0;
@@ -1409,7 +1409,7 @@
 	int		retval;
 	int		sci_idx;
 	const char	*usage = "Usage: debugfs [[-w] device]";
-	char		c;
+	int		c;
 	int		open_flags = 0;
 	char		*request = 0;
 	int		exit_status = 0;
diff -ur e2fsprogs-1.10/debugfs/dump.c e2fsprogs-1.10.new/debugfs/dump.c
--- e2fsprogs-1.10/debugfs/dump.c	Sat Sep  7 22:08:29 1996
+++ e2fsprogs-1.10.new/debugfs/dump.c	Sat Nov  8 11:57:55 1997
@@ -186,7 +186,7 @@
 {
 	ino_t	inode;
 	int	fd;
-	char	c;
+	int	c;
 	int	preserve = 0;
 	const char *dump_usage = "Usage: dump_inode [-p] <file> <output_file>";
 	char	*in_fn, *out_fn;
diff -ur e2fsprogs-1.10/e2fsck/e2fsck.c e2fsprogs-1.10.new/e2fsck/e2fsck.c
--- e2fsprogs-1.10/e2fsck/e2fsck.c	Thu Apr 10 13:35:41 1997
+++ e2fsprogs-1.10.new/e2fsck/e2fsck.c	Sat Nov  8 11:53:53 1997
@@ -458,7 +458,7 @@
 static void PRS(int argc, char *argv[])
 {
 	int		flush = 0;
-	char		c;
+	int		c;
 #ifdef MTRACE
 	extern void	*mallwatch;
 #endif
diff -ur e2fsprogs-1.10/e2fsck/iscan.c e2fsprogs-1.10.new/e2fsck/iscan.c
--- e2fsprogs-1.10/e2fsck/iscan.c	Mon Sep  4 14:53:43 1995
+++ e2fsprogs-1.10.new/e2fsck/iscan.c	Sat Nov  8 11:59:51 1997
@@ -49,7 +49,7 @@
 static void PRS(int argc, char *argv[])
 {
 	int		flush = 0;
-	char		c;
+	int		c;
 #ifdef MTRACE
 	extern void	*mallwatch;
 #endif
diff -ur e2fsprogs-1.10/e2fsck/scantest.c e2fsprogs-1.10.new/e2fsck/scantest.c
--- e2fsprogs-1.10/e2fsck/scantest.c	Tue Jun 13 00:13:24 1995
+++ e2fsprogs-1.10.new/e2fsck/scantest.c	Sat Nov  8 12:12:44 1997
@@ -7,9 +7,6 @@
 #include <ctype.h>
 #include <termios.h>
 #include <time.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 #include <unistd.h>
 #ifdef HAVE_MNTENT_H
 #include <mntent.h>
diff -ur e2fsprogs-1.10/misc/badblocks.c e2fsprogs-1.10.new/misc/badblocks.c
--- e2fsprogs-1.10/misc/badblocks.c	Sun Mar  9 06:48:51 1997
+++ e2fsprogs-1.10.new/misc/badblocks.c	Sat Nov  8 12:01:28 1997
@@ -262,7 +262,7 @@
 
 void main (int argc, char ** argv)
 {
-	char c;
+	int c;
 	char * tmp;
 	char * device_name;
 	char * output_file = NULL;
diff -ur e2fsprogs-1.10/misc/chattr.c e2fsprogs-1.10.new/misc/chattr.c
--- e2fsprogs-1.10/misc/chattr.c	Sat Apr 12 00:55:57 1997
+++ e2fsprogs-1.10.new/misc/chattr.c	Sat Nov  8 12:13:11 1997
@@ -19,9 +19,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <fcntl.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -ur e2fsprogs-1.10/misc/dumpe2fs.c e2fsprogs-1.10.new/misc/dumpe2fs.c
--- e2fsprogs-1.10/misc/dumpe2fs.c	Thu Apr 10 13:09:54 1997
+++ e2fsprogs-1.10.new/misc/dumpe2fs.c	Sat Nov  8 12:02:36 1997
@@ -178,7 +178,7 @@
 	ext2_filsys	fs;
 	int		print_badblocks = 0;
 	int		big_endian;
-	char		c;
+	int		c;
 
 	initialize_ext2_error_table();
 	fprintf (stderr, "dumpe2fs %s, %s for EXT2 FS %s, %s\n",
diff -ur e2fsprogs-1.10/misc/fsck.c e2fsprogs-1.10.new/misc/fsck.c
--- e2fsprogs-1.10/misc/fsck.c	Sat Mar  8 18:06:29 1997
+++ e2fsprogs-1.10.new/misc/fsck.c	Sat Nov  8 12:13:31 1997
@@ -49,9 +49,6 @@
 #include <errno.h>
 #endif
 #include <malloc.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 
 #include "../version.h"
 #include "fsck.h"
diff -ur e2fsprogs-1.10/misc/lsattr.c e2fsprogs-1.10.new/misc/lsattr.c
--- e2fsprogs-1.10/misc/lsattr.c	Thu Jan  2 05:05:46 1997
+++ e2fsprogs-1.10.new/misc/lsattr.c	Sat Nov  8 12:03:26 1997
@@ -121,7 +121,7 @@
 
 void main (int argc, char ** argv)
 {
-	char c;
+	int c;
 	int i;
 
 	fprintf (stderr, "lsattr %s, %s for EXT2 FS %s, %s\n",
diff -ur e2fsprogs-1.10/misc/mke2fs.c e2fsprogs-1.10.new/misc/mke2fs.c
--- e2fsprogs-1.10/misc/mke2fs.c	Thu Apr 24 15:52:32 1997
+++ e2fsprogs-1.10.new/misc/mke2fs.c	Sat Nov  8 12:01:02 1997
@@ -593,7 +593,7 @@
 
 static void PRS(int argc, char *argv[])
 {
-	char	c;
+	int	c;
 	int	size;
 	char	* tmp;
 	blk_t	max = 8192;
diff -ur e2fsprogs-1.10/misc/tune2fs.c e2fsprogs-1.10.new/misc/tune2fs.c
--- e2fsprogs-1.10/misc/tune2fs.c	Sun Apr  6 17:38:48 1997
+++ e2fsprogs-1.10.new/misc/tune2fs.c	Sat Nov  8 12:00:31 1997
@@ -103,7 +103,7 @@
 
 void main (int argc, char ** argv)
 {
-	char c;
+	int c;
 	char * tmp;
 	errcode_t retval;
 	ext2_filsys fs;
Only in e2fsprogs-1.10.new: probfiles
diff -ur e2fsprogs-1.10/tests/progs/test_icount.c e2fsprogs-1.10.new/tests/progs/test_icount.c
--- e2fsprogs-1.10/tests/progs/test_icount.c	Fri Apr  4 18:33:11 1997
+++ e2fsprogs-1.10.new/tests/progs/test_icount.c	Sat Nov  8 12:04:19 1997
@@ -297,7 +297,7 @@
 	int		retval;
 	int		sci_idx;
 	const char	*usage = "Usage: test_icount [-R request] [-f cmd_file]";
-	char		c;
+	int		c;
 	char		*request = 0;
 	int		exit_status = 0;
 	char		*cmd_file = 0;
diff -ur e2fsprogs-1.10/tests/progs/test_rel.c e2fsprogs-1.10.new/tests/progs/test_rel.c
--- e2fsprogs-1.10/tests/progs/test_rel.c	Wed Mar 26 03:39:49 1997
+++ e2fsprogs-1.10.new/tests/progs/test_rel.c	Sat Nov  8 12:03:59 1997
@@ -712,7 +712,7 @@
 	int		retval;
 	int		sci_idx;
 	const char	*usage = "Usage: test_rel [-R request] [-f cmd_file]";
-	char		c;
+	int		c;
 	char		*request = 0;
 	int		exit_status = 0;
 	char		*cmd_file = 0;