Fix usage of g_file_test().

According to the GLib documentation, g_file_test() returns TRUE if any
of the tests in the bitfield test are TRUE. For example,
(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR) will return TRUE if the file
exists; the check whether it's a directory doesn't matter since the
existence test is TRUE. With the current set of available tests, there's
no point passing in more than one test at a time.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

Author: aborodin

lib/mcconfig/paths.c

@@ -107,8 +107,9 @@ mc_config_mkdir (const char *directory_name, GError **mcerror)
 {
     mc_return_if_error (mcerror);
 
-    if ((!g_file_test (directory_name, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
-        && (g_mkdir_with_parents (directory_name, 0700) != 0))
+    if (!(g_file_test (directory_name, G_FILE_TEST_EXISTS)
+          && g_file_test (directory_name, G_FILE_TEST_IS_DIR))
+        && g_mkdir_with_parents (directory_name, 0700) != 0)
         mc_propagate_error (mcerror, 0, _ ("Cannot create %s directory"), directory_name);
 }
 

tests/lib/vfs/tempdir.c

@@ -74,7 +74,8 @@ START_TEST (test_mc_tmpdir)
     env_tmpdir = g_getenv ("MC_TMPDIR");
 
     // then
-    ck_assert_msg (g_file_test (tmpdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR),
+    ck_assert_msg (g_file_test (tmpdir, G_FILE_TEST_EXISTS)
+                       && g_file_test (tmpdir, G_FILE_TEST_IS_DIR),
                    "\nNo such directory: %s\n", tmpdir);
     mctest_assert_str_eq (env_tmpdir, tmpdir);
 }
@@ -97,13 +98,15 @@ START_TEST (test_mc_mkstemps)
     // then
     close (fd);
     ck_assert_int_ne (fd, -1);
-    ck_assert_msg (
-        g_file_test (vfs_path_as_str (pname_vpath), G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR),
-        "\nNo such file: %s\n", vfs_path_as_str (pname_vpath));
-    unlink (vfs_path_as_str (pname_vpath));
-    ck_assert_msg (strncmp (vfs_path_as_str (pname_vpath), begin_pname, strlen (begin_pname)) == 0,
-                   "\nstart of %s should be equal to %s\n", vfs_path_as_str (pname_vpath),
-                   begin_pname);
+
+    const char *pname = vfs_path_as_str (pname_vpath);
+
+    ck_assert_msg (g_file_test (pname, G_FILE_TEST_EXISTS)
+                       && g_file_test (pname, G_FILE_TEST_IS_REGULAR),
+                   "\nNo such file: %s\n", pname);
+    unlink (pname);
+    ck_assert_msg (strncmp (pname, begin_pname, strlen (begin_pname)) == 0,
+                   "\nstart of %s should be equal to %s\n", pname, begin_pname);
     vfs_path_free (pname_vpath, TRUE);
 }
 END_TEST