[PATCH] cygcheck: Fix parsing of file names containing colons

[Corinna Vinschen]

Hi Ken,

On Oct 25 07:23, Ken Brown wrote:
> Up to now the function winsup/utils/dump_setup.cc:base skips past
> colons when parsing file names.  As a result, a line like
> 
>   foo foo-1:2.3-4.tar.bz2 1
> 
> in /etc/setup/installed.db would cause 'cygcheck -cd foo' to report 4
> as the installed version of foo insted of 1:2.3-4.  This is not an
> issue now, but it will become an issue when version numbers are
> allowed to contain epochs.
> ---
>  winsup/utils/dump_setup.cc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc
> index 320d69fab..3922b18f8 100644
> --- a/winsup/utils/dump_setup.cc
> +++ b/winsup/utils/dump_setup.cc
> @@ -56,7 +56,7 @@ base (const char *s)
>    const char *rv = s;
>    while (*s)
>      {
> -      if ((*s == '/' || *s == ':' || *s == '\\') && s[1])
> +      if ((*s == '/' || *s == '\\') && s[1])

I think this is a simplified way to test for the colon in paths like
C:/foo/bar.  Nothing else makes sense in this context.

I'm not sure how much we care, but maybe we shoulkd fix the test to
ignore the colon only if it's the second character in the incoming
string?


Thanks,
Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://cygwin.com/pipermail/cygwin-patches/attachments/20171025/9ea37e1b/attachment.sig>