vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

Many files: 

Rename io.h to be ext2_io.h (avoid namespace collisions)
ChangeLog, resize2fs.h:
  Add #ifdef's for HAVE_SYS_TYPES_H and HAVE_SYS_TIME_H.
bitmap-optimize
Theodore Ts'o 1997-10-20 00:44:26 +00:00
parent b69096a348
commit d40259fd55
15 changed files with 96 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debugfs/Makefile.in
View File

@ -77,32 +77,32 @@ debug_cmds.o: debug_cmds.c $(top_srcdir)/lib/ss/ss.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/io.h \
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(top_srcdir)/lib/uuid/uuid.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
ls.o: $(srcdir)/ls.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/ext2_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/ext2_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/ext2_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/ext2_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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h

24
e2fsck/Makefile.in
View File

@ -152,51 +152,51 @@ distclean: clean
e2fsck.o: $(srcdir)/e2fsck.c $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/uuid/uuid.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.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_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(srcdir)/problem.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.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/ext2_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/ext2_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/ext2_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/ext2_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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
problem.o: $(srcdir)/problem.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/problem.h

2
lib/ext2fs/ChangeLog
View File

@ -1,5 +1,7 @@
Sun Oct 19 18:56:22 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
* Rename io.h to be ext2_io.h (avoid namespace collisions)
* Add #ifdef's for HAVE_SYS_STAT_H and HAVE_SYS_TYPES_H
Fri Oct 3 13:35:59 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>

94
lib/ext2fs/Makefile.in
View File

@ -103,7 +103,7 @@ SRCS= ext2_err.c \
$(srcdir)/valid_blk.c \
$(srcdir)/version.c
HFILES= bitops.h ext2fs.h io.h
HFILES= bitops.h ext2fs.h ext2_io.h
LIBRARY= libext2fs
LIBDIR= ext2fs
@ -202,195 +202,195 @@ distclean:: clean
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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
alloc_tables.o: $(srcdir)/alloc_tables.c \
$(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
badblocks.o: $(srcdir)/badblocks.c \
$(srcdir)/ext2fsP.h \
$(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
bb_compat.o: $(srcdir)/bb_compat.c \
$(srcdir)/ext2fsP.h \
$(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_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)/ext2_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)/ext2_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)/ext2_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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
brel_ma.o: $(srcdir)/brel_ma.c \
$(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h $(srcdir)/brel.h
bmove.o: $(srcdir)/bmove.c \
$(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
closefs.o: $(srcdir)/closefs.c \
$(srcdir)/ext2fsP.h \
$(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
dblist.o: $(srcdir)/dblist.c \
$(srcdir)/ext2fsP.h $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
dblist_dir.o: $(srcdir)/dblist_dir.c \
$(srcdir)/ext2fsP.h $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
dir_iterate.o: $(srcdir)/dir_iterate.c \
$(srcdir)/ext2fsP.h $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
dupfs.o: $(srcdir)/dupfs.c \
$(srcdir)/ext2fsP.h \
$(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
freefs.o: $(srcdir)/freefs.c \
$(srcdir)/ext2fsP.h \
$(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_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)/ext2_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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
icount.o: $(srcdir)/icount.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/ext2fs.h \
$(srcdir)/io.h \
$(srcdir)/ext2_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)/ext2_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)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
inode.o: $(srcdir)/inode.c \
$(srcdir)/ext2fsP.h $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
irel_ma.o: $(srcdir)/irel_ma.c \
$(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h $(srcdir)/irel.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)/ext2_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)/ext2_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
llseek.o: $(srcdir)/llseek.c $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h
lookup.o: $(srcdir)/lookup.c $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.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
$(srcdir)/ext2_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
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
native.o: $(srcdir)/native.c $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_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
$(srcdir)/ext2_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
$(srcdir)/ext2_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_srcdir)/lib/et/com_err.h $(srcdir)/ext2_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
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
rs_bitmap.o: $(srcdir)/rs_bitmap.c $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
$(srcdir)/ext2_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
$(srcdir)/ext2_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_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
test_io.o: $(srcdir)/test_io.c $(top_srcdir)/lib/et/com_err.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/io.h
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_io.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
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_io.h
unlink.o: $(srcdir)/unlink.c $(srcdir)/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
valid_blk.o: $(srcdir)/valid_blk.c \
$(srcdir)/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(srcdir)/bitops.h
version.o: $(srcdir)/version.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/ext2fs.h $(srcdir)/io.h \
$(srcdir)/ext2fs.h $(srcdir)/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h \
$(srcdir)/../../version.h

0
lib/ext2fs/io.h → lib/ext2fs/ext2_io.h
View File

7
lib/ext2fs/ext2fs.h
View File

@ -32,14 +32,17 @@
*/
#define EXT2_LIB_CURRENT_REV 0
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <linux/types.h>
typedef __u32 blk_t;
typedef unsigned int dgrp_t;
#include "et/com_err.h"
#include "ext2fs/io.h"
#include "ext2fs/ext2_io.h"
#include "ext2fs/ext2_err.h"
typedef struct struct_ext2_filsys *ext2_filsys;
@ -159,7 +162,7 @@ struct struct_ext2_filsys {
};
#include "ext2fs/bitops.h"
/*
* Return flags for the block iterator functions
*/

2
lib/ext2fs/llseek.c
View File

@ -22,7 +22,7 @@
#include <io.h>
#endif
#include "et/com_err.h"
#include "ext2fs/io.h"
#include "ext2fs/ext2_io.h"
#ifdef __linux__

2
lib/ext2fs/test_io.c
View File

@ -29,7 +29,7 @@
#include "et/com_err.h"
#include "ext2fs/ext2_err.h"
#include "io.h"
#include "ext2fs/ext2_io.h"
/*
* For checking structure magic numbers...

2
lib/ext2fs/unix_io.c
View File

@ -31,7 +31,7 @@
#include "et/com_err.h"
#include "ext2fs/ext2_err.h"
#include "io.h"
#include "ext2fs/ext2_io.h"
/*
* For checking structure magic numbers...

8
misc/Makefile.in
View File

@ -163,23 +163,23 @@ distclean: clean
# 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_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(top_srcdir)/lib/uuid/uuid.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/uuid/uuid.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_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_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_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
$(top_srcdir)/lib/ext2fs/ext2_io.h
fsck.o: $(srcdir)/fsck.c $(srcdir)/../version.h $(srcdir)/fsck.h

2
misc/badblocks.c
View File

@ -42,7 +42,7 @@
#endif
#include "et/com_err.h"
#include "ext2fs/io.h"
#include "ext2fs/ext2_io.h"
const char * program_name = "badblocks";

4
resize/ChangeLog
View File

@ -1,3 +1,7 @@
Sun Oct 19 20:40:42 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
* resize2fs.h: Add #ifdef's for HAVE_SYS_TYPES_H and HAVE_SYS_TIME_H.
Wed Sep 3 17:31:49 1997 Theodore Y. Ts'o <tytso@edt.mit.edu>
* resize2fs.h: Add #include for errno.h

12
resize/Makefile.in
View File

@ -118,25 +118,25 @@ source_tar_file: $(top_srcdir)/.exclude-file
#
extent.o: $(srcdir)/extent.c $(srcdir)/resize2fs.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
ext2_block_move.o: $(srcdir)/ext2_block_move.c $(srcdir)/resize2fs.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
ext2_inode_move.o: $(srcdir)/ext2_inode_move.c $(srcdir)/resize2fs.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
main.o: $(srcdir)/main.c $(srcdir)/resize2fs.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h
sim_progress.o: $(srcdir)/sim_progress.c $(srcdir)/resize2fs.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/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h

4
resize/resize2fs.h
View File

@ -12,8 +12,12 @@
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#if HAVE_ERRNO_H
#include <errno.h>
#endif

2
tests/progs/Makefile.in
View File

@ -61,7 +61,7 @@ distclean: clean
test_rel.o: $(srcdir)/test_rel.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 $(top_srcdir)/lib/ext2fs/ext2fs.h \
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/ext2fs/irel.h \
$(top_srcdir)/lib/ext2fs/brel.h $(srcdir)/test_rel.h