%n e2fsprogs
%v 1.06
%c *
%l *
%b *
%d *
%f *
%t e2fsprogs-1.06.tgz
%w Linux
%%
%setup
patch -u -p1 <<'ENDPATCH'
diff -ru2N e2fsprogs-1.06/MCONFIG.in e2fsprogs-MCC/MCONFIG.in
--- e2fsprogs-1.06/MCONFIG.in	Tue Sep 10 04:12:42 1996
+++ e2fsprogs-MCC/MCONFIG.in	Mon Oct 14 00:07:04 1996
@@ -25,5 +25,6 @@
 CC = @CC@
 DEFS = @DEFS@
-CFLAGS = @CFLAGS@
+SHLIB = libext2fs.so.1.06
+CFLAGS = -O6
 ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
 	-I$(top_builddir)/lib -I$(top_srcdir)/lib $(LINUX_INCLUDE) 
diff -ru2N e2fsprogs-1.06/Makefile.in e2fsprogs-MCC/Makefile.in
--- e2fsprogs-1.06/Makefile.in	Mon Oct  7 13:22:29 1996
+++ e2fsprogs-MCC/Makefile.in	Mon Oct 14 00:10:51 1996
@@ -13,6 +13,13 @@
 
 SUBS= include/linux/types.h
+partials = lib/e2p/libe2p.a lib/et/libcom_err.a lib/ext2fs/libext2fs.a lib/ss/libss.a lib/uuid/libuuid.a
 
-all:: $(SUBS) libs progs
+all:: $(SUBS) libs $(SHLIB) progs
+$(SHLIB): $(partials)
+	rm -rf tmp
+	mkdir tmp
+	(cd tmp; for i in $(partials);do ar x ../$$i;done)
+	$(CC) -shared -o $(SHLIB) -Wl,-soname,$(SHLIB) tmp/*.o
+	rm -rf tmp
 
 progs: $(SUBS) all-progs-recursive
diff -ru2N e2fsprogs-1.06/debugfs/Makefile.in e2fsprogs-MCC/debugfs/Makefile.in
--- e2fsprogs-1.06/debugfs/Makefile.in	Tue Sep 10 04:30:39 1996
+++ e2fsprogs-MCC/debugfs/Makefile.in	Mon Oct 14 00:12:28 1996
@@ -23,6 +23,6 @@
 	$(srcdir)/dump.c
 
-LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)  $(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)  $(LIBUUID)
+LIBS= ../$(SHLIB)
+DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) $(LIBUUID) $(LIBS)
 
 .c.o:
diff -ru2N e2fsprogs-1.06/debugfs/debugfs.8.in e2fsprogs-MCC/debugfs/debugfs.8.in
--- e2fsprogs-1.06/debugfs/debugfs.8.in	Sat Aug 31 15:52:16 1996
+++ e2fsprogs-MCC/debugfs/debugfs.8.in	Mon Oct 14 00:19:32 1996
@@ -132,5 +132,5 @@
 Note that this does not fully initialize all of the data structures; 
 to do this, use the 
-.BR mke2fs (8)
+.BR mkfs.ext2 (8)
 program.  This is just a call to the low-level library, which sets up
 the superblock and block descriptors.
@@ -258,4 +258,4 @@
 .SH SEE ALSO
 .BR dumpe2fs (8),
-.BR e2fsck (8),
-.BR mke2fs (8)
+.BR fsck.ext2 (8),
+.BR mkfs.ext2 (8)
diff -ru2N e2fsprogs-1.06/debugfs/util.c e2fsprogs-MCC/debugfs/util.c
--- e2fsprogs-1.06/debugfs/util.c	Tue Sep 10 04:09:02 1996
+++ e2fsprogs-MCC/debugfs/util.c	Mon Oct 14 00:14:35 1996
@@ -24,5 +24,5 @@
 		outfile = stdout;
 	else {
-		outfile = popen(pager, "w");
+		outfile = fpopen(pager, "w");
 		if (!outfile) outfile = stdout;
 	}
diff -ru2N e2fsprogs-1.06/e2fsck/Makefile.in e2fsprogs-MCC/e2fsck/Makefile.in
--- e2fsprogs-1.06/e2fsck/Makefile.in	Tue Sep 10 04:29:17 1996
+++ e2fsprogs-MCC/e2fsck/Makefile.in	Mon Oct 14 00:23:35 1996
@@ -16,6 +16,6 @@
 MANPAGES=	e2fsck.8
 
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBUUID)
+LIBS= ../$(SHLIB)
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBUUID) $(LIBS)
 
 STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBUUID)
@@ -74,5 +74,5 @@
 	$(MTRACE_SRC)
 
-all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES)
+all:: $(PROGS) $(MANPAGES)
 
 @PROFILE_CMT@all:: e2fsck.profiled
diff -ru2N e2fsprogs-1.06/e2fsck/badblocks.c e2fsprogs-MCC/e2fsck/badblocks.c
--- e2fsprogs-1.06/e2fsck/badblocks.c	Sat Dec 16 00:24:38 1995
+++ e2fsprogs-MCC/e2fsck/badblocks.c	Mon Oct 14 00:14:42 1996
@@ -75,5 +75,5 @@
 			fs->device_name,
 			fs->super->s_blocks_count);
-		f = popen(buf, "r");
+		f = fpopen(buf, "r");
 		if (!f) {
 			com_err("read_bad_blocks_file", errno,
diff -ru2N e2fsprogs-1.06/e2fsck/e2fsck.8.in e2fsprogs-MCC/e2fsck/e2fsck.8.in
--- e2fsprogs-1.06/e2fsck/e2fsck.8.in	Mon Oct  7 14:46:09 1996
+++ e2fsprogs-MCC/e2fsck/e2fsck.8.in	Mon Oct 14 00:19:38 1996
@@ -3,9 +3,9 @@
 .\" This file may be copied under the terms of the GNU Public License.
 .\" 
-.TH E2FSCK 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
+.TH FSCK.EXT2 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
 .SH NAME
-e2fsck \- check a Linux second extended file system
+fsck.ext2 \- check a Linux second extended file system
 .SH SYNOPSIS
-.B e2fsck
+.B fsck.ext2
 [
 .B \-pacnyrdfvstFSV
@@ -25,5 +25,5 @@
 .I device
 .SH DESCRIPTION
-.B e2fsck
+.B fsck.ext2
 is used to check a Linux second extended file system.
 .TP
@@ -46,12 +46,12 @@
 .TP
 .I -B blocksize
-Normally, e2fsck will search for the superblock at various different
+Normally, fsck.ext2 will search for the superblock at various different
 block sizes in an attempt to find the appropriate block size.  This
-search can be fooled in some cases.  This option forces e2fsck to only
+search can be fooled in some cases.  This option forces fsck.ext2 to only
 try locating the superblock at a particular blocksize.  If the
-superblock is not found, e2fsck will terminate with a fatal error.
+superblock is not found, fsck.ext2 will terminate with a fatal error.
 .TP
 .I -c
-This option causes e2fsck to run the 
+This option causes fsck.ext2 to run the 
 .BR badblocks (8)
 program to find any blocks 
@@ -61,5 +61,5 @@
 .I -d
 Print debugging output (useless unless you are debugging
-.B e2fsck
+.B fsck.ext2
 ).
 .TP
@@ -69,5 +69,5 @@
 .I -F
 Flush the filesystem device's buffer caches before beginning.  Only
-really useful for doing e2fsck time trials.
+really useful for doing fsck.ext2 time trials.
 .TP
 .I -l filename
@@ -87,5 +87,5 @@
 Open the filesystem read-only, and assume an answer of ``no'' to all
 questions.  Allows
-.B e2fsck
+.B fsck.ext2
 to be used non-interactively.  (Note: if the 
 .IR -c ,
@@ -109,5 +109,5 @@
 This option will byte-swap the filesystem so that it is using the normalized, 
 standard byte-order (which is i386 or little endian).  If the filesystem is
-already in the standard byte-order, e2fsck will take no action.
+already in the standard byte-order, fsck.ext2 will take no action.
 .TP
 .I -S
@@ -117,5 +117,5 @@
 .I -t
 Print timing statistics for
-.BR e2fsck .
+.BR fsck.ext2 .
 If this option is used twice, additional timing statistics are printed
 on a pass by pass basis.
@@ -129,9 +129,9 @@
 .I -y
 Assume an answer of ``yes'' to all questions; allows 
-.B e2fsck
+.B fsck.ext2
 to be used non-interactively.
 .SH EXIT CODE
 The exit code returned by
-.B e2fsck
+.B fsck.ext2
 is the sum of the following conditions:
 .br
@@ -155,17 +155,17 @@
 Almost any piece of software will have bugs.  If you manage to find a
 filesystem which causes 
-.B e2fsck
+.B fsck.ext2
 to crash, or which 
-.B e2fsck
+.B fsck.ext2
 is unable to repair, please report it to the author.
 .PP
 Please include as much information as possible in your bug report.
 Ideally, include a complete transcript of the
-.B e2fsck
+.B fsck.ext2
 run, so I can see exactly what error messages are displayed.  If you
 have a writeable filesystem where the transcript can be stored, the 
 .BR script (1)
 program is a handy way to save the output of
-.e2fsck
+.B fsck.ext2
 to a file.
 .PP
@@ -173,5 +173,5 @@
 .BR dumpe2fs (8).
 If a specific inode or inodes seems to be giving 
-.B e2fsck 
+.B fsck.ext2 
 trouble, try running the
 .BR debugfs (8)
@@ -186,12 +186,12 @@
 .PP
 Always include the full version string which 
-.B e2fsck
+.B fsck.ext2
 displays when it is run, so I know which version you are running.
 .SH AUTHOR
 This version of 
-.B e2fsck
+.B fsck.ext2
 is written by Theodore Ts'o <tytso@mit.edu>.
 .SH SEE ALSO
-.BR mke2fs (8),
+.BR mkfs.ext2 (8),
 .BR tune2fs (8),
 .BR dumpe2fs (8),
diff -ru2N e2fsprogs-1.06/e2fsck/e2fsck.h e2fsprogs-MCC/e2fsck/e2fsck.h
--- e2fsprogs-1.06/e2fsck/e2fsck.h	Wed Aug 28 05:07:07 1996
+++ e2fsprogs-MCC/e2fsck/e2fsck.h	Mon Oct 14 01:05:32 1996
@@ -68,7 +68,7 @@
 };
 
-struct dir_block_struct *dir_blocks;
-int	dir_block_count;
-int	dir_block_size;
+extern struct dir_block_struct *dir_blocks;
+extern int	dir_block_count;
+extern int	dir_block_size;
 
 /*
diff -ru2N e2fsprogs-1.06/lib/e2p/Makefile.in e2fsprogs-MCC/lib/e2p/Makefile.in
--- e2fsprogs-1.06/lib/e2p/Makefile.in	Tue Sep 10 04:22:40 1996
+++ e2fsprogs-MCC/lib/e2p/Makefile.in	Mon Oct 14 00:30:32 1996
@@ -60,10 +60,10 @@
 
 .c.o:
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
+	$(CC) $(ALL_CFLAGS) -fPIC -c $< -o $@
 @PROFILE_CMT@	$(CC) $(ALL_CFLAGS) -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@	$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @DLL_CMT@	(export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@		-o jump/$*.o -c $<)
-@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+#@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@	$(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
 
diff -ru2N e2fsprogs-1.06/lib/et/Makefile.in e2fsprogs-MCC/lib/et/Makefile.in
--- e2fsprogs-1.06/lib/et/Makefile.in	Tue Aug  6 19:41:17 1996
+++ e2fsprogs-MCC/lib/et/Makefile.in	Mon Oct 14 00:30:38 1996
@@ -47,10 +47,10 @@
 #
 .c.o:
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
+	$(CC) $(ALL_CFLAGS) -fPIC -c $< -o $@
 @PROFILE_CMT@	$(CC) $(ALL_CFLAGS) -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@	$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @DLL_CMT@	(export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@		-o jump/$*.o -c $<)
-@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+#@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@	$(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
 
diff -ru2N e2fsprogs-1.06/lib/ext2fs/Makefile.in e2fsprogs-MCC/lib/ext2fs/Makefile.in
--- e2fsprogs-1.06/lib/ext2fs/Makefile.in	Tue Sep 10 04:21:38 1996
+++ e2fsprogs-MCC/lib/ext2fs/Makefile.in	Mon Oct 14 00:30:55 1996
@@ -20,4 +20,5 @@
 	dirblock.o \
 	expanddir.o \
+	../fpopen.o \
 	freefs.o \
 	get_pathname.o \
@@ -106,10 +107,10 @@
 
 .c.o:
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
+	$(CC) $(ALL_CFLAGS) -fPIC -c $< -o $@
 @PROFILE_CMT@	$(CC) $(ALL_CFLAGS) -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@	$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @DLL_CMT@	(export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@		-o jump/$*.o -c $<)
-@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+#@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@	$(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
 
diff -ru2N e2fsprogs-1.06/lib/ss/Makefile.in e2fsprogs-MCC/lib/ss/Makefile.in
--- e2fsprogs-1.06/lib/ss/Makefile.in	Tue Aug  6 19:41:01 1996
+++ e2fsprogs-MCC/lib/ss/Makefile.in	Mon Oct 14 00:31:00 1996
@@ -46,10 +46,10 @@
 
 .c.o:
-	$(CC) $(ALL_CFLAGS) -c $<
+	$(CC) $(ALL_CFLAGS) -fPIC -c $<
 @PROFILE_CMT@	$(CC) $(ALL_CFLAGS) -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@	$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @DLL_CMT@	(export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) \
 @DLL_CMT@		$(ALL_CFLAGS) -o jump/$*.o -c $<)
-@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+#@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@	$(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
 
diff -ru2N e2fsprogs-1.06/lib/uuid/Makefile.in e2fsprogs-MCC/lib/uuid/Makefile.in
--- e2fsprogs-1.06/lib/uuid/Makefile.in	Tue Sep 10 04:14:02 1996
+++ e2fsprogs-MCC/lib/uuid/Makefile.in	Mon Oct 14 00:31:06 1996
@@ -23,5 +23,5 @@
 		isnull.o \
 		pack.o \
-		parse.o \
+		uiparse.o \
 		unpack.o \
 		unparse.o
@@ -68,13 +68,15 @@
 
 .c.o:
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
+	$(CC) $(ALL_CFLAGS) -fPIC -c $< -o $@
 @PROFILE_CMT@	$(CC) $(ALL_CFLAGS) -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@	$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @DLL_CMT@	(export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@		-o jump/$*.o -c $<)
-@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+#@ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@	$(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
 
 all:: tst_uuid
+uiparse.o: parse.o
+	cp $< $@
 
 tst_uuid: tst_uuid.o $(LIBUUID)
diff -ru2N e2fsprogs-1.06/mcc.install e2fsprogs-MCC/mcc.install
--- e2fsprogs-1.06/mcc.install	Thu Jan  1 01:00:00 1970
+++ e2fsprogs-MCC/mcc.install	Mon Oct 14 00:32:39 1996
@@ -0,0 +1,16 @@
+install -s -m 555 libext2fs.so.1.06 /lib
+ldconfig
+install -s -m 555 e2fsck/extend e2fsck/flushb /usr/sbin
+install -s -m 555 misc/chattr misc/lsattr /usr/bin
+install -s -m 555 misc/badblocks debugfs/debugfs misc/dumpe2fs \
+	misc/fsck misc/mklost+found misc/tune2fs /sbin
+install -s -m 555 e2fsck/e2fsck /sbin/fsck.ext2
+install -s -m 555 misc/mke2fs /sbin/mkfs.ext2
+for i in chattr lsattr;do install -m 444 misc/$i.1 /usr/man/man1;\
+	gzip -9f /usr/man/man1/$i.1;done
+for i in badblocks dumpe2fs fsck mklost+found tune2fs;do \
+	install -m 444 misc/$i.8 /usr/man/man8;gzip -9f /usr/man/man8/$i.8;done
+rm -f /usr/man/man8/fsck.ext2.8 /usr/man/man8/mkfs.ext2.8
+install -m 444 debugfs/debugfs.8 e2fsck/e2fsck.8 misc/mke2fs.8 /usr/man/man8
+(cd /usr/man/man8;gzip -9f debugfs.8 e2fsck.8 mke2fs.8;\
+	mv -f e2fsck.8.gz fsck.ext2.8.gz;mv -f mke2fs.8.gz mkfs.ext2.8.gz)
diff -ru2N e2fsprogs-1.06/misc/Makefile.in e2fsprogs-MCC/misc/Makefile.in
--- e2fsprogs-1.06/misc/Makefile.in	Tue Sep 10 04:31:51 1996
+++ e2fsprogs-MCC/misc/Makefile.in	Mon Oct 14 00:26:53 1996
@@ -33,12 +33,12 @@
 		$(srcdir)/badblocks.c $(srcdir)/fsck.c
 
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
+LIBS= ../$(SHLIB)
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBS)
 
 STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 
-LIBS_E2P= $(LIBEXT2FS) $(LIBE2P) $(LIBCOM_ERR) 
-DEPLIBS_E2P= $(LIBEXT2FS) $(LIBE2P) $(LIBCOM_ERR) 
+LIBS_E2P= $(LIBS)
+DEPLIBS_E2P= $(LIBEXT2FS) $(LIBE2P) $(LIBCOM_ERR) $(LIBS)
 
 .c.o:
@@ -48,5 +48,5 @@
 
 tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS_E2P) $(LIBUUID)
-	$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS_E2P) $(LIBUUID)
+	$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS_E2P)
 
 mklost+found: $(MKLPF_OBJS)
@@ -54,5 +54,5 @@
 
 mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBUUID)
-	$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBUUID)
+	$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS)
 
 mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBUUID)
diff -ru2N e2fsprogs-1.06/misc/badblocks.8.in e2fsprogs-MCC/misc/badblocks.8.in
--- e2fsprogs-1.06/misc/badblocks.8.in	Wed Jan 31 15:07:47 1996
+++ e2fsprogs-MCC/misc/badblocks.8.in	Mon Oct 14 00:20:21 1996
@@ -63,4 +63,4 @@
 /pub/linux/packages/ext2fs.
 .SH SEE ALSO
-.BR e2fsck (8),
-.BR mke2fs (8)
+.BR fsck.ext2 (8),
+.BR mkfs.ext2 (8)
diff -ru2N e2fsprogs-1.06/misc/dumpe2fs.8.in e2fsprogs-MCC/misc/dumpe2fs.8.in
--- e2fsprogs-1.06/misc/dumpe2fs.8.in	Mon Oct  7 22:06:25 1996
+++ e2fsprogs-MCC/misc/dumpe2fs.8.in	Mon Oct 14 00:20:28 1996
@@ -44,5 +44,5 @@
 /pub/linux/packages/ext2fs.
 .SH SEE ALSO
-.BR e2fsck (8),
-.BR mke2fs (8),
+.BR fsck.ext2 (8),
+.BR mkfs.ext2 (8),
 .BR tune2fs (8)
diff -ru2N e2fsprogs-1.06/misc/fsck.8.in e2fsprogs-MCC/misc/fsck.8.in
--- e2fsprogs-1.06/misc/fsck.8.in	Tue Feb  6 03:23:47 1996
+++ e2fsprogs-MCC/misc/fsck.8.in	Mon Oct 14 00:20:11 1996
@@ -92,5 +92,5 @@
 This is not the safest thing in the world to do,
 since if the root filesystem is in doubt things like
-the e2fsck executable might be corrupted!  This option is mainly provided
+the fsck.ext2 executable might be corrupted!  This option is mainly provided
 for those sysadmins who don't want to repartition the root
 filesystem to be small and compact (which is really the right solution).
@@ -99,7 +99,7 @@
 Serialize fsck operations.  This is a good idea if you checking multiple
 filesystems in and the checkers are in an interactive mode.  (Note:
-.B e2fsck
+.B fsck.ext2
 runs in an interactive mode by default.  To make 
-.B e2fsck
+.B fsck.ext2
 run in a non-interactive mode, you must either specify the
 .B -p
@@ -156,8 +156,8 @@
 Automatically repair the file system without any questions (use
 this option with caution).  Note that 
-.B e2fsck
+.B fsck.ext2
 supports 
 .B -a
-for backwards compatibility only.  This option is mapped to e2fsck's
+for backwards compatibility only.  This option is mapped to fsck.ext2's
 .B -p
 option which is safe to use, unlike the 
@@ -169,5 +169,5 @@
 is generally a bad idea to use this option if multiple fsck's are being
 run in parallel.  Also note that this is 
-.B e2fsck
+.B fsck.ext2
 default behavior; it supports this option for backwards compatibility
 reasons only.
@@ -186,4 +186,3 @@
 .BR fsck.ext2 (8)
 or
-.BR e2fsck (8),
 .BR fsck.xiafs (8).
diff -ru2N e2fsprogs-1.06/misc/mke2fs.8.in e2fsprogs-MCC/misc/mke2fs.8.in
--- e2fsprogs-1.06/misc/mke2fs.8.in	Fri Aug  9 20:21:56 1996
+++ e2fsprogs-MCC/misc/mke2fs.8.in	Mon Oct 14 00:21:04 1996
@@ -3,9 +3,9 @@
 .\" This file may be copied under the terms of the GNU Public License.
 .\" 
-.TH MKE2FS 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
+.TH MKFS.EXT2 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
 .SH NAME
-mke2fs \- create a Linux second extended file system
+mkfs.ext2 \- create a Linux second extended file system
 .SH SYNOPSIS
-.B mke2fs
+.B mkfs.ext2
 [
 .B \-c
@@ -62,5 +62,5 @@
 ]
 .SH DESCRIPTION
-.B mke2fs
+.B mkfs.ext2
 is used to create a Linux second extended file system on a device (usually
 a disk partition).
@@ -71,5 +71,5 @@
 .I blocks-count
 is the number of blocks on the device.  If omitted,
-.B mke2fs
+.B mkfs.ext2
 automagically figures the file system size.
 .SH OPTIONS
@@ -87,5 +87,5 @@
 .I -i bytes-per-inode
 Specify the bytes/inode ratio. 
-.B mke2fs
+.B mkfs.ext2
 creates an inode for every
 .I bytes-per-inode
@@ -110,8 +110,8 @@
 Manually override the default value of the "creator os" field of the 
 filesystem.  Normally the creator field is set by default to the native OS
-of the mke2fs executable.
+of the mkfs.ext2 executable.
 .TP
 .I -q
-Quiet execution.  Useful if mke2fs is run in a script.
+Quiet execution.  Useful if mkfs.ext2 is run in a script.
 .TP
 .I -v
@@ -119,5 +119,5 @@
 .TP
 .I -F
-Force mke2fs to run, even if the specified device is not a 
+Force mkfs.ext2 to run, even if the specified device is not a 
 block special device.
 .TP
@@ -133,16 +133,16 @@
 Write superblock and group descriptors only.  This is useful if all of
 the superblock and backup superblocks are corrupted, and a last-ditch
-recovery method is desired.  It causes mke2fs to reinitialize the
+recovery method is desired.  It causes mkfs.ext2 to reinitialize the
 superblock and group descriptors, while not touching the inode table
 and the block and inode bitmaps.  The
-.B e2fsck
+.B fsck.ext2
 program should be run immediately after this option is used, and there
 is no guarantee that any data will be salvageable.
 .SH AUTHOR
 This version of
-.B mke2fs
+.B mkfs.ext2
 has been written by Theodore Ts'o <tytso@mit.edu>.
 .SH BUGS
-.B mke2fs
+.B mkfs.ext2
 accepts the -f option but currently ignores it because the second
 extended file system does not support fragments yet.
@@ -150,5 +150,5 @@
 There may be some other ones.  Please, report them to the author.
 .SH AVAILABILITY
-.B mke2fs
+.B mkfs.ext2
 is available for anonymous ftp from ftp.ibp.fr and tsx-11.mit.edu in
 /pub/linux/packages/ext2fs.
@@ -156,4 +156,4 @@
 .BT badblocks (8),
 .BR dumpe2fs (8),
-.BR e2fsck (8),
+.BR fsck.ext2 (8),
 .BR tune2fs (8)
diff -ru2N e2fsprogs-1.06/misc/mke2fs.c e2fsprogs-MCC/misc/mke2fs.c
--- e2fsprogs-1.06/misc/mke2fs.c	Sat Sep  7 12:37:33 1996
+++ e2fsprogs-MCC/misc/mke2fs.c	Mon Oct 14 00:15:04 1996
@@ -199,5 +199,5 @@
 	if (verbose)
 		printf("Running command: %s\n", buf);
-	f = popen(buf, "r");
+	f = fpopen(buf, "r");
 	if (!f) {
 		com_err("popen", errno,
diff -ru2N e2fsprogs-1.06/misc/mklost+found.8.in e2fsprogs-MCC/misc/mklost+found.8.in
--- e2fsprogs-1.06/misc/mklost+found.8.in	Wed Jan 31 15:07:57 1996
+++ e2fsprogs-MCC/misc/mklost+found.8.in	Mon Oct 14 00:21:15 1996
@@ -16,5 +16,5 @@
 .B mklost+found
 pre-allocates disk blocks to the directory to make it usable by
-.B e2fsck
+.B fsck.ext2
 .SH OPTIONS
 There are none.
@@ -30,4 +30,4 @@
 /pub/linux/packages/ext2fs.
 .SH SEE ALSO
-.BR e2fsck (8),
-.BR mke2fs (8)
+.BR fsck.ext2 (8),
+.BR mkfs.ext2 (8)
diff -ru2N e2fsprogs-1.06/misc/tune2fs.8.in e2fsprogs-MCC/misc/tune2fs.8.in
--- e2fsprogs-1.06/misc/tune2fs.8.in	Sat Sep  7 12:35:49 1996
+++ e2fsprogs-MCC/misc/tune2fs.8.in	Mon Oct 14 00:19:46 1996
@@ -140,4 +140,4 @@
 .SH SEE ALSO
 .BR dumpe2fs (8),
-.BR e2fsck (8),
-.BR mke2fs (8)
+.BR fsck.ext2 (8),
+.BR mkfs.ext2 (8)
ENDPATCH
./configure --enable-dynamic-e2fsck --with-ldopts=-Wl,-warn-common
make

* sh -x ./mcc.install
%%