b0a642ac46
If git is built with the FREAD_READS_DIRECTORIES build variable set, this would cause sparse to issue a 'not declared, should it be static?' warning on Linux. This is a result of the method employed by 'compat/fopen.c' to suppress the (possible) redefinition of the (system) fopen macro, which also removes the extern declaration of the git_fopen function. In order to suppress the warning, introduce a new macro to suppress the definition (or possibly the re-definition) of the fopen symbol as a macro override. This new macro (SUPPRESS_FOPEN_REDEFINITION) is only defined in 'compat/fopen.c', just prior to the inclusion of the 'git-compat-util.h' header file. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
38 lines
938 B
C
38 lines
938 B
C
/*
|
|
* The order of the following two lines is important.
|
|
*
|
|
* SUPPRESS_FOPEN_REDEFINITION is defined before including git-compat-util.h
|
|
* to avoid the redefinition of fopen within git-compat-util.h. This is
|
|
* necessary since fopen is a macro on some platforms which may be set
|
|
* based on compiler options. For example, on AIX fopen is set to fopen64
|
|
* when _LARGE_FILES is defined. The previous technique of merely undefining
|
|
* fopen after including git-compat-util.h is inadequate in this case.
|
|
*/
|
|
#define SUPPRESS_FOPEN_REDEFINITION
|
|
#include "../git-compat-util.h"
|
|
|
|
FILE *git_fopen(const char *path, const char *mode)
|
|
{
|
|
FILE *fp;
|
|
struct stat st;
|
|
|
|
if (mode[0] == 'w' || mode[0] == 'a')
|
|
return fopen(path, mode);
|
|
|
|
if (!(fp = fopen(path, mode)))
|
|
return NULL;
|
|
|
|
if (fstat(fileno(fp), &st)) {
|
|
fclose(fp);
|
|
return NULL;
|
|
}
|
|
|
|
if (S_ISDIR(st.st_mode)) {
|
|
fclose(fp);
|
|
errno = EISDIR;
|
|
return NULL;
|
|
}
|
|
|
|
return fp;
|
|
}
|