Fix bug in the secure getenv function so that the ss library will corrently

honor the PAGER and SS_READLINE_PATH environtment variables, and the
test_io io_manager in the ext2fs library honors the TEST_IO_LOGFILE,
TEST_IO_FLAGS, TEST_IO_BLOCK, and TEST_IO_READ_ABORT environment variables.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 7b16770..1b17575 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-08  Theodore Ts'o  <tytso@mit.edu>
+
+       * test_io.c (safe_getenv): Fix bug so it would fetch the right
+               environment variable.
+
 2005-04-09  Theodore Ts'o  <tytso@mit.edu>
 
        * inode.c (ext2fs_write_new_inode), 

diff --git a/lib/ext2fs/test_io.c b/lib/ext2fs/test_io.c
index 3720f0a..2d42617 100644 (file)
--- a/lib/ext2fs/test_io.c
+++ b/lib/ext2fs/test_io.c
@@ -155,9 +155,9 @@ static char *safe_getenv(const char *arg)
 #endif
 
 #ifdef HAVE___SECURE_GETENV
-       return __secure_getenv("BLKID_FILE");
+       return __secure_getenv(arg);
 #else
-       return getenv("BLKID_FILE");
+       return getenv(arg);
 #endif
 }
 

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 40be15f..95ad883 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-08  Theodore Ts'o  <tytso@mit.edu>
+
+       * pager.c (ss_safe_getenv): Fix bug so it would fetch the right
+               environment variable.
+
 2005-03-31  Theodore Ts'o  <tytso@mit.edu>
 
        * get_readline.c (ss_get_readline), pager.c (ss_page_stdin): If

diff --git a/lib/ss/pager.c b/lib/ss/pager.c
index 9aaa72a..e532778 100644 (file)
--- a/lib/ss/pager.c
+++ b/lib/ss/pager.c
@@ -56,9 +56,9 @@ char *ss_safe_getenv(const char *arg)
 #endif
 
 #ifdef HAVE___SECURE_GETENV
-       return __secure_getenv("BLKID_FILE");
+       return __secure_getenv(arg);
 #else
-       return getenv("BLKID_FILE");
+       return getenv(arg);
 #endif
 }