Move the check_plausibility() function from misc to lib/support

The check_plausibility() function is now used all over the place, so
we should move the plausible.c file to lib/support and remove the
special case handling for that file that had been in the build system.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/Android.mk b/debugfs/Android.mk
index 246280b9fdb468c48359b5c66a0a97bceeac6c9c..80b5ec3a8a61c14529c50e32d61db1e76b55e0f9 100644 (file)
--- a/debugfs/Android.mk
+++ b/debugfs/Android.mk
@@ -27,8 +27,7 @@ debugfs_src_files :=  \
        journal.c \
        revoke.c \
        recovery.c \
-       do_journal.c \
-       plausible.c
+       do_journal.c
 
 debugfs_shared_libraries := \
        libext2fs \

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index d9917bb888e3a87d140eac2f9dc3a04dc6abb752..86b67ab2751b95c4baa438bad84f32887bf33de7 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -19,12 +19,11 @@ MK_CMDS=    _SS_DIR_OVERRIDE=../lib/ss ../lib/ss/mk_cmds
 DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
        lsdel.o dump.o set_fields.o logdump.o htree.o unused.o e2freefrag.o \
        filefrag.o extent_cmds.o extent_inode.o zap.o create_inode.o \
-       quota.o xattrs.o journal.o revoke.o recovery.o do_journal.o \
-       plausible.o
+       quota.o xattrs.o journal.o revoke.o recovery.o do_journal.o
 
 RO_DEBUG_OBJS= ro_debug_cmds.o ro_debugfs.o util.o ncheck.o icheck.o ls.o \
        lsdel.o logdump.o htree.o e2freefrag.o filefrag.o extent_cmds.o \
-       extent_inode.o quota.o xattrs.o ../misc/plausible.o
+       extent_inode.o quota.o xattrs.o
 
 SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \
        $(srcdir)/ncheck.c $(srcdir)/icheck.c $(srcdir)/lsdel.c \
@@ -33,8 +32,7 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \
        $(srcdir)/filefrag.c $(srcdir)/extent_inode.c $(srcdir)/zap.c \
        $(srcdir)/../misc/create_inode.c $(srcdir)/xattrs.c $(srcdir)/quota.c \
        $(srcdir)/journal.c $(srcdir)/../e2fsck/revoke.c \
-       $(srcdir)/../e2fsck/recovery.c $(srcdir)/do_journal.c \
-       $(srcdir)/../misc/plausible.c
+       $(srcdir)/../e2fsck/recovery.c $(srcdir)/do_journal.c
 
 LIBS= $(LIBSUPPORT) $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
        $(LIBUUID) $(LIBMAGIC) $(SYSLIBS)
@@ -61,10 +59,6 @@ DEPEND_CFLAGS = -I$(srcdir)
 
 all:: $(PROGS) $(MANPAGES)
 
-plausible.o: $(top_srcdir)/misc/plausible.c
-       $(E) "  CC $<"
-       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
-
 debugfs: $(DEBUG_OBJS) $(DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
@@ -187,7 +181,7 @@ debugfs.o: $(srcdir)/debugfs.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
  $(top_srcdir)/version.h $(srcdir)/../e2fsck/jfs_user.h \
  $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
- $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/../misc/plausible.h
+ $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/lib/support/plausible.h
 util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ss/ss.h \
  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@ -339,7 +333,7 @@ create_inode.o: $(srcdir)/../misc/create_inode.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/ext2fs/fiemap.h $(srcdir)/../misc/create_inode.h \
- $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/../misc/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/support/nls-enable.h
 xattrs.o: $(srcdir)/xattrs.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(srcdir)/debugfs.h $(top_srcdir)/lib/ss/ss.h \
  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@ -397,11 +391,3 @@ do_journal.o: $(srcdir)/do_journal.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
  $(srcdir)/../e2fsck/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
  $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h
-plausible.o: $(srcdir)/../misc/plausible.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(srcdir)/../misc/plausible.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/../misc/nls-enable.h

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 40ec05f63bfa002e8397d367dfef53ca30cd133b..749796b2f2b0ddc4cc77fe3adf866d14e62c65cb 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -35,7 +35,7 @@ extern char *optarg;
 
 #include "../version.h"
 #include "jfs_user.h"
-#include "../misc/plausible.h"
+#include "support/plausible.h"
 
 #ifndef BUFSIZ
 #define BUFSIZ 8192

diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk
index 3e4a40c9c78c50edf176db6dc169243047d1535e..969d12b161ec29bb221318457592ed8f29a4cf38 100644 (file)
--- a/e2fsck/Android.mk
+++ b/e2fsck/Android.mk
@@ -30,7 +30,6 @@ e2fsck_src_files :=  \
        rehash.c \
        region.c \
        sigcatcher.c \
-       plausible.c \
        readahead.c \
        extents.c
 

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 300ac38186c5de0df921d455f27a6b7098f889e5..50643e47f4bba05a50d87b04b6e59107aaa72370 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -62,7 +62,7 @@ OBJS= dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \
        pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
        dx_dirinfo.o ehandler.o problem.o message.o quota.o recovery.o \
        region.o revoke.o ea_refcount.o rehash.o \
-       logfile.o sigcatcher.o $(MTRACE_OBJ) plausible.o readahead.o \
+       logfile.o sigcatcher.o $(MTRACE_OBJ) readahead.o \
        extents.o
 
 PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
@@ -74,7 +74,7 @@ PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
        profiled/recovery.o profiled/region.o profiled/revoke.o \
        profiled/ea_refcount.o profiled/rehash.o \
        profiled/logfile.o profiled/sigcatcher.o \
-       profiled/plausible.o profiled/readahead.o profiled/extents.o
+       profiled/readahead.o profiled/extents.o
 
 SRCS= $(srcdir)/e2fsck.c \
        $(srcdir)/dict.c \
@@ -103,7 +103,6 @@ SRCS= $(srcdir)/e2fsck.c \
        $(srcdir)/sigcatcher.c \
        $(srcdir)/logfile.c \
        $(srcdir)/quota.c \
-       $(srcdir)/../misc/plausible.c \
        $(srcdir)/extents.c \
        $(MTRACE_SRC)
 
@@ -111,13 +110,6 @@ all:: profiled $(PROGS) e2fsck $(MANPAGES) $(FMANPAGES)
 
 @PROFILE_CMT@all:: e2fsck.profiled
 
-plausible.o: $(top_srcdir)/misc/plausible.c
-       $(E) "  CC $<"
-       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
-       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
-@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-
 e2fsck: $(OBJS)  $(DEPLIBS)
        $(E) "  LD $@"
        $(Q) $(LD) $(ALL_LDFLAGS) $(RDYNAMIC) -o e2fsck $(OBJS) $(LIBS) 
@@ -419,14 +411,15 @@ util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \
 unix.o: $(srcdir)/unix.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/e2p/e2p.h \
  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/support/plausible.h \
+ $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \
  $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
- $(srcdir)/problem.h $(top_srcdir)/version.h $(srcdir)/../misc/plausible.h
+ $(srcdir)/problem.h $(top_srcdir)/version.h
 dirinfo.o: $(srcdir)/dirinfo.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \
  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
@@ -552,14 +545,6 @@ quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
  $(srcdir)/problem.h
-plausible.o: $(srcdir)/../misc/plausible.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(srcdir)/../misc/plausible.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/../misc/nls-enable.h
 extents.o: $(srcdir)/extents.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \
  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index e1222f3aa1d1f90395b47c5307ff49e626bc57b4..9d49a0e6a2540c4955417240f13b3001f1283eda 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -50,10 +50,10 @@ extern int optind;
 #include "e2p/e2p.h"
 #include "et/com_err.h"
 #include "e2p/e2p.h"
+#include "support/plausible.h"
 #include "e2fsck.h"
 #include "problem.h"
 #include "../version.h"
-#include "../misc/plausible.h"
 
 /* Command line options */
 static int cflag;              /* check disk */

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index e2647cbe17f0d4a79ec45d125595a801a4cf7865..27cb0bfe31969ff771c90b2968481dc0b3635aa8 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -23,7 +23,7 @@ DEBUG_OBJS= debug_cmds.o extent_cmds.o tst_cmds.o debugfs.o util.o \
        ncheck.o icheck.o ls.o lsdel.o dump.o set_fields.o logdump.o \
        htree.o unused.o e2freefrag.o filefrag.o extent_inode.o zap.o \
        xattrs.o quota.o tst_libext2fs.o create_inode.o journal.o \
-       revoke.o recovery.o do_journal.o plausible.o
+       revoke.o recovery.o do_journal.o
 
 DEBUG_SRCS= debug_cmds.c extent_cmds.c tst_cmds.c \
        $(top_srcdir)/debugfs/debugfs.c \
@@ -47,8 +47,7 @@ DEBUG_SRCS= debug_cmds.c extent_cmds.c tst_cmds.c \
        $(top_srcdir)/debugfs/journal.c \
        $(top_srcdir)/e2fsck/revoke.c \
        $(top_srcdir)/e2fsck/recovery.c \
-       $(top_srcdir)/debugfs/do_journal.c \
-       $(top_srcdir)/misc/plausible.c
+       $(top_srcdir)/debugfs/do_journal.c
 
 OBJS= $(DEBUGFS_LIB_OBJS) $(RESIZE_LIB_OBJS) $(E2IMAGE_LIB_OBJS) \
        $(TEST_IO_LIB_OBJS) \
@@ -435,10 +434,6 @@ recovery.o: $(top_srcdir)/e2fsck/recovery.c
        $(E) "  CC $<"
        $(Q) $(CC) $(DEBUGFS_CFLAGS) -c $< -o $@
 
-plausible.o: $(top_srcdir)/misc/plausible.c
-       $(E) "  CC $<"
-       $(Q) $(CC) $(DEBUGFS_CFLAGS) -c $< -o $@
-
 do_journal.o: $(top_srcdir)/debugfs/do_journal.c
        $(E) "  CC $<"
        $(Q) $(CC) $(DEBUGFS_CFLAGS) -c $< -o $@
@@ -1164,7 +1159,7 @@ debugfs.o: $(top_srcdir)/debugfs/debugfs.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
  $(top_srcdir)/debugfs/../version.h $(srcdir)/../../e2fsck/jfs_user.h \
  $(srcdir)/kernel-jbd.h $(srcdir)/jfs_compat.h $(srcdir)/kernel-list.h \
- $(top_srcdir)/debugfs/../misc/plausible.h
+ $(top_srcdir)/lib/support/plausible.h
 util.o: $(top_srcdir)/debugfs/util.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ss/ss.h \
  $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h \
@@ -1350,7 +1345,7 @@ create_inode.o: $(top_srcdir)/misc/create_inode.c \
  $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/fiemap.h \
  $(top_srcdir)/misc/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
- $(top_srcdir)/misc/nls-enable.h
+ $(top_srcdir)/lib/support/nls-enable.h
 journal.o: $(top_srcdir)/debugfs/journal.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(srcdir)/../../e2fsck/jfs_user.h \
  $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
@@ -1383,9 +1378,3 @@ do_journal.o: $(top_srcdir)/debugfs/do_journal.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
  $(srcdir)/../../e2fsck/jfs_user.h $(srcdir)/kernel-jbd.h \
  $(srcdir)/jfs_compat.h $(srcdir)/kernel-list.h
-plausible.o: $(top_srcdir)/misc/plausible.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(top_srcdir)/misc/plausible.h \
- $(srcdir)/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(top_srcdir)/misc/nls-enable.h

diff --git a/lib/support/Android.mk b/lib/support/Android.mk
index 406e73ba40044c31e9c8dd82178a7fa97fff2909..afa932a24ed55ec992297540cb955d4e56ba4207 100644 (file)
--- a/lib/support/Android.mk
+++ b/lib/support/Android.mk
@@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 libext2_quota_src_files := \
        mkquota.c \
+       plausible.c \
        profile.c \
        profile_helpers.c \
        prof_err.c \
@@ -14,7 +15,7 @@ libext2_quota_c_includes := external/e2fsprogs/lib
 
 libext2_quota_cflags := -O2 -g -W -Wall
 
-libext2_quota_shared_libraries := libext2fs libext2_com_err
+libext2_quota_shared_libraries := libext2fs libext2_com_err libext2_blkid
 
 libext2_quota_system_shared_libraries := libc
 

diff --git a/lib/support/Makefile.in b/lib/support/Makefile.in
index 93fd9b75931366574f5e36235174982920dfe4ba..559c29b8a80b3f7df920751f848b6baa90521697 100644 (file)
--- a/lib/support/Makefile.in
+++ b/lib/support/Makefile.in
@@ -13,6 +13,7 @@ INSTALL = @INSTALL@
 all::
 
 OBJS=          mkquota.o \
+               plausible.o \
                profile.o \
                profile_helpers.o \
                prof_err.o \
@@ -23,6 +24,7 @@ OBJS=         mkquota.o \
 
 SRCS=          $(srcdir)/argv_parse.c \
                $(srcdir)/mkquota.c \
+               $(srcdir)/plausible.c \
                $(srcdir)/profile.c \
                $(srcdir)/profile_helpers.c \
                prof_err.c \
@@ -107,6 +109,14 @@ mkquota.o: $(srcdir)/mkquota.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/quotaio.h $(srcdir)/dqblk_v2.h \
  $(srcdir)/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
  $(srcdir)/quotaio_v2.h $(srcdir)/common.h
+plausible.o: $(srcdir)/plausible.c $(top_builddir)/lib/config.h \
+ $(top_builddir)/lib/dirpaths.h $(srcdir)/plausible.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/nls-enable.h
 profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
  $(srcdir)/profile.h prof_err.h

diff --git a/misc/nls-enable.h b/lib/support/nls-enable.h
similarity index 100%
rename from misc/nls-enable.h
rename to lib/support/nls-enable.h

diff --git a/misc/plausible.c b/lib/support/plausible.c
similarity index 100%
rename from misc/plausible.c
rename to lib/support/plausible.c

diff --git a/misc/plausible.h b/lib/support/plausible.h
similarity index 100%
rename from misc/plausible.h
rename to lib/support/plausible.h

diff --git a/misc/Android.mk b/misc/Android.mk
index 2c436c7081e3d967f12d06e8b5565dec95d3ad8d..2ea323a89615f3d397120d4bf170505b7d9054be 100644 (file)
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -7,8 +7,7 @@ mke2fs_src_files := \
        util.c \
        mk_hugefiles.c \
        default_profile.c \
-       create_inode.c \
-       plausible.c
+       create_inode.c
 
 mke2fs_c_includes := \
        external/e2fsprogs/lib \
@@ -54,7 +53,6 @@ include $(BUILD_HOST_EXECUTABLE)
 #
 tune2fs_src_files := \
        tune2fs.c \
-       plausible.c \
        util.c
 
 tune2fs_c_includes := \
@@ -336,8 +334,7 @@ include $(BUILD_HOST_EXECUTABLE)
 # Build e2image
 #
 e2image_src_files := \
-       e2image.c \
-       plausible.c
+       e2image.c
 
 e2image_c_includes := \
        external/e2fsprogs/lib
@@ -347,7 +344,8 @@ e2image_cflags := -O2 -g -W -Wall
 e2image_shared_libraries := \
        libext2fs \
        libext2_blkid \
-       libext2_com_err
+       libext2_com_err \
+       libext2_quota
 
 e2image_system_shared_libraries := libc
 

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 874604a668c1567ad6562ba1ef5f3b9c4dcb9cbf..82f05377f894008d584647bf98aa4fda68f060ea 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -47,17 +47,17 @@ UMANPAGES=  chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
 
 LPROGS=                @E2INITRD_PROG@
 
-TUNE2FS_OBJS=  tune2fs.o util.o plausible.o
+TUNE2FS_OBJS=  tune2fs.o util.o
 MKLPF_OBJS=    mklost+found.o
 MKE2FS_OBJS=   mke2fs.o util.o default_profile.o mk_hugefiles.o \
-                       create_inode.o plausible.o
+                       create_inode.o
 CHATTR_OBJS=   chattr.o
 LSATTR_OBJS=   lsattr.o
 UUIDGEN_OBJS=  uuidgen.o
 UUIDD_OBJS=    uuidd.o
-DUMPE2FS_OBJS= dumpe2fs.o plausible.o
+DUMPE2FS_OBJS= dumpe2fs.o
 BADBLOCKS_OBJS=        badblocks.o
-E2IMAGE_OBJS=  e2image.o plausible.o
+E2IMAGE_OBJS=  e2image.o
 FSCK_OBJS=     fsck.o base_device.o ismounted.o
 BLKID_OBJS=    blkid.o
 FILEFRAG_OBJS= filefrag.o
@@ -68,20 +68,19 @@ E2FREEFRAG_OBJS= e2freefrag.o
 E2FUZZ_OBJS=   e2fuzz.o
 FUSE2FS_OBJS=  fuse2fs.o journal.o recovery.o revoke.o
 
-PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o profiled/plausible.o
+PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o
 PROFILED_MKLPF_OBJS=   profiled/mklost+found.o
 PROFILED_MKE2FS_OBJS=  profiled/mke2fs.o profiled/util.o profiled/profile.o \
                        profiled/prof_err.o profiled/default_profile.o \
-                       profiled/mk_hugefiles.o profiled/create_inode.o \
-                       profiled/plausible.o
+                       profiled/mk_hugefiles.o profiled/create_inode.o
 
 PROFILED_CHATTR_OBJS=  profiled/chattr.o
 PROFILED_LSATTR_OBJS=  profiled/lsattr.o
 PROFILED_UUIDGEN_OBJS= profiled/uuidgen.o
 PROFILED_UUIDD_OBJS=   profiled/uuidd.o
-PROFILED_DUMPE2FS_OBJS=        profiled/dumpe2fs.o profiled/plausible.o
+PROFILED_DUMPE2FS_OBJS=        profiled/dumpe2fs.o
 PROFILED_BADBLOCKS_OBJS=       profiled/badblocks.o
-PROFILED_E2IMAGE_OBJS= profiled/e2image.o profiled/plausible.o
+PROFILED_E2IMAGE_OBJS= profiled/e2image.o
 PROFILED_FSCK_OBJS=    profiled/fsck.o profiled/base_device.o \
                        profiled/ismounted.o
 PROFILED_BLKID_OBJS=   profiled/blkid.o
@@ -100,20 +99,20 @@ SRCS=      $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c $(srcdir)/
                $(srcdir)/filefrag.c $(srcdir)/base_device.c \
                $(srcdir)/ismounted.c $(srcdir)/e2undo.c \
                $(srcdir)/e2freefrag.c $(srcdir)/create_inode.c \
-               $(srcdir)/plausible.c $(srcdir)/fuse2fs.c \
+               $(srcdir)/fuse2fs.c \
                $(srcdir)/../debugfs/journal.c $(srcdir)/../e2fsck/revoke.c \
                $(srcdir)/../e2fsck/recovery.c
 
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR)
-PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
-PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR)
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBSUPPORT)
+DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBSUPPORT)
+PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) $(LIBSUPPORT)
+PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) $(DEPLIBSUPPORT)
 
-STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
-STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) 
+STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(LIBSUPPORT)
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) $(DEPLIBSUPPORT)
 
-LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
-DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR) 
+LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
+DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR)
 
 COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 
@@ -167,26 +166,25 @@ e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
                $(LIBBLKID) $(LIBEXT2FS) $(LIBINTL) $(SYSLIBS)
 
 tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
-               $(DEPLIBUUID) $(DEPLIBSUPPORT) $(LIBEXT2FS)
+               $(DEPLIBUUID) $(LIBEXT2FS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
-               $(LIBBLKID) $(LIBUUID) $(LIBSUPPORT) $(LIBEXT2FS) $(LIBS_E2P) \
+               $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBS_E2P) \
                $(LIBINTL) $(SYSLIBS) $(LIBBLKID) $(LIBMAGIC)
 
 tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
        $(E) "  LD $@"
        $(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
                $(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
-               $(STATIC_LIBSUPPORT) $(STATIC_LIBE2P) $(LIBINTL) $(SYSLIBS) \
+               $(STATIC_LIBE2P) $(LIBINTL) $(SYSLIBS) \
                $(STATIC_LIBBLKID) $(LIBMAGIC)
 
 tune2fs.profiled: $(TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
-               $(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) \
-               $(DEPPROFILED_LIBSUPPORT)
+               $(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
                $(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBBLKID) \
-               $(PROFILED_LIBUUID) $(PROFILED_LIBSUPPORT) $(PROFILED_LIBE2P) \
+               $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) \
                $(LIBINTL) $(PROFILED_LIBS) $(SYSLIBS) $(PROFILED_LIBBLKID) \
                $(LIBMAGIC)
 
@@ -263,27 +261,26 @@ mklost+found: $(MKLPF_OBJS)
                $(LIBINTL) $(SYSLIBS)
 
 mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \
-               $(DEPLIBSUPPORT) $(LIBEXT2FS)
+               $(LIBEXT2FS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
-               $(LIBUUID) $(LIBSUPPORT) $(LIBEXT2FS) $(LIBE2P) $(LIBINTL) \
+               $(LIBUUID) $(LIBEXT2FS) $(LIBE2P) $(LIBINTL) \
                $(SYSLIBS) $(LIBMAGIC)
 
 mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) \
-               $(DEPSTATIC_LIBSUPPORT) $(DEPSTATIC_LIBBLKID)
+               $(DEPSTATIC_LIBBLKID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
-               $(STATIC_LIBSUPPORT) $(STATIC_LIBS) $(STATIC_LIBE2P) \
+               $(STATIC_LIBS) $(STATIC_LIBE2P) \
                $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL) $(SYSLIBS) \
                $(LIBMAGIC)
 
 mke2fs.profiled: $(MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
-       $(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID) \
-       $(PROFILED_LIBSUPPORT)
+       $(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
                $(PROFILED_MKE2FS_OBJS) $(PROFILED_LIBBLKID) \
-               $(PROFILED_LIBUUID) $(PROFILED_LIBSUPPORT) $(PROFILED_LIBE2P) \
+               $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) \
                $(LIBINTL) $(PROFILED_LIBS) $(SYSLIBS) $(LIBMAGIC)
 
 chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
@@ -372,7 +369,7 @@ e2freefrag.profiled: $(E2FREEFRAG_OBJS) $(PROFILED_DEPLIBS)
                $(PROFILED_E2FREEFRAG_OBJS) $(PROFILED_LIBS) $(SYSLIBS)
 
 e2fuzz: $(E2FUZZ_OBJS) $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) \
-               $(DEPLIBSUPPORT) $(LIBEXT2FS)
+               $(LIBEXT2FS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o e2fuzz $(E2FUZZ_OBJS) $(LIBS) \
                $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(SYSLIBS)
@@ -387,7 +384,7 @@ filefrag.profiled: $(FILEFRAG_OBJS)
                $(PROFILED_FILEFRAG_OBJS) 
 
 fuse2fs: $(FUSE2FS_OBJS) $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) \
-               $(DEPLIBSUPPORT) $(LIBEXT2FS)
+               $(LIBEXT2FS)
        $(E) "  LD $@"
        $(Q) $(CC) $(ALL_LDFLAGS) -o fuse2fs $(FUSE2FS_OBJS) $(LIBS) \
                $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
@@ -687,15 +684,15 @@ tune2fs.o: $(srcdir)/tune2fs.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
- $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/lib/e2p/e2p.h \
- $(srcdir)/util.h $(srcdir)/plausible.h $(top_srcdir)/lib/support/quotaio.h \
- $(top_srcdir)/lib/support/dqblk_v2.h \
+ $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/lib/support/plausible.h \
+ $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
- $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/util.h $(top_srcdir)/version.h \
+ $(top_srcdir)/lib/support/nls-enable.h
 mklost+found.o: $(srcdir)/mklost+found.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/version.h \
- $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/support/nls-enable.h
 mke2fs.o: $(srcdir)/mke2fs.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fsP.h \
@@ -703,13 +700,13 @@ mke2fs.o: $(srcdir)/mke2fs.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
  $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/util.h $(srcdir)/plausible.h $(top_srcdir)/lib/support/profile.h \
+ $(srcdir)/util.h $(top_srcdir)/lib/support/nls-enable.h \
+ $(top_srcdir)/lib/support/plausible.h $(top_srcdir)/lib/support/profile.h \
  $(top_builddir)/lib/support/prof_err.h $(top_srcdir)/version.h \
  $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
  $(top_srcdir)/lib/support/dqblk_v2.h \
  $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
- $(srcdir)/mke2fs.h $(srcdir)/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \
- $(srcdir)/nls-enable.h
+ $(srcdir)/mke2fs.h $(srcdir)/create_inode.h $(top_srcdir)/lib/e2p/e2p.h
 mk_hugefiles.o: $(srcdir)/mk_hugefiles.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fsP.h \
@@ -719,16 +716,18 @@ mk_hugefiles.o: $(srcdir)/mk_hugefiles.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
  $(srcdir)/util.h $(top_srcdir)/lib/support/profile.h \
- $(top_builddir)/lib/support/prof_err.h $(srcdir)/nls-enable.h \
- $(srcdir)/mke2fs.h
+ $(top_builddir)/lib/support/prof_err.h \
+ $(top_srcdir)/lib/support/nls-enable.h $(srcdir)/mke2fs.h
 chattr.o: $(srcdir)/chattr.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/support/nls-enable.h \
+ $(top_srcdir)/version.h
 lsattr.o: $(srcdir)/lsattr.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/support/nls-enable.h \
+ $(top_srcdir)/version.h
 dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
@@ -737,7 +736,8 @@ dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
  $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \
- $(top_srcdir)/version.h $(srcdir)/nls-enable.h $(srcdir)/plausible.h
+ $(top_srcdir)/lib/support/nls-enable.h $(top_srcdir)/lib/support/plausible.h \
+ $(top_srcdir)/version.h
 badblocks.o: $(srcdir)/badblocks.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
@@ -745,10 +745,10 @@ badblocks.o: $(srcdir)/badblocks.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext3_extents.h \
  $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/support/nls-enable.h
 fsck.o: $(srcdir)/fsck.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/version.h \
- $(srcdir)/nls-enable.h $(srcdir)/fsck.h
+ $(top_srcdir)/lib/support/nls-enable.h $(srcdir)/fsck.h
 util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
@@ -756,9 +756,9 @@ util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
  $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/nls-enable.h $(srcdir)/util.h
+ $(top_srcdir)/lib/support/nls-enable.h $(srcdir)/util.h
 uuidgen.o: $(srcdir)/uuidgen.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(srcdir)/nls-enable.h
+ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/support/nls-enable.h
 blkid.o: $(srcdir)/blkid.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
@@ -785,7 +785,7 @@ e2undo.o: $(srcdir)/e2undo.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/support/nls-enable.h
 e2freefrag.o: $(srcdir)/e2freefrag.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
@@ -800,15 +800,7 @@ create_inode.o: $(srcdir)/create_inode.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/ext2fs/fiemap.h $(srcdir)/create_inode.h \
- $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/nls-enable.h
-plausible.o: $(srcdir)/plausible.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(srcdir)/plausible.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/support/nls-enable.h
 fuse2fs.o: $(srcdir)/fuse2fs.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \

diff --git a/misc/badblocks.c b/misc/badblocks.c
index 2c28ee00ec151b26bd08194be6888588b56673d4..0c4019a8c2d28c26f335698ad46b7002e1702667 100644 (file)
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -59,7 +59,7 @@ extern int optind;
 #include "ext2fs/ext2_io.h"
 #include "ext2fs/ext2_fs.h"
 #include "ext2fs/ext2fs.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0

diff --git a/misc/chattr.c b/misc/chattr.c
index f130108c7ec05e6236bc4a4c545654fe6d31f7d1..e55d6937484b3d804eb0e08a7260fbb221beab80 100644 (file)
--- a/misc/chattr.c
+++ b/misc/chattr.c
@@ -51,9 +51,9 @@
 
 #include "et/com_err.h"
 #include "e2p/e2p.h"
+#include "support/nls-enable.h"
 
 #include "../version.h"
-#include "nls-enable.h"
 
 static const char * program_name = "chattr";
 

diff --git a/misc/create_inode.c b/misc/create_inode.c
index 13e96d03862e422681c009390c0471a3d9d6dbc7..a3b477f1522795c62aeeb9dcdff222cc2ed62f3b 100644 (file)
--- a/misc/create_inode.c
+++ b/misc/create_inode.c
@@ -27,7 +27,7 @@
 #include <ext2fs/fiemap.h>
 
 #include "create_inode.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #if __STDC_VERSION__ < 199901L
 # if __GNUC__ >= 2

diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index 89a1d814c11521b99b592e2f83bd881d60d42465..9e1e5d05bf34fa26ff279e30b504ea2bc3c8319a 100644 (file)
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -40,9 +40,9 @@ extern int optind;
 #include "ext2fs/kernel-jbd.h"
 #include <uuid/uuid.h>
 
+#include "support/nls-enable.h"
+#include "support/plausible.h"
 #include "../version.h"
-#include "nls-enable.h"
-#include "plausible.h"
 
 #define in_use(m, x)   (ext2fs_test_bit ((x), (m)))
 

diff --git a/misc/e2image.c b/misc/e2image.c
index e876ae8a7e38293f7141d855758fb93be546ddab..87ea9e7554347a7d4461313804973d53b2c69194 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -45,9 +45,9 @@ extern int optind;
 #include "ext2fs/e2image.h"
 #include "ext2fs/qcow2.h"
 
+#include "support/nls-enable.h"
+#include "support/plausible.h"
 #include "../version.h"
-#include "nls-enable.h"
-#include "plausible.h"
 
 #define QCOW_OFLAG_COPIED     (1LL << 63)
 #define NO_BLK ((blk64_t) -1)

diff --git a/misc/e2initrd_helper.c b/misc/e2initrd_helper.c
index 765716d63973917a4201ba951049c19bfef0b84a..436aab8c4e016fdaeb006bae9c00dc6a1f678b08 100644 (file)
--- a/misc/e2initrd_helper.c
+++ b/misc/e2initrd_helper.c
@@ -35,9 +35,9 @@ extern char *optarg;
 #include "ext2fs/ext2_fs.h"
 #include "ext2fs/ext2fs.h"
 #include "blkid/blkid.h"
+#include "support/nls-enable.h"
 
 #include "../version.h"
-#include "nls-enable.h"
 
 static const char * program_name = "e2initrd_helper";
 static char * device_name;

diff --git a/misc/e2label.c b/misc/e2label.c
index bc87a428266a1ef3a14838a837372808098eca57..526a62c359ab0bba87c78da8c138efad0dcbc82b 100644 (file)
--- a/misc/e2label.c
+++ b/misc/e2label.c
@@ -33,7 +33,7 @@ extern int optind;
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #define EXT2_SUPER_MAGIC 0xEF53
 

diff --git a/misc/e2undo.c b/misc/e2undo.c
index 6123c480fc6549592089024149f8a047475733f5..7c7326a5156639b1805262d881148ac50d45c17b 100644 (file)
--- a/misc/e2undo.c
+++ b/misc/e2undo.c
@@ -22,7 +22,7 @@
 #endif
 #include <unistd.h>
 #include "ext2fs/ext2fs.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #undef DEBUG
 

diff --git a/misc/findsuper.c b/misc/findsuper.c
index eb9130baa7cb70cedc3f591da2a62853da60a9e5..ce649de3731585c132f43f340bc4875d988f5aad 100644 (file)
--- a/misc/findsuper.c
+++ b/misc/findsuper.c
@@ -94,7 +94,7 @@
 
 #include "ext2fs/ext2_fs.h"
 #include "ext2fs/ext2fs.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #undef DEBUG
 

diff --git a/misc/fsck.c b/misc/fsck.c
index 826aaebb0b74f31e236c78c519ae8ea0e5756bdb..147ea94648f116d2c2d21fc41530b6e419c8f4f7 100644 (file)
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -59,7 +59,7 @@
 #endif
 
 #include "../version.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 #include "fsck.h"
 #include "blkid/blkid.h"
 

diff --git a/misc/lsattr.c b/misc/lsattr.c
index e5e59690f493c7f2c5b7b119ae77d1f1ec865248..f6b43844eca626263d1ce6be949252d378f5e6f5 100644 (file)
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -43,8 +43,8 @@ extern char *optarg;
 #include "et/com_err.h"
 #include "e2p/e2p.h"
 
+#include "support/nls-enable.h"
 #include "../version.h"
-#include "nls-enable.h"
 
 #ifdef __GNUC__
 #define EXT2FS_ATTR(x) __attribute__(x)

diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
index d959de3d5ed7c5e48d46ace93bb569c1dcf5e568..888b1842fe22dfa16e2664790067f27b086b8f05 100644 (file)
--- a/misc/mk_hugefiles.c
+++ b/misc/mk_hugefiles.c
@@ -47,7 +47,7 @@ extern int optind;
 #include "util.h"
 #include "support/profile.h"
 #include "support/prof_err.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 #include "mke2fs.h"
 
 static int uid;

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index b08fe3125e77da3fc5364eab398c2efc8e3d20d6..68fbb66523b2d1dd11c62520939e76263f3c6cfc 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -52,14 +52,14 @@ extern int optind;
 #include "ext2fs/ext2fsP.h"
 #include "uuid/uuid.h"
 #include "util.h"
-#include "plausible.h"
+#include "support/nls-enable.h"
+#include "support/plausible.h"
 #include "support/profile.h"
 #include "support/prof_err.h"
 #include "../version.h"
 #include "support/quotaio.h"
 #include "mke2fs.h"
 #include "create_inode.h"
-#include "nls-enable.h"
 
 #define STRIDE_LENGTH 8
 

diff --git a/misc/mklost+found.c b/misc/mklost+found.c
index 134e8241e9bb09870924cce41757d6bd47a617b9..c0613578afcd0a01e781fc7e45216b5f048834c0 100644 (file)
--- a/misc/mklost+found.c
+++ b/misc/mklost+found.c
@@ -25,7 +25,7 @@
 
 #include "ext2fs/ext2_fs.h"
 #include "../version.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #define LPF "lost+found"
 

diff --git a/misc/partinfo.c b/misc/partinfo.c
index c461e801d7c75b8cee8dc2d6d1cea4a6c6e25441..2b69c8965fb77af9c41a0d2be12bc73e5d6c8603 100644 (file)
--- a/misc/partinfo.c
+++ b/misc/partinfo.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #if defined(__linux__) && defined(_IO) && !defined(BLKGETSIZE)
 #define BLKGETSIZE _IO(0x12,96)        /* return device size */

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 73f4bb6dda41e33a798ab31983144a2f80a89580..4805216355e54460ba096ac63a0feee9dda11123 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -56,15 +56,15 @@ extern int optind;
 #include "ext2fs/ext2fs.h"
 #include "ext2fs/kernel-jbd.h"
 #include "et/com_err.h"
+#include "support/plausible.h"
+#include "support/quotaio.h"
 #include "uuid/uuid.h"
 #include "e2p/e2p.h"
 #include "util.h"
-#include "plausible.h"
 #include "blkid/blkid.h"
-#include "support/quotaio.h"
 
 #include "../version.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #define QOPT_ENABLE    (1)
 #define QOPT_DISABLE   (-1)

diff --git a/misc/util.c b/misc/util.c
index f906339b45bb464ae6458b4aa46888d27a59ba15..86197460bf6c6a0f752f8983f8c8f9d7dc07253b 100644 (file)
--- a/misc/util.c
+++ b/misc/util.c
@@ -37,7 +37,7 @@
 #include "e2p/e2p.h"
 #include "ext2fs/ext2_fs.h"
 #include "ext2fs/ext2fs.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 #include "blkid/blkid.h"
 #include "util.h"
 

diff --git a/misc/uuidd.c b/misc/uuidd.c
index 02ca6be849a2abad8ad5aa03feaa18439c92bb93..4db3fa94883d5affa0b7c208ba0b50add7a792cd 100644 (file)
--- a/misc/uuidd.c
+++ b/misc/uuidd.c
@@ -35,7 +35,7 @@ extern int optind;
 #endif
 #include "uuid/uuid.h"
 #include "uuid/uuidd.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 #include "ext2fs/ext2fs.h"
 
 #ifdef __GNUC__

diff --git a/misc/uuidgen.c b/misc/uuidgen.c
index f181d193a1ac39e16e2bcff150ced23dfc931208..1233f3df1421921e92c083d8a84c5217fd20df03 100644 (file)
--- a/misc/uuidgen.c
+++ b/misc/uuidgen.c
@@ -22,7 +22,7 @@ extern char *optarg;
 extern int optind;
 #endif
 #include "uuid/uuid.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #define DO_TYPE_TIME   1
 #define DO_TYPE_RANDOM 2

diff --git a/util/gen-android-files b/util/gen-android-files
index 731788e7783317deab57d1fd87619d7848c1d0c0..0c1888d5b2c53532ad3e840eeb0ce9bf6aa0c2e4 100755 (executable)
--- a/util/gen-android-files
+++ b/util/gen-android-files
@@ -3,13 +3,12 @@
 ANDROID_GENERATED_FILES="lib/ext2fs/ext2_err.c lib/ext2fs/ext2_err.h \
        lib/ss/ss_err.c lib/ss/ss_err.h lib/support/prof_err.c \
        lib/support/prof_err.h \
-       e2fsck/nls-enable.h e2fsck/plausible.c e2fsck/plausible.h \
        lib/blkid/blkid_types.h lib/uuid/uuid_types.h \
        lib/ext2fs/ext2_types.h lib/config.h lib/blkid/blkid.h \
        lib/uuid/uuid.h lib/ext2fs/crc32c_table.h misc/default_profile.c \
        lib/ss/std_rqs.c debugfs/debug_cmds.c debugfs/ro_debug_cmds.c \
        debugfs/extent_cmds.c debugfs/e2freefrag.c debugfs/create_inode.c \
-       debugfs/plausible.c debugfs/recovery.c debugfs/revoke.c \
+       debugfs/recovery.c debugfs/revoke.c \
        MODULE_LICENSE_GPL"
 
 SS_DIR=$(pwd)/lib/ss
@@ -42,9 +41,7 @@ cp util/android_types.h lib/ext2fs/ext2_types.h
 cp util/android_types.h lib/blkid/blkid_types.h
 cp util/android_types.h lib/uuid/uuid_types.h
 cp util/android_config.h lib/config.h
-cp misc/plausible.? e2fsck/
-cp misc/nls-enable.h e2fsck/
-cp misc/e2freefrag.c misc/create_inode.c misc/plausible.c debugfs/
+cp misc/e2freefrag.c misc/create_inode.c debugfs/
 cp e2fsck/recovery.c e2fsck/revoke.c debugfs/
 
 gcc -o gen_crc32ctable lib/ext2fs/gen_crc32ctable.c