summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-10-09 14:23:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-10-09 14:23:39 (GMT)
commit15a7950c9ec165ae183a8455436e57ccf23afb1c (patch)
treeb8ad4925d9d977dd8c3955e83c2ae12306355395
parentb8e5e2909ee8607f2351ffc9a72c114dfb571e6b (diff)
downloadtcl-15a7950c9ec165ae183a8455436e57ccf23afb1c.zip
tcl-15a7950c9ec165ae183a8455436e57ccf23afb1c.tar.gz
tcl-15a7950c9ec165ae183a8455436e57ccf23afb1c.tar.bz2
In nmakehlp -v, return non-0 exit code if version is not found. (taken from vc-reform branch)
-rw-r--r--win/nmakehlp.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 22b7b06..0439d1c 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -74,6 +74,7 @@ main(
char msg[300];
DWORD dwWritten;
int chars;
+ char *s;
/*
* Make sure children (cl.exe and link.exe) are kept quiet.
@@ -153,8 +154,13 @@ main(
&dwWritten, NULL);
return 0;
}
- printf("%s\n", GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0'));
- return 0;
+ s = GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0');
+ if (s && *s) {
+ printf("%s\n", s);
+ return 0;
+ } else
+ return 1; /* Version not found. Return non-0 exit code */
+
case 'Q':
if (argc != 3) {
chars = snprintf(msg, sizeof(msg) - 1,