diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-10-09 14:27:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-10-09 14:27:31 (GMT) |
| commit | 5064777d1680c3ee168b4f474ba7d06d24458184 (patch) | |
| tree | 8dc7e32d97874d04658f0821099d7beb586ef781 | |
| parent | c925a86988d2545a4927c04d1ad03e9933f0aecb (diff) | |
| parent | 5b74714749f656963cac7ffffca487334633c6d1 (diff) | |
| download | tcl-5064777d1680c3ee168b4f474ba7d06d24458184.zip tcl-5064777d1680c3ee168b4f474ba7d06d24458184.tar.gz tcl-5064777d1680c3ee168b4f474ba7d06d24458184.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | win/nmakehlp.c | 10 |
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, |