pal1000
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

close error_msgout if opened

master
Stone Tickle 2021-06-11 15:01:10 +09:00 committed by Ariadne Conill
parent dba2600014
commit fa859bb045
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/main.c
View File

@ -802,6 +802,7 @@ main(int argc, char *argv[])
char *want_env_prefix = NULL; char *want_env_prefix = NULL;
unsigned int want_client_flags = PKGCONF_PKG_PKGF_NONE; unsigned int want_client_flags = PKGCONF_PKG_PKGF_NONE;
pkgconf_cross_personality_t *personality; pkgconf_cross_personality_t *personality;
bool opened_error_msgout = false;
want_flags = 0; want_flags = 0;
@ -1027,8 +1028,10 @@ main(int argc, char *argv[])
error_msgout = stderr; error_msgout = stderr;
if ((want_flags & PKG_ERRORS_ON_STDOUT) == PKG_ERRORS_ON_STDOUT) if ((want_flags & PKG_ERRORS_ON_STDOUT) == PKG_ERRORS_ON_STDOUT)
error_msgout = stdout; error_msgout = stdout;
if ((want_flags & PKG_SILENCE_ERRORS) == PKG_SILENCE_ERRORS) if ((want_flags & PKG_SILENCE_ERRORS) == PKG_SILENCE_ERRORS) {
error_msgout = fopen(PATH_DEV_NULL, "w"); error_msgout = fopen(PATH_DEV_NULL, "w");
opened_error_msgout = true;
}
if ((want_flags & PKG_IGNORE_CONFLICTS) == PKG_IGNORE_CONFLICTS || getenv("PKG_CONFIG_IGNORE_CONFLICTS") != NULL) if ((want_flags & PKG_IGNORE_CONFLICTS) == PKG_IGNORE_CONFLICTS || getenv("PKG_CONFIG_IGNORE_CONFLICTS") != NULL)
want_client_flags |= PKGCONF_PKG_PKGF_SKIP_CONFLICTS; want_client_flags |= PKGCONF_PKG_PKGF_SKIP_CONFLICTS;
@ -1459,6 +1462,8 @@ out:
if (logfile_out != NULL) if (logfile_out != NULL)
fclose(logfile_out); fclose(logfile_out);
if (opened_error_msgout)
fclose(error_msgout);
return ret; return ret;
} }