Imported Upstream version 2.8.4

[platform/upstream/man-db.git] / src / ult_src.c

diff --git a/src/ult_src.c b/src/ult_src.c
index 2b4b0e6..15c2e52 100644 (file)
--- a/src/ult_src.c
+++ b/src/ult_src.c
@@ -191,14 +191,14 @@ static char *find_include (const char *name, const char *path,
        /* If the original path from above doesn't exist, try to create new
         * path as if the "include" was relative to the current man page.
         */
-       if (access (ret, F_OK) == 0)
+       if (CAN_ACCESS (ret, F_OK))
                return ret;
 
        dirname = dir_name (name);
        temp_file = xasprintf ("%s/%s", dirname, include);
        free (dirname);
 
-       if (access (temp_file, F_OK) == 0) {
+       if (CAN_ACCESS (temp_file, F_OK)) {
                /* Just plain include. */
                free (ret);
                ret = canonicalize_file_name (temp_file);
@@ -209,7 +209,7 @@ static char *find_include (const char *name, const char *path,
                int i;
 
                free (temp_file_asterisk);
-               if (access (candidate_files[0], F_OK) == 0) {
+               if (CAN_ACCESS (candidate_files[0], F_OK)) {
                        free (ret);
                        ret = canonicalize_file_name (candidate_files[0]);
                }
@@ -273,8 +273,7 @@ const char *ult_src (const char *name, const char *path,
 
        if (recurse == 0) {
                struct stat new_buf;
-               if (base)
-                       free (base);
+               free (base);
                base = xstrdup (name);
 
                debug ("\nult_src: File %s in mantree %s\n", name, path);