JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cygcheck.cc: Fix downlevel DLL handling

Browse Source 
* cygcheck.cc (track_down): Skip error output for "api-ms-win-"
        downlevel DLLs.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-08-30 21:32:56 +02:00
parent 8fb2a01188
commit e2ae671ce1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2015-08-30 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (track_down): Skip error output for "api-ms-win-"
downlevel DLLs.
2015-08-03 Corinna Vinschen <corinna@vinschen.de> 2015-08-03 Corinna Vinschen <corinna@vinschen.de>
* strace.cc (main2): Don't call setvbuf on NULL descriptor. * strace.cc (main2): Don't call setvbuf on NULL descriptor.

7
winsup/utils/cygcheck.cc
View File

@ -1,7 +1,7 @@
/* cygcheck.cc /* cygcheck.cc
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc. 2009, 2010, 2011, 2012, 2013, 2014, 2015 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -764,6 +764,11 @@ track_down (const char *file, const char *suffix, int lvl)
const char *path = find_on_path (file, suffix, false, true); const char *path = find_on_path (file, suffix, false, true);
if (!path) if (!path)
{ {
/* The api-ms-win-*.dll files are in system32/downlevel and not in the
DLL search path, so find_on_path doesn't find them. Since they are
never actually linked against by the executables, they are of no
interest to us. Skip any error message in not finding them. */
if (strncasecmp (file, "api-ms-win-", 11) || strcasecmp (suffix, ".dll"))
display_error ("track_down: could not find %s\n", file); display_error ("track_down: could not find %s\n", file);
return false; return false;
} }