wrapper.c: add and use warn_on_fopen_errors()

In many places, Git warns about an inaccessible file after a fopen()
failed. To discern these cases from other cases where we want to warn
about inaccessible files, introduce a new helper specifically to test
whether fopen() failed because the current user lacks the permission to
open file in question.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.c b/config.c
index b4a3205da32faf43db1ab990f08c0bb941af87d0..2894fbb6d0d310e6f51eaf1ba1858f2e7547f3b1 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2640,6 +2640,9 @@ int git_config_rename_section_in_file(const char *config_filename,
        }
 
        if (!(config_file = fopen(config_filename, "rb"))) {
        }
 
        if (!(config_file = fopen(config_filename, "rb"))) {

+               ret = warn_on_fopen_errors(config_filename);
+               if (ret)
+                       goto out;

                /* no config file means nothing to rename, no error */
                goto commit_and_out;
        }
                /* no config file means nothing to rename, no error */
                goto commit_and_out;
        }

diff --git a/dir.c b/dir.c
index f451bfa48c0a0e7905d4c2adf4e3e05a8d272a8a..be616e884e8dbbebe95d361267b12212bce2fd9d 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -745,9 +745,9 @@ static int add_excludes(const char *fname, const char *base, int baselen,
 
        fd = open(fname, O_RDONLY);
        if (fd < 0 || fstat(fd, &st) < 0) {
 
        fd = open(fname, O_RDONLY);
        if (fd < 0 || fstat(fd, &st) < 0) {

-               if (errno != ENOENT)
-                       warn_on_inaccessible(fname);
-               if (0 <= fd)
+               if (fd < 0)
+                       warn_on_fopen_errors(fname);
+               else

                        close(fd);
                if (!check_index ||
                    (buf = read_skip_worktree_file_from_index(fname, &size, sha1_stat)) == NULL)
                        close(fd);
                if (!check_index ||
                    (buf = read_skip_worktree_file_from_index(fname, &size, sha1_stat)) == NULL)

diff --git a/git-compat-util.h b/git-compat-util.h
index 6be55cf8b39b9322339f92479a1e8b3396a3813c..eb5c18c7fd5650acbfee5fb25a91a770fb385936 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1101,6 +1101,8 @@ int access_or_die(const char *path, int mode, unsigned flag);
 
 /* Warn on an inaccessible file that ought to be accessible */
 void warn_on_inaccessible(const char *path);
 
 /* Warn on an inaccessible file that ought to be accessible */
 void warn_on_inaccessible(const char *path);

+/* Warn on an inaccessible file if errno indicates this is an error */
+int warn_on_fopen_errors(const char *path);

 
 #ifdef GMTIME_UNRELIABLE_ERRORS
 struct tm *git_gmtime(const time_t *);
 
 #ifdef GMTIME_UNRELIABLE_ERRORS
 struct tm *git_gmtime(const time_t *);

diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 72d5f1f931bcb4bb99596759e1eeac72da3b07c7..df92fdcd409069a6df496960abb66ae66540b9cc 100755 (executable)
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -195,7 +195,8 @@ test_expect_success POSIXPERM,SANITY 'proper error on non-accessible files' '
        chmod -r .git/config &&
        test_when_finished "chmod +r .git/config" &&
        echo "Error (-1) reading configuration file .git/config." >expect &&
        chmod -r .git/config &&
        test_when_finished "chmod +r .git/config" &&
        echo "Error (-1) reading configuration file .git/config." >expect &&

-       test_expect_code 2 test-config configset_get_value foo.bar .git/config 2>actual &&
+       test_expect_code 2 test-config configset_get_value foo.bar .git/config 2>output &&
+       grep "^Error" output >actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 

diff --git a/wrapper.c b/wrapper.c
index d83741770949f457b364896b6ff8632c0a700d69..20c25e7e65ed7927e22834fc95b93b89bff4e0d8 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -418,6 +418,16 @@ FILE *fopen_for_writing(const char *path)
        return ret;
 }
 
        return ret;
 }
 

+int warn_on_fopen_errors(const char *path)
+{
+       if (errno != ENOENT && errno != ENOTDIR) {
+               warn_on_inaccessible(path);
+               return -1;
+       }
+
+       return 0;
+}
+

 int xmkstemp(char *template)
 {
        int fd;
 int xmkstemp(char *template)
 {
        int fd;