diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-26 13:22:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-26 13:22:10 (GMT) |
| commit | 07256a2be53749c32aef1540f1872af131349343 (patch) | |
| tree | af010b2c059ebdb9dc36243e7c6c37d02f9bf72f /generic/tclPkg.c | |
| parent | 22c94de04ae6d54b29babdf43862a5e859c050df (diff) | |
| parent | b3e1ffc1797fa7eec61848d7a3f9d120afd0b0fe (diff) | |
| download | tcl-07256a2be53749c32aef1540f1872af131349343.zip tcl-07256a2be53749c32aef1540f1872af131349343.tar.gz tcl-07256a2be53749c32aef1540f1872af131349343.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclPkg.c')
| -rw-r--r-- | generic/tclPkg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclPkg.c b/generic/tclPkg.c index d0adfac..a369a29 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -1698,7 +1698,7 @@ CheckVersionAndConvert( *ip++ = *p; - for (prevChar = *p, p++; *p != 0; p++) { + for (prevChar = *p, p++; (*p != 0) && (*p != '+'); p++) { if (!isdigit(UCHAR(*p)) && /* INTL: digit */ ((*p!='.' && *p!='a' && *p!='b') || ((hasunstable && (*p=='a' || *p=='b')) || @@ -2002,10 +2002,10 @@ CheckRequirement( char *dash = NULL, *buf; - dash = (char *)strchr(string, '-'); + dash = strchr(string, '+') ? NULL : (char *)strchr(string, '-'); if (dash == NULL) { /* - * No dash found, has to be a simple version. + * '+' found or no dash found: has to be a simple version. */ return CheckVersionAndConvert(interp, string, NULL, NULL); |