QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-14 18:39:40 +00:00
Code Issues Projects Releases Wiki Activity

crypto/*: address standard-compilance nits.

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/6745)
This commit is contained in:
Andy Polyakov 2018-07-19 15:28:34 +02:00
parent f36e9f1183
commit f20aa69e33
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/conf/conf_def.c
View File

@ -27,6 +27,10 @@
# endif # endif
#endif #endif
#ifndef S_ISDIR
# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
#endif
/* /*
* The maximum length we can grow a value to after variable expansion. 64k * The maximum length we can grow a value to after variable expansion. 64k
* should be more than enough for all reasonable uses. * should be more than enough for all reasonable uses.
@ -656,7 +660,7 @@ static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx,
return NULL; return NULL;
} }
if ((st.st_mode & S_IFDIR) == S_IFDIR) { if (S_ISDIR(st.st_mode)) {
if (*dirctx != NULL) { if (*dirctx != NULL) {
CONFerr(CONF_F_PROCESS_INCLUDE, CONFerr(CONF_F_PROCESS_INCLUDE,
CONF_R_RECURSIVE_DIRECTORY_INCLUDE); CONF_R_RECURSIVE_DIRECTORY_INCLUDE);

6
crypto/store/loader_file.c
View File

@ -35,6 +35,10 @@
# define stat _stat # define stat _stat
#endif #endif
#ifndef S_ISDIR
# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
#endif
/*- /*-
* Password prompting * Password prompting
* ------------------ * ------------------
@ -839,7 +843,7 @@ static OSSL_STORE_LOADER_CTX *file_open(const OSSL_STORE_LOADER *loader,
return NULL; return NULL;
} }
if ((st.st_mode & S_IFDIR) == S_IFDIR) { if (S_ISDIR(st.st_mode)) {
/* /*
* Try to copy everything, even if we know that some of them must be * Try to copy everything, even if we know that some of them must be
* NULL for the moment. This prevents errors in the future, when more * NULL for the moment. This prevents errors in the future, when more

2
crypto/ui/ui_openssl.c
View File

@ -43,7 +43,7 @@
* If unistd.h defines _POSIX_VERSION, we conclude that we are on a POSIX * If unistd.h defines _POSIX_VERSION, we conclude that we are on a POSIX
* system and have sigaction and termios. * system and have sigaction and termios.
*/ */
# if defined(_POSIX_VERSION) # if defined(_POSIX_VERSION) && _POSIX_VERSION>=199309L
# define SIGACTION # define SIGACTION
# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY) # if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)