LWS git

Andy Green <andy@warmcat.com> 2021-01-29 17:28 UTC

server: allow huge platform string

diff --git a/.sai.json b/.sai.json
index 1b388c7..e04a67e 100644
--- a/.sai.json
+++ b/.sai.json
@@ -20,7 +20,7 @@
 			"default": false
                 },
 
-		"windows-10/x86_64-amd/msvc": {
+		"w10/x86_64-amd/msvc": {
                         "build": "mkdir build && cd build && set SAI_CPACK=\"-G ZIP\" && cmake .. -DSAI_LWS_INC_PATH=\"C:\\Program Files (x86)\\libwebsockets\\include\" -DSAI_LWS_LIB_PATH=\"C:\\Program Files (x86)\\libwebsockets\\lib\\websockets_static.lib\" -DSAI_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DSAI_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" -DLWS_OPENSSL_INCLUDE_DIRS=\"C:\\Program Files\\OpenSSL\\include\" -DSAI_GIT2_INC_PATH=\"C:\\Program Files (x86)\\libgit2\\include\" -DSAI_GIT2_LIB_PATH=\"C:\\Program Files (x86)\\libgit2\\lib\\git2.lib\" -DLWS_OPENSSL_LIBRARIES=\"C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib;C:\\Program Files\\OpenSSL\\lib\\libssl.lib\"  ${cmake} && cmake --build . --config DEBUG && set CTEST_OUTPUT_ON_FAILURE=1 && ctest . -C DEBUG -j4 --output-on-failure ${cpack}",
                         "default": false
                 }
@@ -34,7 +34,7 @@
 		},
 		"builder-only": {
 			"cmake":	"-DSAI_SERVER=0 ",
-			"platforms":	"windows-10/x86_64-amd/msvc, netbsd-OSX-bigsur/x86_64-intel-i3/llvm,netbsd/aarch64BE-bcm2837-a53/gcc",
+			"platforms":	"w10/x86_64-amd/msvc, netbsd-OSX-bigsur/x86_64-intel-i3/llvm,netbsd/aarch64BE-bcm2837-a53/gcc",
 			"cpack":        "&& cpack -C DEBUG $SAI_CPACK",
 			"artifacts":	"build/sai-*.deb, build/sai-*.rpm, build/sai-*.7z"
 		}
diff --git a/assets/tc-wmbedtlsmsvc.svg b/assets/tc-wmbedtlsmsvc.svg
new file mode 100644
index 0000000..dd47f12
--- /dev/null
+++ b/assets/tc-wmbedtlsmsvc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 3.816 3.816" height="14.423" width="14.423" xmlns:v="https://vecta.io/nano"><circle r="1.908" cy="1.908" cx="1.908" opacity=".12" fill="#f9f9f9"/><path d="M2.382 3.194c-.03-.01-.154-.14-.475-.495l-.448-.48c-.007 0-.14.104-.297.232-.33.27-.3.258-.483.183-.172-.07-.156-.002-.16-.713s-.01-.663.115-.724c.217-.105.192-.113.533.166l.29.23c.005 0 .208-.218.45-.485.456-.502.467-.512.553-.512.028 0 .61.275.64.303.056.05.055.024.055 1.01 0 1.113.032.967-.244 1.102-.407.198-.45.213-.53.183zm.117-1.3l-.01-.524a19.92 19.92 0 0 0-.634.52c-.014.017-.012.023.018.047l.322.262.296.23c.005-.003.01-.243.01-.534zm-1.4.1a.56.56 0 0 0 .075-.095 2.9 2.9 0 0 0-.298-.326c-.015 0-.026.556-.012.627l.008.04.076-.082.15-.166z" fill="#b88aed"/><path d="M2.312 3.12l-.395-.43-.387-.426-.07-.074-.268.22c-.37.305-.33.29-.502.214-.18-.078-.163.002-.162-.714s-.014-.64.142-.707c.188-.08.163-.088.407.11l.265.216.112.086c.006 0 .453-.485.792-.86.11-.12.14-.14.188-.13.058.015.063.046.063.394v.32l-.336.276-.34.288c-.004.013.003.02.407.347l.273.227c.015.022.01.635-.004.668-.012.026-.062.054-.095.054-.006 0-.046-.036-.09-.08zM1.036 2.084l.16-.186a3.42 3.42 0 0 0-.331-.359c-.015 0-.03.67-.015.706.01.028.026.014.186-.162zM2.485 3.19c.008-.003.02-.003.022.001-.03.006-.032.003-.022-.001zm.66-.39zm0-.035z" fill="#9260cc"/><path d="M.708 2.62c-.202-.083-.18.002-.18-.72l.012-.607c.012-.055.084-.012.186.1l.107.116.004.174.006.39c.001.26-.013.256.183.045.175-.19.175-.19.22-.136l.11.12c.04.044.075.084.075.09s-.214.188-.495.415c-.083.067-.1.068-.227.016zm1.043-.795c-.067-.058-.07-.064-.043-.078.053-.027.14-.025.175.003l.034.028-.046.048c-.057.058-.05.058-.12-.001zm.187-.087c-.012-.013-.01-.017.018-.024.062-.015.18-.114.195-.164.007-.024.078-.037.078-.015 0 .013-.042.034-.05.025a1.37 1.37 0 0 1-.207.184c-.01.006-.023.003-.032-.007zm-.315-.112c.013-.001.02.006.02.008 0 .01-.01.005-.02-.008zm-.122-.02c0-.006.005-.015.012-.02.012.01.006.02 0 .023zm.522-.001c.004-.006.012-.012.018-.012.01.018.003.023-.007.023zm-.432-.1c.012-.016.026-.03.032-.03s-.001.013-.017.03c-.035.037-.042.038-.015 0zm.666-.018c.004-.006.013-.012.02-.012 0 .018-.008.023-.014.023zm.055-.036c.003-.008.012-.018.02-.02.008.02-.002.028-.01.03zm-.636-.04zm.035-.035z" fill="#6e40a4"/></svg>
diff --git a/assets/w10.svg b/assets/w10.svg
new file mode 100644
index 0000000..fbdd1a2
--- /dev/null
+++ b/assets/w10.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 3.886 3.886" height="14.687" width="14.687"><circle r="1.943" cy="1.943" cx="1.943" fill="#f9f9f9" fill-opacity=".12"/><path d="M2.498 3.044l-.558-.08-.16-.02v-.886h1.218V3.11h-.05c-.03 0-.23-.03-.45-.06zM1.18 2.86L.75 2.8v-.764h.917v.44c0 .412 0 .44-.03.44-.02 0-.225-.03-.46-.06zM.745 1.564c0-.38 0-.382.04-.39.04 0 .84-.118.87-.118.01 0 .02.176.02.433v.434l-.04.01-.463.01H.748zm1.035-.08V1.04l.05-.01c.03 0 .28-.04.558-.08l.56-.08h.05v1.07H1.78z" fill="#000000"/></svg>
diff --git a/assets/windows-10.svg b/assets/windows-10.svg
deleted file mode 100644
index fbdd1a2..0000000
--- a/assets/windows-10.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 3.886 3.886" height="14.687" width="14.687"><circle r="1.943" cy="1.943" cx="1.943" fill="#f9f9f9" fill-opacity=".12"/><path d="M2.498 3.044l-.558-.08-.16-.02v-.886h1.218V3.11h-.05c-.03 0-.23-.03-.45-.06zM1.18 2.86L.75 2.8v-.764h.917v.44c0 .412 0 .44-.03.44-.02 0-.225-.03-.46-.06zM.745 1.564c0-.38 0-.382.04-.39.04 0 .84-.118.87-.118.01 0 .02.176.02.433v.434l-.04.01-.463.01H.748zm1.035-.08V1.04l.05-.01c.03 0 .28-.04.558-.08l.56-.08h.05v1.07H1.78z" fill="#000000"/></svg>
diff --git a/src/server/s-notification.c b/src/server/s-notification.c
index 45f3d52..ed24838 100644
--- a/src/server/s-notification.c
+++ b/src/server/s-notification.c
@@ -668,9 +668,11 @@ sai_saifile_lejp_cb(struct lejp_ctx *ctx, char reason)
 		break;
 
 	case LEJPNSAIF_CONFIGURATIONS_PLATFORMS:
-		/* the necessary dependent package strings */
-		lws_strncpy(sn->explicit_platforms, ctx->buf,
-				    sizeof(sn->explicit_platforms));
+		/* the necessary dependent package strings... can be huge */
+		n = strlen(sn->explicit_platforms);
+		if (n < sizeof(sn->explicit_platforms) - 2)
+			lws_strnncpy(sn->explicit_platforms + n, ctx->buf, ctx->npos,
+				     sizeof(sn->explicit_platforms) - n);
 		break;
 
 	case LEJPNSAIF_CONFIGURATIONS_ARTIFACTS:
diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt
index ac66c81..25b2b6a 100644
--- a/src/web/CMakeLists.txt
+++ b/src/web/CMakeLists.txt
@@ -126,9 +126,11 @@ if (requirements)
 			../../assets/tc-mingw32.svg
 			../../assets/tc-mingw64.svg
 			../../assets/tc-msvc.svg
+			../../assets/tc-wmbedtlsmsvc.svg
+			../../assets/tc-noptmsvc.svg
 			../../assets/ubuntu-focal-aarch64.svg
 			../../assets/virt-qemu.svg
-			../../assets/windows-10.svg
+			../../assets/w10.svg
 
 		DESTINATION "${DATA_DIR}/sai/assets"
 		COMPONENT web)
