pathtools: expose sanitise_path() again

this doesn't really work if the private headers aren't included since the prototype is missing then
2023-10-30 20:53:23 +01:00 · 2023-10-30 20:53:23 +01:00 · aa5852e6c4
commit aa5852e6c4
parent 9fb69647df
31 changed files with 59 additions and 35 deletions
--- a/mingw-w64-connect/PKGBUILD
+++ b/mingw-w64-connect/PKGBUILD
@ -20,7 +20,7 @@ source=(${_realname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz"
 sha256sums=('96c50fefe7ecf015cf64ba6cec9e421ffd3b18fef809f59961ef9229df528f3e'
            '1e1c89159178349a75665fcb9dfb7639e477b9af32165a377dad54c55e8a59d3'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a')
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90')

 prepare() {
  test ! -d "${startdir}/../mingw-w64-pathtools" || {
--- a/mingw-w64-connect/pathtools.h
+++ b/mingw-w64-connect/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-curl/PKGBUILD
+++ b/mingw-w64-curl/PKGBUILD
@ -40,7 +40,7 @@ source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//.
 sha256sums=('16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d'
            'SKIP'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            'c4e6bfd5b58f944d75293128effbd22fe42ee0131b915d9230ceb3c004c0322d'
            '3ee9c75a3046f86f91290c143170179230c9adc6eabfbb79eb26f708a165b719'
            '7492d019036b5bec251bfbc3c0b40e5f16d3dd6b2515068835e087a6c21f19ad'
--- a/mingw-w64-curl/pathtools.h
+++ b/mingw-w64-curl/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-cyrus-sasl/PKGBUILD
+++ b/mingw-w64-cyrus-sasl/PKGBUILD
@ -49,7 +49,7 @@ source=(https://github.com/cyrusimap/${_realname}/releases/download/${_realname}
 sha256sums=('7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c'
            'SKIP'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            '432c24477aa527c1fdb42977797054ee1a541597448d07f8c0201909b3adaf8c'
            'e101e1bd3ee03650e89e05c18d5f699d2f69aecc4f7aac4b11db2d1755783c5c'
            'b55f1444f5c2b9f3ac252867c89de692dd69e82bff3f843f6340adea31e04d09'
--- a/mingw-w64-cyrus-sasl/pathtools.h
+++ b/mingw-w64-cyrus-sasl/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-extremetuxracer/PKGBUILD
+++ b/mingw-w64-extremetuxracer/PKGBUILD
@ -25,7 +25,7 @@ source=("https://downloads.sourceforge.net/${_realname}/etr-${pkgver}.tar.xz"
 sha256sums=('2ee42f3f5fc2f8d49aa75056eb116f6cab84d6564120e6961ae5927367245113'
            'dfe6fa9c5ac538545dca8c734fb10f79e9d1a44440c44c1f22227c7289cbc67b'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a')
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90')

 prepare() {
  test ! -d "${startdir}/../mingw-w64-pathtools" || {
--- a/mingw-w64-extremetuxracer/pathtools.h
+++ b/mingw-w64-extremetuxracer/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-ffmpeg/PKGBUILD
+++ b/mingw-w64-ffmpeg/PKGBUILD
@ -78,7 +78,7 @@ validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 sha256sums=('57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082'
            'SKIP'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            '58f91fde8be7fa093b13275c37b0276de08537449749599e5a50f4f9c8b20926'
            '84b9fcaa188eef15201a105a44c53d647e4fb800a5032336e0948d6bed2cbc1b'
            'bbc7e7b91886a8ac037d8e70692186ee4b48c37b4f1d82b81af8a54463b24803'
--- a/mingw-w64-ffmpeg/pathtools.h
+++ b/mingw-w64-ffmpeg/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-firebird2-git/PKGBUILD
+++ b/mingw-w64-firebird2-git/PKGBUILD
@ -182,7 +182,7 @@ package() {

 sha256sums=('SKIP'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            'eaa4b490dfaac611001d06f9e1f0fc782340c9631808cb4ded16148f16498146'
            '6d8c2321a4fe693ac444db650b090fd841cc7c7b914bb30d0fe76559ca1be029'
            '563193c16e0004f0b4123f153b09462fde08e8a1ab9de25c6de762a7a5751b1e'
--- a/mingw-w64-firebird2-git/pathtools.h
+++ b/mingw-w64-firebird2-git/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-graphicsmagick/PKGBUILD
+++ b/mingw-w64-graphicsmagick/PKGBUILD
@ -47,7 +47,7 @@ source=(https://sourceforge.net/projects/graphicsmagick/files/${_realname}/${pkg
        001-relocate.patch)
 sha256sums=('484fccfd2b2faf6c2ba9151469ece5072bcb91ba4ed73e75ed3d8e46c759d557'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            '73ce65aad39e54b786c332a9aac42d39353af02cf32e3fbfe4e607644cc0a254')

 # Helper macros to help make tasks easier #
--- a/mingw-w64-graphicsmagick/pathtools.h
+++ b/mingw-w64-graphicsmagick/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-hunspell/PKGBUILD
+++ b/mingw-w64-hunspell/PKGBUILD
@ -32,7 +32,7 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/hunspell/hunspell/a
 noextract=("${_realname}-${pkgver}.tar.gz")
 sha256sums=('69fa312d3586c988789266eaf7ffc9861d9f6396c31fc930a014d551b59bbd6e'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            '628ac7f44ae0e093f229e88316cc8fbfb027cdcbe2bc5cc28d75bc3c57413f7a'
            '260432a8f01525e83124c79e375cc9f0692b1a6c97773add4c69b8efe081cf1d')

--- a/mingw-w64-hunspell/pathtools.h
+++ b/mingw-w64-hunspell/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-imagemagick/PKGBUILD
+++ b/mingw-w64-imagemagick/PKGBUILD
@ -71,7 +71,7 @@ source=(https://imagemagick.org/archive/releases/ImageMagick-${_basever}${_rc}.t
 sha256sums=('1e44faec8bf603e8c894a7c039fb1b4bb83dc0c429c79c74577e73ceefe4a238'
            'SKIP'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            '778fecad954d030d8cfd81e30188600bc428a8cac8a4aa7c862ed14bdf46a610')
 #Lexie Parsimoniae (ImageMagick code signing key) <lexie.parsimoniae@imagemagick.org>
 validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
--- a/mingw-w64-imagemagick/pathtools.h
+++ b/mingw-w64-imagemagick/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-ldns/PKGBUILD
+++ b/mingw-w64-ldns/PKGBUILD
@ -25,7 +25,7 @@ sha256sums=('c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860'
            'SKIP'
            '2b7f5a1c9982134f69154cb7445ac16eae1170a86c1d631d56fb9a135c44ec0d'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            '5384bc9ed57a2b44999e2c850318001c36809a42e9f3117d42c83911540dd8d0')
 validpgpkeys=('DC34EE5DB2417BCC151E5100E5F8F8212F77A498')
 noextract=(${_realname}-${pkgver}.tar.gz)
--- a/mingw-w64-ldns/pathtools.h
+++ b/mingw-w64-ldns/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-openssl/PKGBUILD
+++ b/mingw-w64-openssl/PKGBUILD
@ -24,7 +24,7 @@ sha256sums=('840af5366ab9b522bde525826be3ef0fb0af81c6a9ebd84caa600fea1731eee3'
            '21b96771b401442570e885c2d5689a359a91e86dcbf5511db3667202b6c1fa8a'
            '5628dd39ab0d3ce4afbb5207bab5d22766abc86a8875b48b6d4d3efd68550e68'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a')
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90')

 # https://www.openssl.org/community/otc.html
 validpgpkeys=(
--- a/mingw-w64-openssl/pathtools.h
+++ b/mingw-w64-openssl/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-p11-kit/PKGBUILD
+++ b/mingw-w64-p11-kit/PKGBUILD
@ -45,7 +45,7 @@ sha256sums=('d55583bcdde83d86579cabe3a8f7f2638675fef01d23cace733ff748fc354706'
            'aa92f986d3f7dfc119e86f9a8f3987e6ac2562149921820eadbe09218c4df99c'
            'ea4593324db6d2d193733561f0352c6d679d1fb00aed0a2bae0d28aecbe92721'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            '34e96b51f3f513bf479d1e6b647b4a417cec5d0139d1e3aa78fd4e449cf89f3b'
            '2b0fc5c54776aca54e306315338323075e7412d8d800f490a31870008c34f8d1'
            '3c4821c36f76fd45c0d1ec83474773e45ccefde4ac92ca88b8493425f7553cb9'
--- a/mingw-w64-p11-kit/pathtools.h
+++ b/mingw-w64-p11-kit/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-pathtools/main.c
+++ b/mingw-w64-pathtools/main.c
@ -10,7 +10,6 @@
 #include <string.h>

 #include "pathtools.h"
-#include "pathtools-private.h"

 void
 sanitise_path_debug(char const * path, char const * expected)
--- a/mingw-w64-pathtools/pathtools-private.h
+++ b/mingw-w64-pathtools/pathtools-private.h
@ -1,20 +0,0 @@
-/*
-      .Some useful path tools.
-        .ASCII only for now.
-   .Written by Ray Donnelly in 2014.
-   .Licensed under CC0 (and anything.
-  .else you need to license it under).
-      .No warranties whatsoever.
-  .email: <mingw.android@gmail.com>.
- */
-
-#ifndef PATHTOOLS_PRIVATE_H
-#define PATHTOOLS_PRIVATE_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/* In-place replaces any '\' with '/' and any '//' with '/' */
-void sanitise_path(char * path);
-
-#endif /* PATHTOOLS_PRIVATE_H */
--- a/mingw-w64-pathtools/pathtools.h
+++ b/mingw-w64-pathtools/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-port-scanner/PKGBUILD
+++ b/mingw-w64-port-scanner/PKGBUILD
@ -18,7 +18,7 @@ source=("https://www.secpoint.com/freetools/threaded-port-scanner-${pkgver}.zip"
        "0001-use-CC-from-environment.patch")
 sha256sums=('768c595fba7ba7e81da35e1bba1118bf08a1d689c6e419804d2109fc64177436'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            'e27fad5161752247259e271c30aa49ea7eb18fd9f9b4f92553332c5cbb031db8'
            '66c18874119a4c36116f579f13b97aab538db399be61001f105a56ea1daeb03b')

--- a/mingw-w64-port-scanner/pathtools.h
+++ b/mingw-w64-port-scanner/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);
--- a/mingw-w64-swig/PKGBUILD
+++ b/mingw-w64-swig/PKGBUILD
@ -23,7 +23,7 @@ source=(https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.ta
        002-fix-python-find.patch)
 sha256sums=('2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b'
            'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
-            'e1944d0dcd7837cb25c31832e785c6176916cd42a446ca2f9057a450afafab4a'
+            '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
            'a27041d7b13a17547f8a534d80c370a9e689f8f2784d150fc755cbb91382dac4'
            '057f0a306aee0d28a5bb6538b569c650e47c05b9848c9477cdeb7bb8c792944d')

--- a/mingw-w64-swig/pathtools.h
+++ b/mingw-w64-swig/pathtools.h
@ -18,6 +18,9 @@
 extern "C" {
 #endif

+/* In-place replaces any '\' with '/' and any '//' with '/' */
+void sanitise_path(char * path);
+
 /* Uses a host OS specific function to determine the path of the executable,
   if IMPLEMENT_SYS_GET_EXECUTABLE_PATH is defined, otherwise uses argv0. */
 int get_executable_path(char const * argv0, char * result, ssize_t max_size);