1 files changed, 9 insertions, 2 deletions

diff --git a/src/main/test_bzip2.c b/src/main/test_bzip2.c
index 598e913..f180e26 100644
--- a/src/main/test_bzip2.c
+++ b/src/main/test_bzip2.c
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
   /* change environment to find 'extractor_test' plugin which is
      not installed but should be in the current directory (or .libs)
      on 'make check' */
-  if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+  if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
     fprintf (stderr,
              "Failed to update my environment, plugin loading may fail: %s\n",
              strerror (errno));
@@ -146,7 +146,14 @@ main (int argc, char *argv[])
     fprintf (stderr, "failed to load test plugin\n");
     return 1;
   }
-  EXTRACTOR_extract (pl, "test_file.dat.bz2", NULL, 0, &process_replies,
+  if (0 != access ("test_file.dat.bz2",
+                   R_OK))
+    return 77;
+  EXTRACTOR_extract (pl,
+                     "test_file.dat.bz2",
+                     NULL,
+                     0,
+                     &process_replies,
                      "main-cls");
   EXTRACTOR_plugin_remove_all (pl);
   return ret;