Many files:

  Checked in e2fsprogs 1.04.

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index e8ccc27..68020df 100644 (file)
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,12 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
+Wed May 3 20:41:26 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * debugfs.c (dump_inode): Correctly print the translator on the hurd.
+              (do_modify_inode): Modify the translator block on the hurd.
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 7d425f8..264d042 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -21,13 +21,13 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c \
        $(srcdir)/ncheck.c $(srcdir)/icheck.c $(srcdir)/lsdel.c \
        $(srcdir)/dump.c
 
-LIBS= -L../lib -lext2fs -lss -lcom_err 
-DEPLIBS= ../lib/libext2fs.a ../lib/libss.a ../lib/libcom_err.a 
+LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) 
+DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) 
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $< -o $@
 
-all:: $(PROGS)
+all:: $(PROGS) $(MANPAGES)
 
 debugfs: $(DEBUG_OBJS) $(DEPLIBS)
        $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
@@ -35,6 +35,10 @@ debugfs: $(DEBUG_OBJS) $(DEPLIBS)
 debug_cmds.c debug_cmds.h: debug_cmds.ct
        $(MK_CMDS) $(srcdir)/debug_cmds.ct
 
+debugfs.8: $(SUBSTITUTE) $(srcdir)/debugfs.8.in
+       -$(CHMOD) +x $(SUBSTITUTE)
+       $(SUBSTITUTE) $(srcdir)/debugfs.8.in debugfs.8
+
 installdirs:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(usbindir) \
                $(DESTDIR)$(man8dir) $(DESTDIR)$(cat8dir)
@@ -57,7 +61,8 @@ uninstall:
        done
 
 clean:
-       $(RM) -f debugfs \#* *.s *.o *.a *~ debug_cmds.c core
+       $(RM) -f debugfs debugfs.8 \#* *.s *.o *.a *~ debug_cmds.c core
+
 mostlyclean: clean
 distclean: clean
        $(RM) -f debug_cmds.c .depend Makefile
@@ -67,37 +72,31 @@ distclean: clean
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-debug_cmds.o: debug_cmds.c $(top_srcdir)/lib/ss/ss.h \
-  $(top_srcdir)/lib/ss/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h
-debugfs.o: $(srcdir)/debugfs.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ss/ss.h $(top_srcdir)/lib/ss/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/debugfs.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(top_srcdir)/lib/ext2fs/bitops.h
-util.o: $(srcdir)/util.c \
-  $(srcdir)/debugfs.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
-ncheck.o: $(srcdir)/ncheck.c \
-  $(srcdir)/debugfs.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
-icheck.o: $(srcdir)/icheck.c \
-  $(srcdir)/debugfs.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
-lsdel.o: $(srcdir)/lsdel.c \
-  $(srcdir)/debugfs.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
-dump.o: $(srcdir)/dump.c \
-  $(srcdir)/debugfs.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+debug_cmds.o: debug_cmds.c $(top_srcdir)/lib/ss/ss.h $(top_srcdir)/lib/ss/copyright.h \
+ $(top_builddir)/lib/ss/ss_err.h
+debugfs.o: $(srcdir)/debugfs.c $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ss/ss.h $(top_srcdir)/lib/ss/copyright.h \
+ $(top_builddir)/lib/ss/ss_err.h $(srcdir)/debugfs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h
+util.o: $(srcdir)/util.c $(srcdir)/debugfs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+ncheck.o: $(srcdir)/ncheck.c $(srcdir)/debugfs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+icheck.o: $(srcdir)/icheck.c $(srcdir)/debugfs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+lsdel.o: $(srcdir)/lsdel.c $(srcdir)/debugfs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+dump.o: $(srcdir)/dump.c $(srcdir)/debugfs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
 

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 9f96c1d..71437c0 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -261,8 +261,14 @@ static void dump_inode(ino_t inode_num, struct ext2_inode inode)
                inode.i_mode & 0777, inode.i_flags, inode.i_version);
        fprintf(out, "User: %5d   Group: %5d   Size: %d\n",  
                inode.i_uid, inode.i_gid, inode.i_size);
-       fprintf(out, "File ACL: %d    Directory ACL: %d\n",
-               inode.i_file_acl, inode.i_dir_acl);
+       if (fs->super->s_creator_os == EXT2_OS_HURD)
+               fprintf(out,
+                       "File ACL: %d    Directory ACL: %d Translator: %d\n",
+                       inode.i_file_acl, inode.i_dir_acl,
+                       inode.osd1.hurd1.h_i_translator);
+       else
+               fprintf(out, "File ACL: %d    Directory ACL: %d\n",
+                       inode.i_file_acl, inode.i_dir_acl);
        fprintf(out, "Links: %d   Blockcount: %d\n", inode.i_links_count,
                inode.i_blocks);
 #if HAVE_EXT2_FRAGS
@@ -625,6 +631,11 @@ void do_modify_inode(int argc, char *argv[])
 #endif
        modify_u32(argv[0], "File acl", decimal_format, &inode.i_file_acl);
        modify_u32(argv[0], "Directory acl", decimal_format, &inode.i_dir_acl);
+
+       if (fs->super->s_creator_os == EXT2_OS_HURD)
+               modify_u32(argv[0], "Translator Block",
+                           decimal_format, &inode.osd1.hurd1.h_i_translator);
+       
        modify_u32(argv[0], "Fragment address", decimal_format, &inode.i_faddr);
 #if HAVE_EXT2_FRAGS
        modify_u8(argv[0], "Fragment number", decimal_format, &inode.i_frag);

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index f5103f6..1ea0a58 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,18 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
+Wed May 15 21:41:29 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * e2fsck.c (relocate_hint): Issue a hint that the user may wish to
+               try "e2fsck -b 8193" before allowing e2fsck to relocate
+               inode table blocks.
+
+       * Makefile.in (e2fsck): Build e2fsck statically or dynamically
+               depending on the option to configure.  Added targets for
+               e2fsck.static and e2fsck.shared for people who want to
+               build a static or shared variant manually.
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 9ed236e..8e2e51c 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -14,19 +14,26 @@ LDFLAG_STATIC = @LDFLAG_STATIC@
 PROGS=         e2fsck extend @EXTRA_PROGS@
 MANPAGES=      e2fsck.8
 
-LIBS= -L../lib -lss -lcom_err -lext2fs $(CHECKLIB)
-DEPLIBS= ../lib/libss.a ../lib/libcom_err.a ../lib/libext2fs.a
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
+
+STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
+
+PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) 
+PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) 
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $< -o $@
+@PROFILE_CMT@  $(CC) $(ALL_CFLAGS) -pg -o profiled/$*.o -c $<
 
 #
 # Flags for using Checker
 #      Note: The optimization flags must include -g
 #
 #MCHECK=       -checker
-#LIBS= -L../lib -lss -lcom_err -le2fs $(CHECKLIB)
-#DEPLIBS= ../lib/libss.a ../lib/libcom_err.a ../lib/libext2fs.a
+#LIBS= $(LIBCOM_ERR) $(LIB_EXT2FS) $(CHECKLIB)
+#DEPLIBS= $(LIBCOM_ERR) $(LIB_EXT2FS) 
 #CHECKLIB= /usr/lib/libchecker.o
 
 #
@@ -44,16 +51,14 @@ DEPLIBS= ../lib/libss.a ../lib/libcom_err.a ../lib/libext2fs.a
 #
 #MCHECK= -DMCHECK
 
-#
-# Flags for profiling --- uncomment to produce profiling e2fsck
-#
-#PROF=         -pg
-#LIBS= -L../lib -lss -lcom_err_p -lext2fs_p 
-#DEPLIBS= ../lib/libss.a ../lib/libcom_err_p.a ../lib/libext2fs_p.a
-
 OBJS= e2fsck.o pass1.o pass1b.o pass2.o pass3.o pass4.o pass5.o \
        badblocks.o util.o dirinfo.o ehandler.o $(MTRACE_OBJ)
 
+PROFILED_OBJS= profiled/e2fsck.o profiled/pass1.o profiled/pass1b.o \
+       profiled/pass2.o profiled/pass3.o profiled/pass4.o profiled/pass5.o \
+       profiled/badblocks.o profiled/util.o profiled/dirinfo.o \
+       profiled/ehandler.o
+
 SRCS= $(srcdir)/e2fsck.c \
        $(srcdir)/pass1.c \
        $(srcdir)/pass1b.c \
@@ -67,10 +72,23 @@ SRCS= $(srcdir)/e2fsck.c \
        $(srcdir)/ehandler.c \
        $(MTRACE_SRC)
 
-all:: $(PROGS)
+all:: profiled $(PROGS) e2fsck.static e2fsck.shared
 
-e2fsck: $(OBJS)  $(DEPLIBS)
-       $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck $(OBJS) $(LIBS) 
+@PROFILE_CMT@all:: e2fsck.profiled
+
+e2fsck: e2fsck.@E2FSCK_TYPE@
+       $(CP) e2fsck.@E2FSCK_TYPE@ e2fsck
+
+e2fsck.static: $(OBJS)  $(STATIC_DEPLIBS)
+       $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
+               $(STATIC_LIBS) 
+
+e2fsck.shared: $(OBJS)  $(DEPLIBS)
+       $(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(LIBS) 
+
+e2fsck.profiled: $(PROFILED_OBJS)  $(DEPLIBS)
+       $(LD) $(ALL_LDFLAGS) -pg -o e2fsck.profiled $(PROFILED_OBJS) \
+               $(PROFILED_LIBS) 
 
 extend: extend.o
        $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
@@ -81,6 +99,12 @@ flushb: flushb.o
 iscan: iscan.o util.o
        $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
 
+profiled:
+       mkdir profiled
+
+e2fsck.8: $(SUBSTITUTE) $(srcdir)/e2fsck.8.in
+       -$(CHMOD) +x $(SUBSTITUTE)
+       $(SUBSTITUTE) $(srcdir)/e2fsck.8.in e2fsck.8
 
 installdirs:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir) \
@@ -105,7 +129,10 @@ uninstall:
        done
 
 clean:
-       $(RM) -f $(PROGS) \#* *\# *.s *.o *.a *~ core
+       $(RM) -f $(PROGS) \#* *\# *.s *.o *.a *~ core e2fsck.static \
+               e2fsck.shared e2fsck.profiled e2fsck.8
+       $(RM) -rf profiled
+
 mostlyclean: clean
 distclean: clean
        $(RM) -f .depend Makefile
@@ -115,54 +142,53 @@ distclean: clean
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-e2fsck.o : $(srcdir)/e2fsck.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/../version.h 
-pass1.o : $(srcdir)/pass1.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-pass1b.o : $(srcdir)/pass1b.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-pass2.o : $(srcdir)/pass2.c $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-pass3.o : $(srcdir)/pass3.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-pass4.o : $(srcdir)/pass4.c $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-pass5.o : $(srcdir)/pass5.c $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-badblocks.o : $(srcdir)/badblocks.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-util.o : $(srcdir)/util.c \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(top_srcdir)/lib/ext2fs/bitops.h 
-dirinfo.o : $(srcdir)/dirinfo.c $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h 
-ehandler.o : $(srcdir)/ehandler.c \
-  $(srcdir)/e2fsck.h \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(top_srcdir)/lib/ext2fs/bitops.h 
+e2fsck.o: $(srcdir)/e2fsck.c \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/../version.h
+pass1.o: $(srcdir)/pass1.c $(top_srcdir)/lib/et/com_err.h \
+ $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+pass1b.o: $(srcdir)/pass1b.c \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+pass2.o: $(srcdir)/pass2.c $(top_srcdir)/lib/et/com_err.h \
+ $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+pass3.o: $(srcdir)/pass3.c \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+pass4.o: $(srcdir)/pass4.c $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+pass5.o: $(srcdir)/pass5.c $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+badblocks.o: $(srcdir)/badblocks.c \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+util.o: $(srcdir)/util.c $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+dirinfo.o: $(srcdir)/dirinfo.c $(top_srcdir)/lib/et/com_err.h \
+ $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ehandler.o: $(srcdir)/ehandler.c \
+ $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h
+ 
 

diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
index 2ed2b11..6dbfa6f 100644 (file)
--- a/e2fsck/e2fsck.c
+++ b/e2fsck/e2fsck.c
@@ -224,6 +224,24 @@ static void check_super_value(const char *descr, unsigned long value,
        }
 }
 
+static void relocate_hint()
+{
+       static hint_issued = 0;
+
+       /* Only issue the hint once */
+       if (hint_issued)
+               return;
+
+       printf("Note: if there is several inode or block bitmap blocks\n"
+              "which require relocation, or one part of the inode table\n"
+              "which must be moved, you may wish to try running e2fsck\n"
+              "the '-b 8193' option first.  The problem may lie only with\n"
+              "the primary block group descriptor, and the backup block\n"
+              "group descriptor may be OK.\n\n");
+       hint_issued = 1;
+}
+
+       
 static void check_super_block(ext2_filsys fs)
 {
        blk_t   first_block, last_block;
@@ -312,6 +330,7 @@ static void check_super_block(ext2_filsys fs)
                        last_block = fs->super->s_blocks_count;
                if ((fs->group_desc[i].bg_block_bitmap < first_block) ||
                    (fs->group_desc[i].bg_block_bitmap >= last_block)) {
+                       relocate_hint();
                        printf("Block bitmap for group %d is not in group.  "
                               "(block %u)\n",
                               i, fs->group_desc[i].bg_block_bitmap);
@@ -325,6 +344,7 @@ static void check_super_block(ext2_filsys fs)
                }
                if ((fs->group_desc[i].bg_inode_bitmap < first_block) ||
                    (fs->group_desc[i].bg_inode_bitmap >= last_block)) {
+                       relocate_hint();
                        printf("Inode bitmap group %d not in group.  "
                               "(block %u)\n",
                               i, fs->group_desc[i].bg_inode_bitmap);
@@ -339,6 +359,7 @@ static void check_super_block(ext2_filsys fs)
                if ((fs->group_desc[i].bg_inode_table < first_block) ||
                    ((fs->group_desc[i].bg_inode_table +
                      fs->inode_blocks_per_group - 1) >= last_block)) {
+                       relocate_hint();
                        printf("Inode table for group %d not in group.  "
                               "(block %u)\n",
                               i, fs->group_desc[i].bg_inode_table);

diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index b5e2b30..9b41222 100644 (file)
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/install-utils/ChangeLog b/install-utils/ChangeLog
index e70aed8..f87005d 100644 (file)
--- a/install-utils/ChangeLog
+++ b/install-utils/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 094d35f..682e10c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
+Wed May 15 22:59:06 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.profile (install): Add an install production so that
+               the profiling libraries are installed.
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 93f1ace..83b59fc 100644 (file)
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -45,4 +45,4 @@ install-shlibs install:: $(ELF_LIB) installdirs
 clean::
        $(RM) -rf elfshared
        $(RM) -f $(ELF_LIB)
-       $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so
+       $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)

diff --git a/lib/Makefile.profile b/lib/Makefile.profile
index 8cb197a..0864fac 100644 (file)
--- a/lib/Makefile.profile
+++ b/lib/Makefile.profile
@@ -7,6 +7,7 @@ profiled:
 
 clean::
        $(RM) -rf profiled
+       $(RM) -f $(LIBRARY)_p.a ../$(LIBRARY)_p.a
 
 $(LIBRARY)_p.a: $(OBJS)
        (if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
@@ -14,3 +15,9 @@ $(LIBRARY)_p.a: $(OBJS)
        -$(RANLIB) $@
        $(RM) -f ../$@
        $(LN) $@ ../$@
+
+install:: $(LIBRARY)_p.a installdirs
+       $(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a
+       $(CHMOD) 644 $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a
+       -$(RANLIB) $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a
+       $(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/$(LIBRARY)_p.a

diff --git a/lib/do_substitute b/lib/do_substitute
new file mode 100644 (file)
index 0000000..262609d
--- /dev/null
+++ b/lib/do_substitute
@@ -0,0 +1,28 @@
+#
+# This is the actual gots of substitute_sh.  It is in a separate file to 
+# protect it from autoconf substitutions
+#
+
+$SED   -e "s%@AWK@%$AWK%g" \
+       -e "s%@SED@%$SED%g" \
+       -e "s%@ET_DIR@%$ET_DIR%g" \
+       -e "s%@SS_DIR@%$SS_DIR%g" \
+       -e "s%@E2FSPROGS_MONTH@%$E2FSPROGS_MONTH%g" \
+       -e "s%@E2FSPROGS_YEAR@%$E2FSPROGS_YEAR%g" \
+       -e "s%@E2FSPROGS_VERSION@%$E2FSPROGS_VERSION%g" \
+       -e "s%@SIZEOF_LONG@%$SIZEOF_LONG%g" \
+       -e "s%@SIZEOF_INT@%$SIZEOF_INT%g" \
+       -e "s%@SIZEOF_SHORT@%$SIZEOF_SHORT%g" \
+       $1 > $2.tmp
+
+if [ -f $2 ]; then
+       if cmp $2 $2.tmp > /dev/null 2>&1 ; then
+               $RM $2.tmp
+       else
+               echo "substitute_sh: Replacing $2"
+               $MV $2.tmp $2
+       fi
+else
+       echo "substitute_sh: Creating $2"
+       $MV $2.tmp $2
+fi

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 00a1cf2..2422e73 100644 (file)
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 568c2ec..97f3fbc 100644 (file)
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -89,42 +89,16 @@ distclean:: clean
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-fgetflags.o : $(srcdir)/fgetflags.c \
-  $(srcdir)/e2p.h \
-  
-fsetflags.o : $(srcdir)/fsetflags.c \
-  $(srcdir)/e2p.h \
-  
-fgetversion.o : $(srcdir)/fgetversion.c \
-  $(srcdir)/e2p.h \
-  
-fsetversion.o : $(srcdir)/fsetversion.c \
-  $(srcdir)/e2p.h \
-  
-getflags.o : $(srcdir)/getflags.c \
-  $(srcdir)/e2p.h \
-  
-getversion.o : $(srcdir)/getversion.c \
-  $(srcdir)/e2p.h \
-  
-iod.o : $(srcdir)/iod.c $(srcdir)/e2p.h \
-  
-ls.o : $(srcdir)/ls.c \
-  $(srcdir)/e2p.h \
-  
-pe.o : $(srcdir)/pe.c \
-  $(srcdir)/e2p.h \
-  
-pf.o : $(srcdir)/pf.c \
-  $(srcdir)/e2p.h \
-  
-ps.o : $(srcdir)/ps.c \
-  $(srcdir)/e2p.h \
-  
-setflags.o : $(srcdir)/setflags.c \
-  $(srcdir)/e2p.h \
-  
-setversion.o : $(srcdir)/setversion.c \
-  $(srcdir)/e2p.h \
-  
-
+fgetflags.o: $(srcdir)/fgetflags.c $(srcdir)/e2p.h
+fsetflags.o: $(srcdir)/fsetflags.c $(srcdir)/e2p.h
+fgetversion.o: $(srcdir)/fgetversion.c $(srcdir)/e2p.h
+fsetversion.o: $(srcdir)/fsetversion.c $(srcdir)/e2p.h
+getflags.o: $(srcdir)/getflags.c $(srcdir)/e2p.h
+getversion.o: $(srcdir)/getversion.c $(srcdir)/e2p.h
+iod.o: $(srcdir)/iod.c $(srcdir)/e2p.h
+ls.o: $(srcdir)/ls.c  $(srcdir)/e2p.h
+pe.o: $(srcdir)/pe.c $(srcdir)/e2p.h
+pf.o: $(srcdir)/pf.c $(srcdir)/e2p.h
+ps.o: $(srcdir)/ps.c $(srcdir)/e2p.h
+setflags.o: $(srcdir)/setflags.c $(srcdir)/e2p.h
+setversion.o: $(srcdir)/setversion.c $(srcdir)/e2p.h

diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index e5fa6cd..22bb8b4 100644 (file)
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index e3e52ba..49c4fca 100644 (file)
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -60,8 +60,10 @@ BSDLIB_INSTALL_DIR = $(libdir)
 @MAKEFILE_PROFILE@
 @MAKEFILE_CHECKER@
 
-compile_et: compile_et.sh
-       $(CP) $< $@ && $(CHMOD) +x compile_et
+compile_et: $(SUBSTITUTE) $(srcdir)/compile_et.sh.in
+       -$(CHMOD) +x $(SUBSTITUTE) 
+       $(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
+       $(CHMOD) +x compile_et
 
 com_err.ps : com_err.dvi
 com_err.dvi: com_err.texinfo
@@ -97,26 +99,18 @@ clean::
        $(RM) -f ../libcom_err.a ../libcom_err_p.a
 mostlyclean:: clean
 distclean:: clean
-       $(RM) -f .depend compile_et.sh Makefile
+       $(RM) -f .depend Makefile
 
 # +++ Dependency line eater +++
 # 
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-error_message.o : $(srcdir)/error_message.c \
-  $(srcdir)/com_err.h \
-  $(srcdir)/error_table.h $(srcdir)/mit-sipb-copyright.h $(srcdir)/internal.h 
-et_name.o : $(srcdir)/et_name.c $(srcdir)/error_table.h $(srcdir)/mit-sipb-copyright.h \
-  $(srcdir)/internal.h \
-  
-init_et.o : $(srcdir)/init_et.c \
-  $(srcdir)/com_err.h \
-  $(srcdir)/error_table.h \
-  $(srcdir)/mit-sipb-copyright.h 
-com_err.o : $(srcdir)/com_err.c \
-  $(srcdir)/com_err.h \
-  $(srcdir)/mit-sipb-copyright.h \
-  $(srcdir)/error_table.h $(srcdir)/internal.h \
-  
-
+error_message.o: $(srcdir)/error_message.c $(srcdir)/com_err.h \
+ $(srcdir)/error_table.h $(srcdir)/mit-sipb-copyright.h $(srcdir)/internal.h
+et_name.o: $(srcdir)/et_name.c $(srcdir)/error_table.h \
+ $(srcdir)/mit-sipb-copyright.h $(srcdir)/internal.h 
+init_et.o: $(srcdir)/init_et.c $(srcdir)/com_err.h \
+ $(srcdir)/error_table.h $(srcdir)/mit-sipb-copyright.h
+com_err.o: $(srcdir)/com_err.c $(srcdir)/com_err.h \
+ $(srcdir)/mit-sipb-copyright.h $(srcdir)/error_table.h $(srcdir)/internal.h 

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index eba0b9f..90de2b5 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index c3311f8..2666977 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -114,6 +114,10 @@ COMPILE_ET=../et/compile_et
 
 DISTFILES= Makefile *.c *.h image
 
+ext2_err.et: $(SUBSTITUTE) $(srcdir)/ext2_err.et.in
+       -$(CHMOD) +x $(SUBSTITUTE) 
+       $(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
+
 ext2_err.c ext2_err.h: ext2_err.et
        $(COMPILE_ET) ext2_err.et
 
@@ -137,7 +141,7 @@ uninstall::
 
 clean::
        $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* \
-               ext2_err.c ext2_err.h \
+               ext2_err.et ext2_err.c ext2_err.h \
                ../libext2fs.a ../libext2fs_p.a ../libext2fs_chk.a
 
 mostlyclean:: clean
@@ -150,141 +154,88 @@ distclean:: clean
 # the Makefile.in file
 #
 ext2_err.o: ext2_err.c
-alloc.o: $(srcdir)/alloc.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-badblocks.o: $(srcdir)/badblocks.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-bb_inode.o: $(srcdir)/bb_inode.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-bitmaps.o: $(srcdir)/bitmaps.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-bitops.o: $(srcdir)/bitops.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-block.o: $(srcdir)/block.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-check_desc.o: $(srcdir)/check_desc.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-closefs.o: $(srcdir)/closefs.c \
-  $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-cmp_bitmaps.o: $(srcdir)/cmp_bitmaps.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-dirblock.o: $(srcdir)/dirblock.c \
-  $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-expanddir.o: $(srcdir)/expanddir.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-freefs.o: $(srcdir)/freefs.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-get_pathname.o: $(srcdir)/get_pathname.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-getsize.o: $(srcdir)/getsize.c \
-  $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-initialize.o: $(srcdir)/initialize.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-inline.o: $(srcdir)/inline.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-inode.o: $(srcdir)/inode.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-ismounted.o: $(srcdir)/ismounted.c \
-  $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-link.o: $(srcdir)/link.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-llseek.o: $(srcdir)/llseek.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h \
-  
-mkdir.o: $(srcdir)/mkdir.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-namei.o: $(srcdir)/namei.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-newdir.o: $(srcdir)/newdir.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-openfs.o: $(srcdir)/openfs.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-read_bb.o: $(srcdir)/read_bb.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-read_bb_file.o: $(srcdir)/read_bb_file.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-rw_bitmaps.o: $(srcdir)/rw_bitmaps.c \
-  $(srcdir)/ext2fs.h \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-swapfs.o: $(srcdir)/swapfs.c \
-  $(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/bitops.h
-unix_io.o: $(srcdir)/unix_io.c \
-  $(top_srcdir)/lib/et/com_err.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/io.h
+alloc.o: $(srcdir)/alloc.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+badblocks.o: $(srcdir)/badblocks.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+bb_inode.o: $(srcdir)/bb_inode.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+bitmaps.o: $(srcdir)/bitmaps.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+bitops.o: $(srcdir)/bitops.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+block.o: $(srcdir)/block.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+check_desc.o: $(srcdir)/check_desc.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+closefs.o: $(srcdir)/closefs.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+cmp_bitmaps.o: $(srcdir)/cmp_bitmaps.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+dirblock.o: $(srcdir)/dirblock.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+expanddir.o: $(srcdir)/expanddir.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+freefs.o: $(srcdir)/freefs.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+get_pathname.o: $(srcdir)/get_pathname.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+getsize.o: $(srcdir)/getsize.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+initialize.o: $(srcdir)/initialize.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+inline.o: $(srcdir)/inline.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+inode.o: $(srcdir)/inode.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+ismounted.o: $(srcdir)/ismounted.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+link.o: $(srcdir)/link.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+llseek.o: $(srcdir)/llseek.c $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h
+mkdir.o: $(srcdir)/mkdir.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+namei.o: $(srcdir)/namei.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+newdir.o: $(srcdir)/newdir.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+openfs.o: $(srcdir)/openfs.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+read_bb.o: $(srcdir)/read_bb.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+read_bb_file.o: $(srcdir)/read_bb_file.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+rw_bitmaps.o: $(srcdir)/rw_bitmaps.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+swapfs.o: $(srcdir)/swapfs.c $(srcdir)/ext2fs.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
+unix_io.o: $(srcdir)/unix_io.c $(top_srcdir)/lib/et/com_err.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/io.h
 

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index c1ea2c2..7943820 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,12 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
+Thu May 16 10:04:09 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (INSTALL_HFILES): Install the correct header files
+               so that /usr/include/ss/ss.h is actually usable!
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 4a49726..9af2c2f 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -89,7 +89,9 @@ MKCMDSFILES=  mk_cmds.c utils.c options.c ct.y cmd_tbl.lex.l
 MKCMDSCSRCS=   mk_cmds.c utils.c options.c ct.tab.c cmd_tbl.lex.c
 
 
-HFILES=        ss.h ss_internal.h copyright.h
+HFILES=        ss.h ss_internal.h copyright.h 
+
+INSTALL_HFILES=        ss.h ss_err.h copyright.h 
 
 # for 'tags' and dependencies
 
@@ -99,7 +101,7 @@ CFILES=      $(SRCS) $(MKCMDSCSRCS) test_ss.c
 
 FILES= $(SRCS) $(MKCMDSFILES) $(HFILES) \
        ss_err.et std_rqs.ct Makefile \
-       test_ss.c ss mit-sipb-copyright.h copyright.h
+       test_ss.c ss copyright.h
 
 all::  libss.a # libss_p.a lint
 
@@ -119,20 +121,22 @@ ct.tab.c ct.tab.h: ct.y
 #      $(LD) -r -s -o $@ $(OBJS)
 #      $(CHMOD) -x $@
 
-mk_cmds: mk_cmds.sh
-       $(CP) mk_cmds.sh $@ && $(CHMOD) +x mk_cmds
+mk_cmds: $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in
+       -$(CHMOD) +x $(SUBSTITUTE) 
+       $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
+       $(CHMOD) +x mk_cmds
 
 installdirs::
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ulibdir) \
                $(DESTDIR)$(includedir)/ss
 
-install:: libss.a $(HFILES) copyright.h installdirs
+install:: libss.a $(INSTALL_HFILES) copyright.h installdirs
        $(INSTALL_DATA) libss.a $(DESTDIR)$(ulibdir)/libss.a
        $(CHMOD) 644 $(DESTDIR)$(ulibdir)/libss.a
        -$(RANLIB) $(DESTDIR)$(ulibdir)/libss.a
        $(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/libss.a
        $(RM) -f $(includedir)/ss/*
-       for i in $(HFILES) copyright.h; do \
+       for i in $(INSTALL_HFILES) copyright.h; do \
                $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
        done
 
@@ -141,68 +145,40 @@ uninstall::
        $(RM) -rf $(includedir)/ss
 
 clean::
-       $(RM) -f ../libss.a libss.a mk_cmds 
-       $(RM) -f *.o *~ \#* *.bak core 
+       $(RM) -f ../libss.a libss.a mk_cmds ss_err.h ss_err.c std_rqs.c \
+               *.o *~ \#* *.bak core 
 
 mostlyclean:: clean
 distclean:: clean
-       $(RM) -f .depend ss_err.h ss_err.c mk_cmds.sh Makefile
+       $(RM) -f .depend Makefile
 
 # +++ Dependency line eater +++
 # 
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-invocation.o: $(srcdir)/invocation.c $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-help.o: $(srcdir)/help.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h $(srcdir)/copyright.h 
+invocation.o: $(srcdir)/invocation.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+help.o: $(srcdir)/help.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
 execute_cmd.o: $(srcdir)/execute_cmd.c $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-listen.o: $(srcdir)/listen.c $(srcdir)/copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h
-parse.o: $(srcdir)/parse.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-error.o: $(srcdir)/error.c \
-  $(srcdir)/copyright.h \
-  $(srcdir)/../et/com_err.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h
-prompt.o: $(srcdir)/prompt.c $(srcdir)/copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h
-request_tbl.o: $(srcdir)/request_tbl.c \
-  $(srcdir)/copyright.h $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h
+ $(srcdir)/ss.h $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+listen.o: $(srcdir)/listen.c $(srcdir)/copyright.h $(srcdir)/ss_internal.h \
+ $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+parse.o: $(srcdir)/parse.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+error.o: $(srcdir)/error.c $(srcdir)/copyright.h $(srcdir)/../et/com_err.h \
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+prompt.o: $(srcdir)/prompt.c $(srcdir)/copyright.h $(srcdir)/ss_internal.h \
+ $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+request_tbl.o: $(srcdir)/request_tbl.c $(srcdir)/copyright.h \
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
 list_rqs.o: $(srcdir)/list_rqs.c $(srcdir)/copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h $(srcdir)/mit-sipb-copyright.h \
-  $(top_builddir)/lib/ss/ss_err.h
-pager.o: $(srcdir)/pager.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
-requests.o: $(srcdir)/requests.c $(srcdir)/mit-sipb-copyright.h \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(top_builddir)/lib/ss/ss_err.h
-data.o: $(srcdir)/data.c \
-  $(srcdir)/ss_internal.h \
-  $(srcdir)/ss.h \
-  $(srcdir)/mit-sipb-copyright.h $(top_builddir)/lib/ss/ss_err.h \
-  $(srcdir)/copyright.h
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+pager.o: $(srcdir)/pager.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+requests.o: $(srcdir)/requests.c $(srcdir)/copyright.h \
+ $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h
+data.o: $(srcdir)/data.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \
+ $(srcdir)/copyright.h $(top_builddir)/lib/ss/ss_err.h
+

diff --git a/lib/ss/requests.c b/lib/ss/requests.c
index 5205337..9da9607 100644 (file)
--- a/lib/ss/requests.c
+++ b/lib/ss/requests.c
@@ -3,10 +3,10 @@
  *
  * Copyright 1987, 1988, 1989 by MIT
  *
- * For copyright information, see mit-sipb-copyright.h.
+ * For copyright information, see copyright.h.
  */
 
-#include "mit-sipb-copyright.h"
+#include "copyright.h"
 #include <stdio.h>
 #include "ss_internal.h"
 

diff --git a/lib/ss/ss.h b/lib/ss/ss.h
index 29aa9dc..f992bd9 100644 (file)
--- a/lib/ss/ss.h
+++ b/lib/ss/ss.h
@@ -1,13 +1,13 @@
 /*
  * Copyright 1987, 1988 by MIT Student Information Processing Board
  *
- * For copyright information, see mit-sipb-copyright.h.
+ * For copyright information, see copyright.h.
  */
 
 #ifndef _ss_h
 #define _ss_h __FILE__
 
-#include <ss/mit-sipb-copyright.h>
+#include <ss/copyright.h>
 #include <ss/ss_err.h>
 
 extern int errno;

diff --git a/lib/ss/test_ss.c b/lib/ss/test_ss.c
index 7ee5c65..aa4c7f3 100644 (file)
--- a/lib/ss/test_ss.c
+++ b/lib/ss/test_ss.c
@@ -9,8 +9,8 @@
  * $Locker$
  *
  * $Log$
- * Revision 1.5  1997/04/26 14:35:55  tytso
- * Checkin of e2fsprogs 1.02.
+ * Revision 1.7  1997/04/29 14:34:41  tytso
+ * Checked in e2fsprogs 1.04.
  *
  * Revision 1.1  1993/06/03  12:31:25  tytso
  * Initial revision

diff --git a/lib/substitute_sh.in b/lib/substitute_sh.in
new file mode 100644 (file)
index 0000000..f3b1680
--- /dev/null
+++ b/lib/substitute_sh.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# substitute <source> <dest>
+
+AWK=@AWK@
+SED=@SED@
+ET_DIR=@ET_DIR@
+SS_DIR=@SS_DIR@
+E2FSPROGS_MONTH=@E2FSPROGS_MONTH@
+E2FSPROGS_YEAR=@E2FSPROGS_YEAR@
+E2FSPROGS_VERSION=@E2FSPROGS_VERSION@
+SIZEOF_LONG=@SIZEOF_LONG@
+SIZEOF_INT=@SIZEOF_INT@
+SIZEOF_SHORT=@SIZEOF_SHORT@
+
+MV=@MV@
+RM=@RM@
+CP=@CP@
+
+@DO_SUBSTITUTE_SCRIPT@

diff --git a/misc/ChangeLog b/misc/ChangeLog
index be253d5..1fa8a92 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,12 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
+Wed May 15 21:15:43 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (fsck): fsck doesn't need to be linked with the ext2
+               libraries.
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 016c992..69f164c 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -30,16 +30,22 @@ SRCS=       $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \
                $(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \
                $(srcdir)/badblocks.c $(srcdir)/fsck.c
 
-LIBS= -L../lib -lext2fs -le2p -lcom_err 
-DEPLIBS= ../lib/libext2fs.a ../lib/libe2p.a ../lib/libcom_err.a 
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
+
+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) 
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $< -o $@
 
-all:: $(SPROGS) $(UPROGS) $(USPROGS)
+all:: $(SPROGS) $(UPROGS) $(USPROGS) fix_substitute $(SMANPAGES) $(UMANPAGES)
 
-tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS)
+tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS_E2P)
+       $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS_E2P)
 
 mklost+found: $(MKLPF_OBJS)
        $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS)
@@ -47,24 +53,52 @@ mklost+found: $(MKLPF_OBJS)
 mke2fs: $(MKE2FS_OBJS) $(DEPLIBS)
        $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS)
 
-mke2fs.static: $(MKE2FS_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) $(LIBS)
+mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS)
+       $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
+               $(STATIC_LIBS)
 
-chattr: $(CHATTR_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS)
+chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
+       $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P)
 
-lsattr: $(LSATTR_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS)
+lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
+       $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P)
 
-dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS)
+dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS_E2P)
+       $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS_E2P)
 
-fsck: $(FSCK_OBJS) $(DEPLIBS)
-       $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS)
+fsck: $(FSCK_OBJS)
+       $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS)
 
 badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
        $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS)
 
+fix_substitute:
+       -$(CHMOD) +x $(SUBSTITUTE) 
+
+tune2fs.8: $(SUBSTITUTE) $(srcdir)/tune2fs.8.in
+       $(SUBSTITUTE) $(srcdir)/tune2fs.8.in tune2fs.8
+
+mklost+found.8: $(SUBSTITUTE) $(srcdir)/mklost+found.8.in
+       $(SUBSTITUTE) $(srcdir)/mklost+found.8.in mklost+found.8
+
+mke2fs.8: $(SUBSTITUTE) $(srcdir)/mke2fs.8.in
+       $(SUBSTITUTE) $(srcdir)/mke2fs.8.in mke2fs.8
+
+dumpe2fs.8: $(SUBSTITUTE) $(srcdir)/dumpe2fs.8.in 
+       $(SUBSTITUTE) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
+
+badblocks.8: $(SUBSTITUTE) $(srcdir)/badblocks.8.in
+       $(SUBSTITUTE) $(srcdir)/badblocks.8.in badblocks.8      
+
+fsck.8: $(SUBSTITUTE) $(srcdir)/fsck.8.in
+       $(SUBSTITUTE) $(srcdir)/fsck.8.in fsck.8 
+
+chattr.1: $(SUBSTITUTE) $(srcdir)/chattr.1.in
+       $(SUBSTITUTE) $(srcdir)/chattr.1.in chattr.1 
+
+lsattr.1: $(SUBSTITUTE) $(srcdir)/lsattr.1.in 
+       $(SUBSTITUTE) $(srcdir)/lsattr.1.in lsattr.1 
+
 installdirs:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) \
                $(DESTDIR)$(ubindir) $(DESTDIR)$(man1dir) \
@@ -110,8 +144,9 @@ uninstall:
        done
 
 clean:
-       $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) mke2fs.static \
-               \#* *.s *.o *.a *~ core
+       $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \
+               mke2fs.static \#* *.s *.o *.a *~ core
+
 mostlyclean: clean
 distclean: clean
        $(RM) -f .depend Makefile
@@ -121,28 +156,26 @@ distclean: clean
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-tune2fs.o : $(srcdir)/tune2fs.c \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/e2p/e2p.h \
-  $(srcdir)/../version.h 
-mklost+found.o : $(srcdir)/mklost+found.c \
-  $(srcdir)/../version.h 
-mke2fs.o : $(srcdir)/mke2fs.c \
-  $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/../version.h 
-chattr.o : $(srcdir)/chattr.c \
-  $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/e2p/e2p.h \
-  $(srcdir)/../version.h 
-lsattr.o : $(srcdir)/lsattr.c \
-  $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/e2p/e2p.h \
-  $(srcdir)/../version.h 
-dumpe2fs.o : $(srcdir)/dumpe2fs.c \
-  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
-  $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/e2p/e2p.h \
-  $(srcdir)/../version.h 
-badblocks.o : $(srcdir)/badblocks.c \
-  $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/io.h 
-fsck.o : $(srcdir)/fsck.c \
-  $(srcdir)/../version.h \
-  $(srcdir)/fsck.h 
+tune2fs.o: $(srcdir)/tune2fs.c \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/e2p/e2p.h \
+ $(srcdir)/../version.h
+mklost+found.o: $(srcdir)/mklost+found.c $(srcdir)/../version.h
+mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/../version.h
+chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/../version.h
+lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/../version.h
+dumpe2fs.o: $(srcdir)/dumpe2fs.c \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/e2p/e2p.h \
+ $(srcdir)/../version.h
+badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/io.h
+fsck.o: $(srcdir)/fsck.c $(srcdir)/../version.h $(srcdir)/fsck.h
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0a3a63e..4dcec34 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,15 @@
+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Release of E2fsprogs version 1.04
+
+Wed May 15 21:41:29 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * f_illibitmap/expect.1, f_illbbitmap/expect.1: Changed
+               expected output to reflect hint which e2fsck will print when
+               there is a illegal block in the block group
+               descriptors, pointing at a block bitmap, inode bitmap,
+               or block in the inode table.
+
 Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs version 1.03

diff --git a/tests/f_illbbitmap/expect.1 b/tests/f_illbbitmap/expect.1
index 7c9c1f6..5734c25 100644 (file)
--- a/tests/f_illbbitmap/expect.1
+++ b/tests/f_illbbitmap/expect.1
@@ -1,3 +1,10 @@
+Note: if there is several inode or block bitmap blocks
+which require relocation, or one part of the inode table
+which must be moved, you may wish to try running e2fsck
+the '-b 8193' option first.  The problem may lie only with
+the primary block group descriptor, and the backup block
+group descriptor may be OK.
+
 Block bitmap for group 0 is not in group.  (block 4096)
 Relocate? yes
 

diff --git a/tests/f_illibitmap/expect.1 b/tests/f_illibitmap/expect.1
index 54719fa..d06aa30 100644 (file)
--- a/tests/f_illibitmap/expect.1
+++ b/tests/f_illibitmap/expect.1
@@ -1,3 +1,10 @@
+Note: if there is several inode or block bitmap blocks
+which require relocation, or one part of the inode table
+which must be moved, you may wish to try running e2fsck
+the '-b 8193' option first.  The problem may lie only with
+the primary block group descriptor, and the backup block
+group descriptor may be OK.
+
 Inode bitmap group 0 not in group.  (block 4000)
 Relocate? yes