Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas van Gompel <cygwin-patch.buzz@bavag.tmfweb.nl>2004-10-27 05:28:07 +0400
committerBas van Gompel <cygwin-patch.buzz@bavag.tmfweb.nl>2004-10-27 05:28:07 +0400
commitccf4c1e6cd490a3a1659b917b8f57fa6538d6950 (patch)
tree1aef3ad8ca57de0166967c8675ebd1427d34cc16 /winsup/utils
parent5957d504f0da6ed6614bbb790b79d1224f4b639d (diff)
* cygcheck.cc (dump_sysinfo): Warn about missing or multiple cygwin1
dlls.
Diffstat (limited to 'winsup/utils')
-rw-r--r--winsup/utils/ChangeLog5
-rw-r--r--winsup/utils/cygcheck.cc10
2 files changed, 14 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 41327b5ba..cb6ad0d3b 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-27 Bas van Gompel <cygwin-patch.buzz@bavag.tmfweb.nl>
+
+ * cygcheck.cc (dump_sysinfo): Warn about missing or multiple cygwin1
+ dlls.
+
2004-10-25 Bas van Gompel <cygwin-patch.buzz@bavag.tmfweb.nl>
* cygcheck.cc (dump_sysinfo): Add leading newline before legend for
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 8d17c9dc4..b6276745b 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1222,6 +1222,7 @@ dump_sysinfo ()
if (givehelp)
printf ("Looking for various Cygnus DLLs... (-v gives version info)\n");
+ int cygwin_dll_count = 0;
for (i = 0; i < num_paths; i++)
{
WIN32_FIND_DATA ffinfo;
@@ -1238,7 +1239,10 @@ dump_sysinfo ()
{
sprintf (tmp, "%s\\%s", paths[i], f);
if (strcasecmp (f, "cygwin1.dll") == 0)
- found_cygwin_dll = strdup (tmp);
+ {
+ cygwin_dll_count++;
+ found_cygwin_dll = strdup (tmp);
+ }
else
ls (tmp);
}
@@ -1253,6 +1257,10 @@ dump_sysinfo ()
FindClose (ff);
}
+ if (cygwin_dll_count > 1)
+ puts ("Warning: There are multiple cygwin1.dlls on your path");
+ if (!cygwin_dll_count)
+ puts ("Warning: cygwin1.dll not found on your path");
}
static int