ChangeLog, unix.c:

  unix.c (main): Reset the context before calling ext2fs_close(), to
  avoid referencing already freed memory.
ChangeLog, llseek.c:
  llseek.c (ext2fs_llseek): Change ext2fs_llseek() in the non-Linux case
  	to use EINVAL by default, unless it isn't defined, in which case we
  	use EXT2_ET_INVALID_ARGUMENT instead.
ChangeLog, mk_cmds.sh.in:
  mk_cmds.sh.in: Fixed portability bug in shell script; we were
  	depending on a bash'ism.
ChangeLog, uuid.c:
  uuid.c: Use asm/types.h instead of linux/types.h, to be consistent
  	with other locations where we've had to do this to work around glibc.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 45bb6d51e441206fa85bada28de9c82992845e21..481f3728dca900782f63d8407171ca2717174203 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  4 02:28:59 1999  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * unix.c (main): Reset the context before calling ext2fs_close(),
+               to avoid referencing already freed memory.
+
 1998-12-15  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.13

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index e17d5a3b5513a6bad755a781e78033a7f7a40680..279849f3f29aa5b68efd25fd9a3d2e380adc5490 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -646,7 +646,6 @@ restart:
 
        run_result = e2fsck_run(ctx);
        if (run_result == E2F_FLAG_RESTART) {
-               ext2fs_close(fs);
                printf("Restarting e2fsck from the beginning...\n");
                retval = e2fsck_reset_context(ctx);
                if (retval) {
@@ -654,6 +653,7 @@ restart:
                                "while resetting context");
                        exit(1);
                }
+               ext2fs_close(fs);
                goto restart;
        }
        if (run_result & E2F_FLAG_SIGNAL_MASK)

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index d80f412e9cd5b68d34dbd16645e477367c31b2a5..fcaf906d0c582d3852bfe3c77876ec71b1cbeae7 100644 (file)
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan  4 02:34:53 1999  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * uuid.c: Use asm/types.h instead of linux/types.h, to be
+               consistent with other locations where we've had to do this
+               to work around glibc.
+
 1998-12-15  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.13

diff --git a/lib/e2p/uuid.c b/lib/e2p/uuid.c
index 39082a6817ec680d6b2d9ecea048a057d05c3d4e..1dbfc5904c8ad010bacbe6747210e6f4a9e2e0f8 100644 (file)
--- a/lib/e2p/uuid.c
+++ b/lib/e2p/uuid.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <linux/types.h>
+#include <asm/types.h>
 
 #include "e2p.h"
 

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 2b08e7cb5df2b36780a2984351a532af2407ce6a..04fdb3690db0ebcf37962223745caf1a57279b45 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan  4 02:32:09 1999  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * llseek.c (ext2fs_llseek): Change ext2fs_llseek() in the
+               non-Linux case to use EINVAL by default, unless it isn't
+               defined, in which case we use EXT2_ET_INVALID_ARGUMENT
+               instead.
+
 1998-12-15  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.13

diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
index 5fd35596f4a6bf5fda376de9f16a5c6a84f66b23..d75f42dbab3dad536edd1785887efc90aeeee98d 100644 (file)
--- a/lib/ext2fs/llseek.c
+++ b/lib/ext2fs/llseek.c
@@ -109,11 +109,15 @@ ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
 
 #else /* !linux */
 
+#ifndef EINVAL
+#define EINVAL EXT2_ET_INVALID_ARGUMENT
+#endif
+
 ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
 {
        if ((sizeof(off_t) < sizeof(ext2_loff_t)) &&
            (offset >= ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))) {
-               errno = EXT2_ET_INVALID_ARGUMENT;
+               errno = EINVAL;
                return -1;
        }
        return lseek (fd, (off_t) offset, origin);

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index c763b721f82f956cd4251f1b57e9ba1e8f9d1c6c..225a84c288d47a130b2e126b6cc2c5bfb0a1ddf7 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  4 00:05:14 1999  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * mk_cmds.sh.in (TMP): Fixed portability bug in shell script; we
+               were depending on a bash'ism.
+
 1998-12-15  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.13

diff --git a/lib/ss/mk_cmds.sh.in b/lib/ss/mk_cmds.sh.in
index 9ffaa9dbb1fa93943de51ac29a0135d5d7364454..9ac9ce99c5b728e89e4dacb8d963dcb665ddbf0c 100644 (file)
--- a/lib/ss/mk_cmds.sh.in
+++ b/lib/ss/mk_cmds.sh.in
@@ -26,7 +26,7 @@ ROOT=`echo $1 | sed -e s/.ct$//`
 BASE=`basename $ROOT`
 TMP=ct$$.c
 
-if ! test -f $FILE ; then
+if test ! -f $FILE ; then
     echo "$FILE: File not found"
     exit 1;
 fi