Many files:

  Checked in e2fsprogs 1.01.

23 files changed, 163 insertions, 19 deletions

diff --git a/INSTALL.dllbin b/INSTALL.dllbin
new file mode 100644
index 00000000..a446e37d
--- /dev/null
+++ b/INSTALL.dllbin
@@ -0,0 +1,51 @@
+NOTE: This is the DLL version of the binary distribution.  If you have
+an ELF system, please either compile e2fsprogs from sources yourself,
+or get the ELF version of the binary distribution.  The ELF version
+will have a filename of e2fsprogs-1.01-elfbin.tar.gz
+
+
+	To install the binary distribution of the second extended file
+system management programs, just follow the steps:
+
+1) Install this tar file using the following command:
+
+	gunzip < e2fsprogs-1.01-dllbin.tar.gz | (cd /; tar xvf - )
+
+2) Run ldconfig to update the shared library pointers.
+
+        As root, type /sbin/ldconfig. This will update the links to
+the shared libraries included in the distribution. You can then remove
+the old versions of the libraries from /lib.  
+
+3) Remove any pre-formatted man pages.  
+
+	Some distributions will have pre-formatted manual pages which
+will always be displayed in preference to newer man pages in /usr/man.
+If this is the case, you may need to manually remove them in order to
+see the correct manual pages.  The shell script in
+install-utils/remove_preformat_manpages may be helpful in doing so.
+
+4) Make sure your /etc/fstab file is correct.
+
+	Some distributions install an /etc/fstab which is missing the
+fifth and sixth field of filesystem entry, which are the dump
+frequency, and the fsck pass number, respectively.  The problem with
+this is that the getmntent() library routine interprets those missing
+fields as "0", and a pass number of 0 is documented as meaning that
+fsck should not check that particular filesystem.  If your entries in
+your /etc/fstab file look liks this:
+
+/dev/hda4       /        ext2        defaults
+
+you should add "1 1" at the end of each line, so that they look like this:
+
+/dev/hda4       /        ext2        defaults	1	1
+
+	There is a script in install-utils/convfstab (donated by
+Michael Weller) that may help you correct your /etc/fstab file.
+
+5) Cleanup files from the installation.
+
+	When you're done with the installation, you will probably want
+to remove /INSTALL (this file), /README, and /install-utils from your
+root directory
diff --git a/INSTALL.elfbin b/INSTALL.elfbin
new file mode 100644
index 00000000..1a05ec92
--- /dev/null
+++ b/INSTALL.elfbin
@@ -0,0 +1,51 @@
+NOTE: This is the ELF version of the binary distribution.  If you have
+a DLL system, please either compile e2fsprogs from sources yourself,
+or get the DLL version of the binary distribution.  The DLL version
+will have a filename of e2fsprogs-1.01-dllbin.tar.gz
+
+
+	To install the binary distribution of the second extended file
+system management programs, just follow the steps:
+
+1) Install this tar file using the following command:
+
+	gunzip < e2fsprogs-1.01-elfbin.tar.gz | (cd /; tar xvf - )
+
+2) Run ldconfig to update the shared library pointers.
+
+        As root, type /sbin/ldconfig. This will update the links to
+the shared libraries included in the distribution. You can then remove
+the old versions of the libraries from /lib.  
+
+3) Remove any pre-formatted man pages.  
+
+	Some distributions will have pre-formatted manual pages which
+will always be displayed in preference to newer man pages in /usr/man.
+If this is the case, you may need to manually remove them in order to
+see the correct manual pages.  The shell script in
+install-utils/remove_preformat_manpages may be helpful in doing so.
+
+4) Make sure your /etc/fstab file is correct.
+
+	Some distributions install an /etc/fstab which is missing the
+fifth and sixth field of filesystem entry, which are the dump
+frequency, and the fsck pass number, respectively.  The problem with
+this is that the getmntent() library routine interprets those missing
+fields as "0", and a pass number of 0 is documented as meaning that
+fsck should not check that particular filesystem.  If your entries in
+your /etc/fstab file look liks this:
+
+/dev/hda4       /        ext2        defaults
+
+you should add "1 1" at the end of each line, so that they look like this:
+
+/dev/hda4       /        ext2        defaults	1	1
+
+	There is a script in install-utils/convfstab (donated by
+Michael Weller) that may help you correct your /etc/fstab file.
+
+5) Cleanup files from the installation.
+
+	When you're done with the installation, you will probably want
+to remove /INSTALL (this file), /README, and /install-utils from your
+root directory
diff --git a/README b/README
index 7e39091f..428a8747 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-	This is the new version (0.5c) of the second extended file system
+	This is the new version (1.01) of the second extended file system
 management programs.  
 
 	See the file INSTALL for installation instructions.  This is
diff --git a/debugfs/debugfs.8 b/debugfs/debugfs.8
index 9ff19d63..7107d093 100644
--- a/debugfs/debugfs.8
+++ b/debugfs/debugfs.8
@@ -2,7 +2,7 @@
 .\" Copyright 1993, 1994, 1995 by Theodore Ts'o.  All Rights Reserved.
 .\" This file may be copied under the terms of the GNU Public License.
 .\" 
-.TH DEBUGFS 8 "October 1995" "Version 0.5c"
+.TH DEBUGFS 8 "October 1995" "Version 1.01"
 .SH NAME
 debugfs \- ext2 file system debugger
 .SH SYNOPSIS
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 847d9cd4..c1d04c9c 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,10 @@
+Mon Oct 30 20:31:17 1995    <tytso@rsts-11.mit.edu>
+
+	* e2fsck.c (check_mount): For Linux systems, the check to see if
+		the root is mounted read-only has to be done for all
+		filesystems, not just for the root filesystem, due to the
+		way that some /etc/rc scripts are set up.
+
 Thu Oct 26 12:05:30 1995    <tytso@rsts-11.mit.edu>
 
 	* Makefile.in (install): Strip programs when they are installed.
diff --git a/e2fsck/e2fsck.8 b/e2fsck/e2fsck.8
index bc12fc10..0febc3ef 100644
--- a/e2fsck/e2fsck.8
+++ b/e2fsck/e2fsck.8
@@ -2,7 +2,7 @@
 .\" Copyright 1993, 1994, 1995 by Theodore Ts'o.  All Rights Reserved.
 .\" This file may be copied under the terms of the GNU Public License.
 .\" 
-.TH E2FSCK 8 "October 1995" "Version 0.5c"
+.TH E2FSCK 8 "October 1995" "Version 1.01"
 .SH NAME
 e2fsck \- check a Linux second extended file system
 .SH SYNOPSIS
diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
index e35e1bac..bc9510cb 100644
--- a/e2fsck/e2fsck.c
+++ b/e2fsck/e2fsck.c
@@ -144,7 +144,7 @@ static void show_stats(ext2_filsys fs)
 static void check_mount(NOARGS)
 {
 	errcode_t	retval;
-	int		mount_flags, cont;
+	int		mount_flags, cont, fd;
 
 	retval = ext2fs_check_if_mounted(filesystem_name, &mount_flags);
 	if (retval) {
@@ -155,14 +155,20 @@ static void check_mount(NOARGS)
 	}
 	if (!(mount_flags & EXT2_MF_MOUNTED))
 		return;
+
+#if (defined(linux) && defined(HAVE_MNTENT_H))
 	/*
 	 * If the root is mounted read-only, then /etc/mtab is
 	 * probably not correct; so we won't issue a warning based on
 	 * it.
 	 */
-	if ((mount_flags & EXT2_MF_ISROOT) &&
-	    (mount_flags & EXT2_MF_READONLY))
-		return;
+	fd = open(MOUNTED, O_RDWR);
+	if (fd < 0) {
+		if (errno == EROFS)
+			return;
+	} else
+		close(fd);
+#endif
 	
 	if (!rwflag) {
 		printf("Warning!  %s is mounted.\n", device_name);
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 14a8f19a..84b84134 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 30 21:11:47 1995    <tytso@rsts-11.mit.edu>
+
+	* Makefile.elf-lib: Changes to pass -soname to the linker, so that
+		ld.so knows which version of the library to load when
+		there's more than one major version of the shared library.
+
 Mon Sep  4 21:42:46 1995  Remy Card  <card@bbj>
 
 	* Makefile.bsd-lib: New file containing support for BSD shared
diff --git a/lib/Makefile.dll-lib b/lib/Makefile.dll-lib
index 94864bf2..1a1f9698 100644
--- a/lib/Makefile.dll-lib
+++ b/lib/Makefile.dll-lib
@@ -62,6 +62,9 @@ $(DLL_IMAGE).so.$(DLL_VERSION): $(OBJS)
 		-a $(DLL_ADDRESS) -j $(DLL_JUMPSIZE) -g $(DLL_GOTSIZE) -- \
 		$(OBJS) -lc $(DLL_LIBS) $(DLL_LIBGCC) -lc)
 	$(MV) jump/$(DLL_IMAGE).so.$(DLL_VERSION) .
+	$(LN) -f $(DLL_IMAGE).so.$(DLL_VERSION) \
+		`echo ../$(DLL_IMAGE).so.$(DLL_VERSION) | \
+		sed -e 's/\.[0-9]*\$$//'`
 
 $(DLL_STUB).sa:
 	(cd jump; export JUMP_DIR=`pwd`; \
@@ -87,5 +90,8 @@ install:: $(DLL_STUB).sa
 	$(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/$(DLL_STUB).sa
 
 clean::
-	$(RM) -f ../$(DLL_STUB).sa $(DLL_STUB).sa $(DLL_IMAGE).so.$(DLL_VERSION)
+	$(RM) -f ../$(DLL_STUB).sa $(DLL_STUB).sa \
+		$(DLL_IMAGE).so.$(DLL_VERSION) ../$(DLL_IMAGE).so.*
 	$(RM) -rf jump
+
+
diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 10051ddd..bd2693c0 100644
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -5,6 +5,7 @@
 # In order to use this stub, the following makefile variables must be defined.
 # 
 # ELF_VERSION = 1.0
+# ELF_SONAME = 1
 # ELF_IMAGE = libce
 # ELF_MYDIR = et
 # ELF_INSTALL_DIR = $(SHLIBDIR)
@@ -18,15 +19,17 @@ elfshared:
 	mkdir elfshared
 
 ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
+ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
 
 image:		$(ELF_LIB)
 
 $(ELF_LIB): $(OBJS)
-	(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(OBJS))
+	(cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-soname,$(ELF_SONAME) $(OBJS))
 	$(MV) elfshared/$(ELF_LIB) .
-	$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so
+	$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
 	$(LN) $(ELF_LIB) ../$(ELF_LIB)
 	$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
+	$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
 
 installdirs::
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR)
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 228b4722..631d8f68 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 30 17:44:07 1995    <tytso@rsts-11.mit.edu>
+
+	* ls.c (list_super): Use the correct field (s_def_resgid) when
+		printing the reserved group gid.
+
 Fri Oct 27 18:07:48 1995    <tytso@rsts-11.mit.edu>
 
 	* iod.c (iterate_on_dir): Don't assume that d->reclen is the size
diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 2e8da282..1e68fe6f 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -39,6 +39,7 @@ DLL_MYDIR = e2p
 DLL_INSTALL_DIR = $(libdir)
 
 ELF_VERSION = 2.1
+ELF_SO_VERSION = 2
 ELF_IMAGE = libe2p
 ELF_MYDIR = e2p
 ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index 6870098c..08ccc8f2 100644
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -80,6 +80,6 @@ void list_super (struct ext2_super_block * s)
 	printf ("Reserved blocks uid:      ");
 	print_user (s->s_def_resuid);
 	printf ("Reserved blocks gid:      ");
-	print_group (s->s_def_resuid);
+	print_group (s->s_def_resgid);
 #endif
 }
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 39141a45..44b091a7 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -31,6 +31,7 @@ DLL_MYDIR = et
 DLL_INSTALL_DIR = $(libdir)
 
 ELF_VERSION = 2.0
+ELF_SO_VERSION = 2
 ELF_IMAGE = libcom_err
 ELF_MYDIR = et
 ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 879ea814..fd8301c9 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -84,6 +84,7 @@ DLL_MYDIR = ext2fs
 DLL_INSTALL_DIR = $(libdir)
 
 ELF_VERSION = 2.0
+ELF_SO_VERSION = 2
 ELF_IMAGE = libext2fs
 ELF_MYDIR = ext2fs
 ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index 58c88fba..781bfdfc 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -37,7 +37,7 @@
 #ifdef HAVE_MNTENT_H
 /*
  * XXX we only check to see if the mount is readonly when it's the
- * root filesystem EXT2_FS_READONLY.
+ * root filesystem.
  */
 static errcode_t check_mntent(const char *file, int *mount_flags)
 {
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index aaab8128..2cedb5b4 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -24,6 +24,7 @@ DLL_MYDIR = ss
 DLL_INSTALL_DIR = $(libdir)
 
 ELF_VERSION = 2.0
+ELF_SO_VERSION = 2
 ELF_IMAGE = libss
 ELF_MYDIR = ss
 ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/ss/test_ss.c b/lib/ss/test_ss.c
index 7b37ec47..3878400d 100644
--- a/lib/ss/test_ss.c
+++ b/lib/ss/test_ss.c
@@ -9,8 +9,8 @@
  * $Locker$
  *
  * $Log$
- * Revision 1.3  1997/04/26 13:58:24  tytso
- * Checked in e2fsprogs 0.5c
+ * Revision 1.4  1997/04/26 14:25:12  tytso
+ * Checked in e2fsprogs 1.01.
  *
  * Revision 1.1  1993/06/03  12:31:25  tytso
  * Initial revision
diff --git a/misc/ChangeLog b/misc/ChangeLog
index e815ed5d..0b13e1fd 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 30 20:21:18 1995    <tytso@rsts-11.mit.edu>
+
+	* fsck.c (fsck_device): Check fstype instead of type; this was a
+		stupid typo which caused coredumps in some cases.
+
 Thu Oct 26 12:05:18 1995    <tytso@rsts-11.mit.edu>
 
 	* Makefile.in (install): Strip programs when they are installed.
diff --git a/misc/badblocks.8 b/misc/badblocks.8
index 57e1db5a..89379614 100644
--- a/misc/badblocks.8
+++ b/misc/badblocks.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH BADBLOCKS 8 "August 1995" "Version 0.5c"
+.TH BADBLOCKS 8 "October 1995" "Version 1.01"
 .SH NAME
 badblocks \- search a device for bad blocks
 .SH SYNOPSIS
diff --git a/misc/chattr.1 b/misc/chattr.1
index 09a9bfb2..89783c73 100644
--- a/misc/chattr.1
+++ b/misc/chattr.1
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH CHATTR 1 "October 1995" "Version 0.5c"
+.TH CHATTR 1 "October 1995" "Version 1.01"
 .SH NAME
 chattr \- change file attributes on a Linux second extended file system
 .SH SYNOPSIS
diff --git a/misc/fsck.c b/misc/fsck.c
index ef210245..05afde90 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -410,7 +410,7 @@ static void fsck_device(char *device)
 	int retval;
 	char prog[80];
 
-	if (fstype && strncmp(type, "no", 2) && !strchr(type, ','))
+	if (fstype && strncmp(fstype, "no", 2) && !strchr(fstype, ','))
 		type = fstype;
 
 	if ((fsent = lookup(device))) {
diff --git a/version.h b/version.h
index e88d3020..80090a36 100644
--- a/version.h
+++ b/version.h
@@ -6,6 +6,6 @@
  * under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "0.5c"
-#define E2FSPROGS_DATE "27-Oct-95"
+#define E2FSPROGS_VERSION "1.01"
+#define E2FSPROGS_DATE "30-Oct-95"