diff options
| author | Christopher Faylor <me@cgf.cx> | 2013-08-23 19:56:26 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2013-08-23 19:56:26 +0000 |
| commit | 94f900f805c2a2049e2e857457ec24d269ec08b0 (patch) | |
| tree | ba994df03e56f1c245e6abd3f210a9cec3fac348 | |
| parent | 1560d3e28184be3b7701b83866eac46136cf6a9a (diff) | |
| download | newlib-94f900f805c2a2049e2e857457ec24d269ec08b0.zip newlib-94f900f805c2a2049e2e857457ec24d269ec08b0.tar.gz newlib-94f900f805c2a2049e2e857457ec24d269ec08b0.tar.bz2 | |
* cygcheck.cc (package_grep): Accommodate arch-specific package layout.
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 00894b9..7439130 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2013-08-23 Christopher Faylor <me.cygwin2013@cgf.cx> + + * cygcheck.cc (package_grep): Accommodate arch-specific package layout. + 2013-07-31 Corinna Vinschen <corinna@vinschen.de> * Makefile.in (MINGW_LDFLAGS): Don't link against w32api libs. These diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 0447e58..b9e93b9 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -2176,7 +2176,7 @@ package_grep (char *search) } /* construct the actual URL by escaping */ - char *url = (char *) alloca (sizeof (base_url) + strlen (search) * 3); + char *url = (char *) alloca (sizeof (base_url) + strlen ("&arch=x86_64") + strlen (search) * 3); strcpy (url, base_url); char *dest; @@ -2194,7 +2194,11 @@ package_grep (char *search) dest += 2; } } - *dest = 0; +#ifdef __x86_64__ + strcpy (dest, "&arch=x86_64"); +#else + strcpy (dest, "&arch=x86"); +#endif /* Connect to the net and open the URL. */ if (pInternetAttemptConnect (0) != ERROR_SUCCESS) |