kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'nd/fopen-errors' 

Hotfix for a topic that is already in 'master'.

* nd/fopen-errors:
  configure.ac: loosen FREAD_READS_DIRECTORIES test program
maint
Junio C Hamano 2017-06-22 14:15:20 -07:00
parent 05ec6e13aa 3adf9fdecf
commit df7fd961a9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -19,7 +19,8 @@ all::
# have been written to the final string if enough space had been available. # have been written to the final string if enough space had been available.
# #
# Define FREAD_READS_DIRECTORIES if you are on a system which succeeds # Define FREAD_READS_DIRECTORIES if you are on a system which succeeds
# when attempting to read from an fopen'ed directory. # when attempting to read from an fopen'ed directory (or even to fopen
# it at all).
# #
# Define NO_OPENSSL environment variable if you do not have OpenSSL. # Define NO_OPENSSL environment variable if you do not have OpenSSL.
# This also implies BLK_SHA1. # This also implies BLK_SHA1.

4
configure.ac
View File

@ -922,9 +922,9 @@ AC_CACHE_CHECK([whether system succeeds to read fopen'ed directory],
[ [
AC_RUN_IFELSE( AC_RUN_IFELSE(
[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
[[char c; [[
FILE *f = fopen(".", "r"); FILE *f = fopen(".", "r");
return f && fread(&c, 1, 1, f)]])], return f)]])],
[ac_cv_fread_reads_directories=no], [ac_cv_fread_reads_directories=no],
[ac_cv_fread_reads_directories=yes]) [ac_cv_fread_reads_directories=yes])
]) ])