Import the updated nmakehlp.c file used by the TCL Extension Architecture (TEA)

builds in the amalgamation tarballs.
[forum:/forumpost/5a5001f20a|Forum post 5a5001f20a].

FossilOrigin-Name: 595bf95bf8884c545e85e3feee6f43503b59d3c6d69073f0aaba4473c7c61cac

diff --git a/autoconf/tea/win/nmakehlp.c b/autoconf/tea/win/nmakehlp.c
index 7536edee33455deaee64028195b4a1aee9bc06a4..2dc33cc657b43dd57937fe1f5e58f740c8dfcbe7 100644 (file)
--- a/autoconf/tea/win/nmakehlp.c
+++ b/autoconf/tea/win/nmakehlp.c
@@ -14,8 +14,10 @@
 
 #define _CRT_SECURE_NO_DEPRECATE
 #include <windows.h>
+#ifdef _MSC_VER
 #pragma comment (lib, "user32.lib")
 #pragma comment (lib, "kernel32.lib")
+#endif
 #include <stdio.h>
 #include <math.h>
 
@@ -37,7 +39,7 @@
 /* protos */
 
 static int CheckForCompilerFeature(const char *option);
-static int CheckForLinkerFeature(const char **options, int count);
+static int CheckForLinkerFeature(char **options, int count);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
@@ -54,8 +56,8 @@ typedef struct {
     char buffer[STATICBUFFERSIZE];
 } pipeinfo;
 
-pipeinfo Out = {INVALID_HANDLE_VALUE, '\0'};
-pipeinfo Err = {INVALID_HANDLE_VALUE, '\0'};
+pipeinfo Out = {INVALID_HANDLE_VALUE, ""};
+pipeinfo Err = {INVALID_HANDLE_VALUE, ""};
 \f
 /*
  * exitcodes: 0 == no, 1 == yes, 2 == error
@@ -273,7 +275,7 @@ CheckForCompilerFeature(
                "Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
 
        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
-               FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars],
+               FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
                (300-chars), 0);
        WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
        return 2;
@@ -326,7 +328,7 @@ CheckForCompilerFeature(
 \f
 static int
 CheckForLinkerFeature(
-    const char **options,
+    char **options,
     int count)
 {
     STARTUPINFO si;
@@ -407,7 +409,7 @@ CheckForLinkerFeature(
                "Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
 
        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
-               FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars],
+               FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
                (300-chars), 0);
        WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
        return 2;
@@ -503,7 +505,6 @@ GetVersionFromFile(
     const char *match,
     int numdots)
 {
-    size_t cbBuffer = 100;
     static char szBuffer[100];
     char *szResult = NULL;
     FILE *fp = fopen(filename, "rt");
@@ -513,7 +514,7 @@ GetVersionFromFile(
         * Read data until we see our match string.
         */
 
-       while (fgets(szBuffer, cbBuffer, fp) != NULL) {
+       while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
            LPSTR p, q;
 
            p = strstr(szBuffer, match);
@@ -523,7 +524,7 @@ GetVersionFromFile(
                 */
 
                p += strlen(match);
-               while (*p && !isdigit(*p)) {
+               while (*p && !isdigit((unsigned char)*p)) {
                    ++p;
                }
 
@@ -532,14 +533,13 @@ GetVersionFromFile(
                 */
 
                q = p;
-               while (*q && (strchr("0123456789.ab", *q)) && ((!strchr(".ab", *q)
-                           && (!strchr("ab", q[-1])) || --numdots))) {
+               while (*q && (strchr("0123456789.ab", *q)) && (((!strchr(".ab", *q)
+                           && !strchr("ab", q[-1])) || --numdots))) {
                    ++q;
                }
 
-               memcpy(szBuffer, p, q - p);
-               szBuffer[q-p] = 0;
-               szResult = szBuffer;
+               *q = 0;
+               szResult = p;
                break;
            }
        }
@@ -562,7 +562,7 @@ typedef struct list_item_t {
 static list_item_t *
 list_insert(list_item_t **listPtrPtr, const char *key, const char *value)
 {
-    list_item_t *itemPtr = malloc(sizeof(list_item_t));
+    list_item_t *itemPtr = (list_item_t *)malloc(sizeof(list_item_t));
     if (itemPtr) {
        itemPtr->key = strdup(key);
        itemPtr->value = strdup(value);
@@ -611,9 +611,7 @@ SubstituteFile(
     const char *substitutions,
     const char *filename)
 {
-    size_t cbBuffer = 1024;
     static char szBuffer[1024], szCopy[1024];
-    char *szResult = NULL;
     list_item_t *substPtr = NULL;
     FILE *fp, *sp;
 
@@ -626,7 +624,7 @@ SubstituteFile(
 
        sp = fopen(substitutions, "rt");
        if (sp != NULL) {
-           while (fgets(szBuffer, cbBuffer, sp) != NULL) {
+           while (fgets(szBuffer, sizeof(szBuffer), sp) != NULL) {
                unsigned char *ks, *ke, *vs, *ve;
                ks = (unsigned char*)szBuffer;
                while (ks && *ks && isspace(*ks)) ++ks;
@@ -657,7 +655,7 @@ SubstituteFile(
         * Run the substitutions over each line of the input
         */
 
-       while (fgets(szBuffer, cbBuffer, fp) != NULL) {
+       while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
            list_item_t *p = NULL;
            for (p = substPtr; p != NULL; p = p->nextPtr) {
                char *m = strstr(szBuffer, p->key);
@@ -674,7 +672,7 @@ SubstituteFile(
                    memcpy(szBuffer, szCopy, sizeof(szCopy));
                }
            }
-           printf(szBuffer);
+           printf("%s", szBuffer);
        }
 
        list_free(&substPtr);
@@ -725,7 +723,8 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
 {
     HANDLE hSearch;
     char path[MAX_PATH+1];
-    int dirlen, keylen, ret;
+    size_t dirlen;
+    int keylen, ret;
     WIN32_FIND_DATA finfo;
 
     if (dir == NULL || keypath == NULL)
@@ -792,7 +791,8 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
  */
 static int LocateDependency(const char *keypath)
 {
-    int i, ret;
+    size_t i;
+    int ret;
     static const char *paths[] = {"..", "..\\..", "..\\..\\.."};
 
     for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {

diff --git a/manifest b/manifest
index 3fe6b2c58301fc129d121c51b61ed8ddd1862577..6abfadbd82b8eacc6c072116dffe3870571833f5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sin\sfts5\sthat\scould\soccur\swhen\sprocessing\sa\squery\scontaining\smultiple\sclasses\sof\serror.
-D 2021-06-30T14:04:25.220
+C Import\sthe\supdated\snmakehlp.c\sfile\sused\sby\sthe\sTCL\sExtension\sArchitecture\s(TEA)\nbuilds\sin\sthe\samalgamation\starballs.\n[forum:/forumpost/5a5001f20a|Forum\spost\s5a5001f20a].
+D 2021-07-01T16:57:48.827
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -29,7 +29,7 @@ F autoconf/tea/pkgIndex.tcl.in 3ef61715cf1c7bdcff56947ffadb26bc991ca39d
 F autoconf/tea/tclconfig/install-sh bdd5e293591621ae60d9824d86a4b1c5f22c3d00
 F autoconf/tea/tclconfig/tcl.m4 66ddf0a5d5e4b1d29bff472c0985fd7fa89d0fb5
 F autoconf/tea/win/makefile.vc a5ff708245260c2794c6aaa0151efe5403d5896566eaf096747be0d9075284e4
-F autoconf/tea/win/nmakehlp.c 190bf8b40f6f90eeb6cbc1e5c13a19fc7ad870e479e0314c88174f71bf9e28a7
+F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea00342d1a1a7eaa19cb
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
@@ -1919,7 +1919,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9e760e256089c0ebbf816a8de8b186f62e1ffcd6b8b0e76dab8387798cd4d0e1
-R d8e84becbe3e499665a01229c17289ad
-U dan
-Z 94aad6f32f8b281da0508c0481608ec6
+P 7c279670f544a5bb9733a88862d9e490062b07415cd790e0d6d1e2cb584d2007
+R ea4df91ece4d61dc769c7d82973a118f
+U drh
+Z 7ad010d3e1df58bf34aaee6bf80c92a4

diff --git a/manifest.uuid b/manifest.uuid
index 9c34aa36db6c92afea0715c575cd5da8e47bb0f1..412a429af9233b5f7c91af9432df5e836197525c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c279670f544a5bb9733a88862d9e490062b07415cd790e0d6d1e2cb584d2007
\ No newline at end of file
+595bf95bf8884c545e85e3feee6f43503b59d3c6d69073f0aaba4473c7c61cac
\ No newline at end of file