diff -dru e2fsprogs-1.32/Makefile.in e2fsprogs-1.32.fjo/Makefile.in --- e2fsprogs-1.32/Makefile.in Sun Aug 18 09:40:09 2002 +++ e2fsprogs-1.32.fjo/Makefile.in Tue Dec 17 22:13:20 2002 @@ -12,7 +12,7 @@ @LINUX_CMT@EVMS_DIR= lib/evms LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid # lib/finddev -PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs $(EVMS_DIR) +PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests SUBS= lib/ext2fs/ext2_types.h diff -dru e2fsprogs-1.32/e2fsck/Makefile.in e2fsprogs-1.32.fjo/e2fsck/Makefile.in --- e2fsprogs-1.32/e2fsck/Makefile.in Thu Oct 31 09:49:21 2002 +++ e2fsprogs-1.32.fjo/e2fsck/Makefile.in Tue Dec 17 22:13:09 2002 @@ -145,18 +145,16 @@ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ done - $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext2 - $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext3 + $(LN_S) -f e2fsck $(DESTDIR)$(root_sbindir)/fsck.ext2 + $(LN_S) -f e2fsck $(DESTDIR)$(root_sbindir)/fsck.ext3 for i in $(MANPAGES); do \ for j in $(COMPRESS_EXT); do \ $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \ done; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \ done - $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8 - $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8 + $(LN_S) -f e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8 + $(LN_S) -f e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8 uninstall: for i in $(PROGS); do \ diff -dru e2fsprogs-1.32/e2fsck/pass2.c e2fsprogs-1.32.fjo/e2fsck/pass2.c --- e2fsprogs-1.32/e2fsck/pass2.c Sat Nov 9 19:48:10 2002 +++ e2fsprogs-1.32.fjo/e2fsck/pass2.c Tue Dec 17 22:13:09 2002 @@ -619,6 +619,11 @@ } #endif /* ENABLE_HTREE */ +size_t strnlen (const char *s, size_t maxlen) +{ + return (strlen(s)>maxlen)?(maxlen):(strlen(s)); +} + /* * Given a busted directory, try to salvage it somehow. * diff -dru e2fsprogs-1.32/misc/Makefile.in e2fsprogs-1.32.fjo/misc/Makefile.in --- e2fsprogs-1.32/misc/Makefile.in Thu Oct 31 09:49:21 2002 +++ e2fsprogs-1.32.fjo/misc/Makefile.in Tue Dec 17 22:13:09 2002 @@ -154,14 +154,10 @@ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ $(STRIP) $(DESTDIR)$(sbindir)/$$i; \ done - $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext2 - $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext3 - $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ - $(DESTDIR)$(root_sbindir)/e2label - $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ - $(DESTDIR)$(root_sbindir)/findfs + $(LN_S) -f mke2fs $(DESTDIR)$(root_sbindir)/mkfs.ext2 + $(LN_S) -f mke2fs $(DESTDIR)$(root_sbindir)/mkfs.ext3 + $(LN_S) -f tune2fs $(DESTDIR)$(root_sbindir)/e2label + $(LN_S) -f tune2fs $(DESTDIR)$(root_sbindir)/findfs for i in $(UPROGS); do \ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ $(STRIP) $(DESTDIR)$(bindir)/$$i; \ @@ -174,8 +170,8 @@ done $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz - $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8 - $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8 + $(LN_S) -f mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8 + $(LN_S) -f mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8 for i in $(UMANPAGES); do \ $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \ diff -dru e2fsprogs-1.32/misc/tune2fs.c e2fsprogs-1.32.fjo/misc/tune2fs.c --- e2fsprogs-1.32/misc/tune2fs.c Tue Oct 15 23:44:46 2002 +++ e2fsprogs-1.32.fjo/misc/tune2fs.c Tue Dec 17 22:13:09 2002 @@ -444,7 +444,6 @@ return (time(0)); } memset(&ts, 0, sizeof(ts)); - strptime(optarg, "%Y%m%d%H%M%S", &ts); if (ts.tm_mday == 0) { com_err(program_name, 0, _("Couldn't parse date/time specifier: %s"),