diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-09-19 12:33:25 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-09-19 12:33:25 (GMT) |
| commit | 3de19b0f651a225ea6b2189d0c61fbb227c9f89e (patch) | |
| tree | a7583828161f3fa6868e69c2c9f818f83c503037 | |
| parent | 1c8b8da222834da595d23f0cd43ef5659d4bdcba (diff) | |
| download | tcl-3de19b0f651a225ea6b2189d0c61fbb227c9f89e.zip tcl-3de19b0f651a225ea6b2189d0c61fbb227c9f89e.tar.gz tcl-3de19b0f651a225ea6b2189d0c61fbb227c9f89e.tar.bz2 | |
Let "nmakehlp -V" start searching digits after the found match (suggested by Harald Oehlmann)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win/nmakehlp.c | 9 |
2 files changed, 8 insertions, 5 deletions
@@ -1,7 +1,9 @@ 2012-09-19 Jan Nijtmans <nijtmans@users.sf.net> - * generic/tcl.h: make Tcl_Interp a fully opaque structure + * generic/tcl.h: make Tcl_Interp a fully opaque structure if TCL_NO_DEPRECATED is set (TIP 330 and 336). + * win/nmakehlp.c: Let "nmakehlp -V" start searching digits + after the found match (suggested by Harald Oehlmann) 2012-09-07 Harald Oehlmann <oehhar@users.sf.net> diff --git a/win/nmakehlp.c b/win/nmakehlp.c index d0edcf0..b1a1517 100644 --- a/win/nmakehlp.c +++ b/win/nmakehlp.c @@ -498,9 +498,10 @@ GetVersionFromFile( p = strstr(szBuffer, match); if (p != NULL) { /* - * Skip to first digit. + * Skip to first digit after the match. */ + p += strlen(match); while (*p && !isdigit(*p)) { ++p; } @@ -630,11 +631,11 @@ SubstituteFile( } } #endif - + /* * Run the substitutions over each line of the input */ - + while (fgets(szBuffer, cbBuffer, fp) != NULL) { list_item_t *p = NULL; for (p = substPtr; p != NULL; p = p->nextPtr) { @@ -654,7 +655,7 @@ SubstituteFile( } printf(szBuffer); } - + list_free(&substPtr); } fclose(fp); |