summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2012-10-23 13:26:49 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2012-10-23 13:26:49 (GMT)
commit1e01f2fd6c62e2026c921be72a41dd6fe08d7269 (patch)
tree57790d74ea1366a49b6610433f1e94ecfed03847
parent04329be45c909d7d88c3f7185eb7da794714b4a2 (diff)
downloadtk-1e01f2fd6c62e2026c921be72a41dd6fe08d7269.zip
tk-1e01f2fd6c62e2026c921be72a41dd6fe08d7269.tar.gz
tk-1e01f2fd6c62e2026c921be72a41dd6fe08d7269.tar.bz2
sync nmakehlp.c with Tcl version
-rw-r--r--win/nmakehlp.c9
1 files changed, 5 insertions, 4 deletions
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);