summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-09-19 12:33:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-09-19 12:33:25 (GMT)
commit562176ad5a881a5f92f2985feab5401c375d559a (patch)
treea7583828161f3fa6868e69c2c9f818f83c503037
parent87baa038943501504fc76d2f330ad6987b384602 (diff)
downloadtcl-562176ad5a881a5f92f2985feab5401c375d559a.zip
tcl-562176ad5a881a5f92f2985feab5401c375d559a.tar.gz
tcl-562176ad5a881a5f92f2985feab5401c375d559a.tar.bz2
Let "nmakehlp -V" start searching digits after the found match (suggested by Harald Oehlmann)
-rw-r--r--ChangeLog4
-rw-r--r--win/nmakehlp.c9
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b6addcc..9a17845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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);