Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

curl: use plain copies of mingw-w64-pathtools's sources

Browse Source 
This patch changes the files so that the pathtools source code from the
`mingw-w64-pathtools` directory is used.

Sadly, we cannot use relative paths (which is forbidden by `PKGBUILD`)
nor symbolic links (because of MSYS2's inadequate support for symbolic
links). Therefore we do the next best thing: we copy the code and add a
check to ensure that the code hasn't gone stale.

Note: This is not _quite_ an idempotent change, as the
`mingw-w64-pathtools` folder offers the `get_relocated_path()`, the
`single_path_relocation()` and the `pathlist_relocation()` function,
which cURL does not need. However, in the interest of avoiding
duplication, this is the right thing to do, and the other functions'
implementations are identical to what was in
`0001-Make-cURL-relocatable.patch`.

Also note: an earlier attempt wanted to hard-code a certain
MINGW-packages commit from which to download the pathtools via https://
from GitHub, i.e. despite cloning the repository and having the source
code locally already, the `PKGBUILD` would insist on loading a
potentially different revision from elsewhere. However, this would cause
problems in the future when contributors want to open a PR to update the
pathtools _and test before pushing_ (which is the good practice,
though). Therefore we use copied files instead.

Co-authored-by: Biswapriyo Nath <nathbappai@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2021-07-19 09:12:43 +02:00
parent 93bb57f426
commit 31374aacd4
4 changed files with 648 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

608
mingw-w64-curl/0001-Make-cURL-relocatable.patch
View File

@@ -22,12 +22,8 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
configure.ac | 1 +
lib/Makefile.inc | 5 +-
lib/curl_config.h.in | 3 +
lib/pathtools.c | 539 +++++++++++++++++++++++++++++++++++++++++++++++++++
lib/pathtools.h | 53 +++++
lib/url.c | 26 ++-
6 files changed, 624 insertions(+), 3 deletions(-)
create mode 100644 lib/pathtools.c
create mode 100644 lib/pathtools.h
diff --git a/configure.ac b/configure.ac
index 798fa5f1e..2ed766c0d 100755
@@ -75,610 +71,6 @@ index 0f2a80403..9bad51f8d 100644
/* to disable cookies support */
#undef CURL_DISABLE_COOKIES
diff --git a/lib/pathtools.c b/lib/pathtools.c
new file mode 100644
index 000000000..c66df924b
--- /dev/null
+++ b/lib/pathtools.c
@@ -0,0 +1,539 @@
+/*
+ .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>.
+ */
+
+#if defined(__APPLE__)
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#if defined(__linux__) || defined(__CYGWIN__) || defined(__MSYS__)
+#include <alloca.h>
+#endif
+#include <unistd.h>
+
+/* If you don't define this, then get_executable_path()
+ can only use argv[0] which will often not work well */
+#define IMPLEMENT_SYS_GET_EXECUTABLE_PATH
+
+#if defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH)
+#if defined(__linux__)
+/* Nothing needed, unistd.h is enough. */
+#elif defined(__APPLE__)
+#include <mach-o/dyld.h>
+#elif defined(_WIN32)
+#define WIN32_MEAN_AND_LEAN
+#include <windows.h>
+#include <psapi.h>
+#endif
+#endif /* defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH) */
+
+#include "pathtools.h"
+
+char *
+malloc_copy_string(char const * original)
+{
+ char * result = (char *) malloc (sizeof (char*) * strlen (original)+1);
+ if (result != NULL)
+ {
+ strcpy (result, original);
+ }
+ return result;
+}
+
+void
+sanitise_path(char * path)
+{
+ size_t path_size = strlen (path);
+
+ /* Replace any '\' with '/' */
+ char * path_p = path;
+ while ((path_p = strchr (path_p, '\\')) != NULL)
+ {
+ *path_p = '/';
+ }
+ /* Replace any '//' with '/' */
+ path_p = path + !!*path; /* skip first character, if any, to handle UNC paths correctly */
+ while ((path_p = strstr (path_p, "//")) != NULL)
+ {
+ memmove (path_p, path_p + 1, path_size--);
+ }
+ return;
+}
+
+char *
+get_relative_path(char const * from_in, char const * to_in)
+{
+ size_t from_size = (from_in == NULL) ? 0 : strlen (from_in);
+ size_t to_size = (to_in == NULL) ? 0 : strlen (to_in);
+ size_t max_size = (from_size + to_size) * 2 + 4;
+ char * scratch_space = (char *) alloca (from_size + 1 + to_size + 1 + max_size + max_size);
+ char * from;
+ char * to;
+ char * common_part;
+ char * result;
+ size_t count;
+
+ /* No to, return "./" */
+ if (to_in == NULL)
+ {
+ return malloc_copy_string ("./");
+ }
+
+ /* If alloca failed or no from was given return a copy of to */
+ if ( from_in == NULL
+ || scratch_space == NULL )
+ {
+ return malloc_copy_string (to_in);
+ }
+
+ from = scratch_space;
+ strcpy (from, from_in);
+ to = from + from_size + 1;
+ strcpy (to, to_in);
+ common_part = to + to_size + 1;
+ result = common_part + max_size;
+ simplify_path (from);
+ simplify_path (to);
+
+ result[0] = '\0';
+
+ size_t match_size_dirsep = 0; /* The match size up to the last /. Always wind back to this - 1 */
+ size_t match_size = 0; /* The running (and final) match size. */
+ size_t largest_size = (from_size > to_size) ? from_size : to_size;
+ int to_final_is_slash = (to[to_size-1] == '/') ? 1 : 0;
+ char from_c;
+ char to_c;
+ for (match_size = 0; match_size < largest_size; ++match_size)
+ {
+ /* To simplify the logic, always pretend the strings end with '/' */
+ from_c = (match_size < from_size) ? from[match_size] : '/';
+ to_c = (match_size < to_size) ? to[match_size] : '/';
+
+ if (from_c != to_c)
+ {
+ if (from_c != '\0' || to_c != '\0')
+ {
+ match_size = match_size_dirsep;
+ }
+ break;
+ }
+ else if (from_c == '/')
+ {
+ match_size_dirsep = match_size;
+ }
+ }
+ strncpy (common_part, from, match_size);
+ common_part[match_size] = '\0';
+ from += match_size;
+ to += match_size;
+ size_t ndotdots = 0;
+ char const* from_last = from + strlen(from) - 1;
+ while ((from = strchr (from, '/')) && from != from_last)
+ {
+ ++ndotdots;
+ ++from;
+ }
+ for (count = 0; count < ndotdots; ++count)
+ {
+ strcat(result, "../");
+ }
+ if (strlen(to) > 0)
+ {
+ strcat(result, to+1);
+ }
+ /* Make sure that if to ends with '/' result does the same, and
+ vice-versa. */
+ size_t size_result = strlen(result);
+ if ((to_final_is_slash == 1)
+ && (!size_result || result[size_result-1] != '/'))
+ {
+ strcat (result, "/");
+ }
+ else if (!to_final_is_slash
+ && size_result && result[size_result-1] == '/')
+ {
+ result[size_result-1] = '\0';
+ }
+
+ return malloc_copy_string (result);
+}
+
+void
+simplify_path(char * path)
+{
+ ssize_t n_toks = 1; /* in-case we need an empty initial token. */
+ ssize_t i, j;
+ size_t tok_size;
+ size_t in_size = strlen (path);
+ int it_ended_with_a_slash = (path[in_size - 1] == '/') ? 1 : 0;
+ char * result = path;
+ if (path[0] == '/' && path[1] == '/') {
+ /* preserve UNC path */
+ path++;
+ in_size--;
+ result++;
+ }
+ sanitise_path(result);
+ char * result_p = result;
+
+ do
+ {
+ ++n_toks;
+ ++result_p;
+ } while ((result_p = strchr (result_p, '/')) != NULL);
+
+ result_p = result;
+ char const ** toks = (char const **) alloca (sizeof (char const*) * n_toks);
+ n_toks = 0;
+ do
+ {
+ if (result_p > result)
+ {
+ *result_p++ = '\0';
+ }
+ else if (*result_p == '/')
+ {
+ /* A leading / creates an empty initial token. */
+ toks[n_toks++] = result_p;
+ *result_p++ = '\0';
+ }
+ toks[n_toks++] = result_p;
+ } while ((result_p = strchr (result_p, '/')) != NULL);
+
+ /* Remove all non-leading '.' and any '..' we can match
+ with an earlier forward path (i.e. neither '.' nor '..') */
+ for (i = 1; i < n_toks; ++i)
+ {
+ int removals[2] = { -1, -1 };
+ if ( strcmp (toks[i], "." ) == 0)
+ {
+ removals[0] = i;
+ }
+ else if ( strcmp (toks[i], ".." ) == 0)
+ {
+ /* Search backwards for a forward path to collapse.
+ If none are found then the .. also stays. */
+ for (j = i - 1; j > -1; --j)
+ {
+ if ( strcmp (toks[j], "." )
+ && strcmp (toks[j], ".." ) )
+ {
+ removals[0] = j;
+ removals[1] = i;
+ break;
+ }
+ }
+ }
+ for (j = 0; j < 2; ++j)
+ {
+ if (removals[j] >= 0) /* Can become -2 */
+ {
+ --n_toks;
+ memmove (&toks[removals[j]], &toks[removals[j]+1], (n_toks - removals[j])*sizeof (char*));
+ --i;
+ if (!j)
+ {
+ --removals[1];
+ }
+ }
+ }
+ }
+ result_p = result;
+ for (i = 0; i < n_toks; ++i)
+ {
+ tok_size = strlen(toks[i]);
+ memmove (result_p, toks[i], tok_size);
+ result_p += tok_size;
+ if ((!i || tok_size) && ((i < n_toks - 1) || it_ended_with_a_slash == 1))
+ {
+ *result_p = '/';
+ ++result_p;
+ }
+ }
+ *result_p = '\0';
+}
+
+/* Returns actual_to by calculating the relative path from -> to and
+ applying that to actual_from. An assumption that actual_from is a
+ dir is made, and it may or may not end with a '/' */
+char const *
+get_relocated_path (char const * from, char const * to, char const * actual_from)
+{
+ char const * relative_from_to = get_relative_path (from, to);
+ char * actual_to = (char *) malloc (strlen(actual_from) + 2 + strlen(relative_from_to));
+ return actual_to;
+}
+
+int
+get_executable_path(char const * argv0, char * result, ssize_t max_size)
+{
+ char * system_result = (char *) alloca (max_size);
+ ssize_t system_result_size = -1;
+ ssize_t result_size = -1;
+
+ if (system_result != NULL)
+ {
+#if defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH)
+#if defined(__linux__) || defined(__CYGWIN__) || defined(__MSYS__)
+ system_result_size = readlink("/proc/self/exe", system_result, max_size);
+#elif defined(__APPLE__)
+ uint32_t bufsize = (uint32_t)max_size;
+ if (_NSGetExecutablePath(system_result, &bufsize) == 0)
+ {
+ system_result_size = (ssize_t)bufsize;
+ }
+#elif defined(_WIN32)
+ unsigned long bufsize = (unsigned long)max_size;
+ system_result_size = GetModuleFileNameA(NULL, system_result, bufsize);
+ if (system_result_size == 0 || system_result_size == (ssize_t)bufsize)
+ {
+ /* Error, possibly not enough space. */
+ system_result_size = -1;
+ }
+ else
+ {
+ /* Early conversion to unix slashes instead of more changes
+ everywhere else .. */
+ char * winslash;
+ system_result[system_result_size] = '\0';
+ while ((winslash = strchr (system_result, '\\')) != NULL)
+ {
+ *winslash = '/';
+ }
+ }
+#else
+#warning "Don't know how to get executable path on this system"
+#endif
+#endif /* defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH) */
+ }
+ /* Use argv0 as a default in-case of failure */
+ if (system_result_size != -1)
+ {
+ strncpy (result, system_result, system_result_size);
+ result[system_result_size] = '\0';
+ }
+ else
+ {
+ if (argv0 != NULL)
+ {
+ strncpy (result, argv0, max_size);
+ result[max_size-1] = '\0';
+ }
+ else
+ {
+ result[0] = '\0';
+ }
+ }
+ result_size = strlen (result);
+ return result_size;
+}
+
+#if defined(_WIN32)
+int
+get_dll_path(char * result, unsigned long max_size)
+{
+ HMODULE handle;
+ char * p;
+ int ret;
+
+ if (!GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+ GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+ (LPCSTR) &get_dll_path, &handle))
+ {
+ return -1;
+ }
+
+ ret = GetModuleFileNameA(handle, result, max_size);
+ if (ret == 0 || ret == (int)max_size)
+ {
+ return -1;
+ }
+
+ /* Early conversion to unix slashes instead of more changes
+ everywhere else .. */
+ result[ret] = '\0';
+ p = result - 1;
+ while ((p = strchr (p + 1, '\\')) != NULL)
+ {
+ *p = '/';
+ }
+
+ return ret;
+}
+#endif
+
+char const *
+strip_n_prefix_folders(char const * path, size_t n)
+{
+ if (path == NULL)
+ {
+ return NULL;
+ }
+
+ if (path[0] != '/')
+ {
+ return path;
+ }
+
+ char const * last = path;
+ while (n-- && path != NULL)
+ {
+ last = path;
+ path = strchr (path + 1, '/');
+ }
+ return (path == NULL) ? last : path;
+}
+
+void
+strip_n_suffix_folders(char * path, size_t n)
+{
+ if (path == NULL)
+ {
+ return;
+ }
+ while (n--)
+ {
+ if (strrchr (path + 1, '/'))
+ {
+ *strrchr (path + 1, '/') = '\0';
+ }
+ else
+ {
+ return;
+ }
+ }
+ return;
+}
+
+size_t
+split_path_list(char const * path_list, char split_char, char *** arr)
+{
+ size_t path_count;
+ size_t path_list_size;
+ char const * path_list_p;
+
+ path_list_p = path_list;
+ if (path_list == NULL || path_list[0] == '\0')
+ {
+ return 0;
+ }
+ path_list_size = strlen (path_list);
+
+ path_count = 0;
+ do
+ {
+ ++path_count;
+ ++path_list_p;
+ }
+ while ((path_list_p = strchr (path_list_p, split_char)) != NULL);
+
+ /* allocate everything in one go. */
+ char * all_memory = (char *) malloc (sizeof (char *) * path_count + strlen(path_list) + 1);
+ if (all_memory == NULL)
+ return 0;
+ *arr = (char **)all_memory;
+ all_memory += sizeof (char *) * path_count;
+
+ path_count = 0;
+ path_list_p = path_list;
+ char const * next_path_list_p = 0;
+ do
+ {
+ next_path_list_p = strchr (path_list_p, split_char);
+ if (next_path_list_p != NULL)
+ {
+ ++next_path_list_p;
+ }
+ size_t this_size = (next_path_list_p != NULL)
+ ? next_path_list_p - path_list_p - 1
+ : &path_list[path_list_size] - path_list_p;
+ memcpy (all_memory, path_list_p, this_size);
+ all_memory[this_size] = '\0';
+ (*arr)[path_count++] = all_memory;
+ all_memory += this_size + 1;
+ } while ((path_list_p = next_path_list_p) != NULL);
+
+ return path_count;
+}
+
+char *
+get_relocated_path_list(char const * from, char const * to_path_list)
+{
+ char exe_path[MAX_PATH];
+ char * temp;
+ get_executable_path (NULL, &exe_path[0], sizeof (exe_path) / sizeof (exe_path[0]));
+ if ((temp = strrchr (exe_path, '/')) != NULL)
+ {
+ temp[1] = '\0';
+ }
+
+ char **arr = NULL;
+ /* Ask Alexey why he added this. Are we not 100% sure
+ that we're dealing with unix paths here? */
+ char split_char = ':';
+ if (strchr (to_path_list, ';'))
+ {
+ split_char = ';';
+ }
+ size_t count = split_path_list (to_path_list, split_char, &arr);
+ int result_size = 1 + (count - 1); /* count - 1 is for ; delim. */
+ size_t exe_path_size = strlen (exe_path);
+ size_t i;
+ /* Space required is:
+ count * (exe_path_size + strlen (rel_to_datadir))
+ rel_to_datadir upper bound is:
+ (count * strlen (from)) + (3 * num_slashes (from))
+ + strlen(arr[i]) + 1.
+ .. pathalogically num_slashes (from) is strlen (from)
+ (from = ////////) */
+ size_t space_required = (count * (exe_path_size + 4 * strlen (from))) + count - 1;
+ for (i = 0; i < count; ++i)
+ {
+ space_required += strlen (arr[i]);
+ }
+ char * scratch = (char *) alloca (space_required);
+ if (scratch == NULL)
+ return NULL;
+ for (i = 0; i < count; ++i)
+ {
+ char * rel_to_datadir = get_relative_path (from, arr[i]);
+ scratch[0] = '\0';
+ arr[i] = scratch;
+ strcat (scratch, exe_path);
+ strcat (scratch, rel_to_datadir);
+ simplify_path (arr[i]);
+ size_t arr_i_size = strlen (arr[i]);
+ result_size += arr_i_size;
+ scratch = arr[i] + arr_i_size + 1;
+ }
+ char * result = (char *) malloc (result_size);
+ if (result == NULL)
+ {
+ return NULL;
+ }
+ result[0] = '\0';
+ for (i = 0; i < count; ++i)
+ {
+ strcat (result, arr[i]);
+ if (i != count-1)
+ {
+#if defined(_WIN32)
+ strcat (result, ";");
+#else
+ strcat (result, ":");
+#endif
+ }
+ }
+ free ((void*)arr);
+ return result;
+}
diff --git a/lib/pathtools.h b/lib/pathtools.h
new file mode 100644
index 000000000..d4ff40f8a
--- /dev/null
+++ b/lib/pathtools.h
@@ -0,0 +1,53 @@
+/*
+ .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_H
+#define PATHTOOLS_H
+
+#include <unistd.h>
+#if defined(__APPLE__)
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#include <stdio.h>
+
+char * malloc_copy_string(char const * original);
+
+/* 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);
+
+#if defined(_WIN32)
+int get_dll_path(char * result, unsigned long max_size);
+#endif
+
+/* Where possible, in-place removes occourances of '.' and 'path/..' */
+void simplify_path(char * path);
+
+/* Allocates (via malloc) and returns the path to get from from to to. */
+char * get_relative_path(char const * from, char const * to);
+
+size_t split_path_list(char const * path_list, char split_char, char *** arr);
+
+/* Advances path along by the amount that removes n prefix folders. */
+char const *
+strip_n_prefix_folders(char const * path, size_t n);
+
+/* NULL terminates path to remove n suffix folders. */
+void
+strip_n_suffix_folders(char * path, size_t n);
+
+char * get_relocated_path_list(char const * from, char const * to_path_list);
+
+#endif /* PATHTOOLS_H */
diff --git a/lib/url.c b/lib/url.c
index 945d4e327..981e60d26 100644
--- a/lib/url.c

16
mingw-w64-curl/PKGBUILD
View File

@@ -14,7 +14,7 @@ _realname=curl
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}${_namesuff}"
pkgver=7.77.0
pkgrel=2
pkgrel=3
pkgdesc="Command line tool and library for transferring data with URLs. (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -46,12 +46,16 @@ if [ -n "${_namesuff}" ]; then
fi
options=('staticlibs')
source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//./_}/${_realname}-${pkgver}.tar.xz"{,.asc}
"pathtools.c"
"pathtools.h"
"0001-Make-cURL-relocatable.patch"
"0002-nghttp2-static.patch"
"0003-libpsl-static-libs.patch")
sha256sums=('0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b'
'SKIP'
'bf160265eafc7d29ab760bfa7a32588ecabf8da2f4d22aac9ef2a080d6d96836'
'6f1016e6647b6340fdceefaf24ff391f4c0ea3c785ddf70c9794ca2356797888'
'6ce4dcf4ef6c4bce48dbcb6f1b5226baf79f74ac76719fb0c06419a0aadb37a3'
'fb8237bf88775a93a8c55ee5ee8233c6e99b531c3713cbd0afc0552cb8b224c7'
'79eec8a337e375d5102fef884030ceacd163a79e5c495e9a974a6b9a11b60c61'
'7492d019036b5bec251bfbc3c0b40e5f16d3dd6b2515068835e087a6c21f19ad')
validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91' # Daniel Stenberg
@@ -59,8 +63,13 @@ validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91' # Daniel Stenberg
'4461EAF0F8E9097F48AF0555F9FEAFF9D34A1BDB')
prepare() {
test ! -d "${startdir}/../mingw-w64-pathtools" || {
cmp "${startdir}/../mingw-w64-pathtools/pathtools.c" "${srcdir}/pathtools.c" &&
cmp "${startdir}/../mingw-w64-pathtools/pathtools.h" "${srcdir}/pathtools.h"
} || exit 1
cd "${srcdir}/${_realname}-${pkgver}"
rm -f lib/pathtools.h lib/pathtools.c > /dev/null 2>&1 || true
cp -fHv "${srcdir}"/pathtools.[ch] lib/
patch -p1 -i "${srcdir}/0001-Make-cURL-relocatable.patch"
patch -p1 -i "${srcdir}/0002-nghttp2-static.patch"
patch -p1 -i "${srcdir}/0003-libpsl-static-libs.patch"
@@ -156,4 +165,5 @@ package() {
local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX})
sed -s "s|${PREFIX_DEPS}|${MINGW_PREFIX}|g" -i ${pkgdir}${MINGW_PREFIX}/bin/curl-config
sed -s "s|${PREFIX_DEPS}|${MINGW_PREFIX}|g" -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libcurl.pc
}

578
mingw-w64-curl/pathtools.c Normal file
View File

@@ -0,0 +1,578 @@
/*
.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>.
*/
#if defined(__APPLE__)
#include <stdlib.h>
#else
#include <malloc.h>
#endif
#include <limits.h>
#include <stdio.h>
#include <string.h>
#if defined(__linux__) || defined(__CYGWIN__) || defined(__MSYS__)
#include <alloca.h>
#endif
#include <unistd.h>
/* If you don't define this, then get_executable_path()
can only use argv[0] which will often not work well */
#define IMPLEMENT_SYS_GET_EXECUTABLE_PATH
#if defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH)
#if defined(__linux__) || defined(__CYGWIN__) || defined(__MSYS__)
/* Nothing needed, unistd.h is enough. */
#elif defined(__APPLE__)
#include <mach-o/dyld.h>
#elif defined(_WIN32)
#define WIN32_MEAN_AND_LEAN
#include <windows.h>
#include <psapi.h>
#endif
#endif /* defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH) */
#include "pathtools.h"
char *
malloc_copy_string(char const * original)
{
char * result = (char *) malloc (sizeof (char*) * strlen (original)+1);
if (result != NULL)
{
strcpy (result, original);
}
return result;
}
void
sanitise_path(char * path)
{
size_t path_size = strlen (path);
/* Replace any '\' with '/' */
char * path_p = path;
while ((path_p = strchr (path_p, '\\')) != NULL)
{
*path_p = '/';
}
/* Replace any '//' with '/' */
path_p = path + !!*path; /* skip first character, if any, to handle UNC paths correctly */
while ((path_p = strstr (path_p, "//")) != NULL)
{
memmove (path_p, path_p + 1, path_size--);
}
return;
}
char *
get_relative_path(char const * from_in, char const * to_in)
{
size_t from_size = (from_in == NULL) ? 0 : strlen (from_in);
size_t to_size = (to_in == NULL) ? 0 : strlen (to_in);
size_t max_size = (from_size + to_size) * 2 + 4;
char * scratch_space = (char *) alloca (from_size + 1 + to_size + 1 + max_size + max_size);
char * from;
char * to;
char * common_part;
char * result;
size_t count;
/* No to, return "./" */
if (to_in == NULL)
{
return malloc_copy_string ("./");
}
/* If alloca failed or no from was given return a copy of to */
if ( from_in == NULL
|| scratch_space == NULL )
{
return malloc_copy_string (to_in);
}
from = scratch_space;
strcpy (from, from_in);
to = from + from_size + 1;
strcpy (to, to_in);
common_part = to + to_size + 1;
result = common_part + max_size;
simplify_path (from);
simplify_path (to);
result[0] = '\0';
size_t match_size_dirsep = 0; /* The match size up to the last /. Always wind back to this - 1 */
size_t match_size = 0; /* The running (and final) match size. */
size_t largest_size = (from_size > to_size) ? from_size : to_size;
int to_final_is_slash = (to[to_size-1] == '/') ? 1 : 0;
char from_c;
char to_c;
for (match_size = 0; match_size < largest_size; ++match_size)
{
/* To simplify the logic, always pretend the strings end with '/' */
from_c = (match_size < from_size) ? from[match_size] : '/';
to_c = (match_size < to_size) ? to[match_size] : '/';
if (from_c != to_c)
{
if (from_c != '\0' || to_c != '\0')
{
match_size = match_size_dirsep;
}
break;
}
else if (from_c == '/')
{
match_size_dirsep = match_size;
}
}
strncpy (common_part, from, match_size);
common_part[match_size] = '\0';
from += match_size;
to += match_size;
size_t ndotdots = 0;
char const* from_last = from + strlen(from) - 1;
while ((from = strchr (from, '/')) && from != from_last)
{
++ndotdots;
++from;
}
for (count = 0; count < ndotdots; ++count)
{
strcat(result, "../");
}
if (strlen(to) > 0)
{
strcat(result, to+1);
}
/* Make sure that if to ends with '/' result does the same, and
vice-versa. */
size_t size_result = strlen(result);
if ((to_final_is_slash == 1)
&& (!size_result || result[size_result-1] != '/'))
{
strcat (result, "/");
}
else if (!to_final_is_slash
&& size_result && result[size_result-1] == '/')
{
result[size_result-1] = '\0';
}
return malloc_copy_string (result);
}
void
simplify_path(char * path)
{
ssize_t n_toks = 1; /* in-case we need an empty initial token. */
ssize_t i, j;
size_t tok_size;
size_t in_size = strlen (path);
int it_ended_with_a_slash = (path[in_size - 1] == '/') ? 1 : 0;
char * result = path;
if (path[0] == '/' && path[1] == '/') {
/* preserve UNC path */
path++;
in_size--;
result++;
}
sanitise_path(result);
char * result_p = result;
do
{
++n_toks;
++result_p;
} while ((result_p = strchr (result_p, '/')) != NULL);
result_p = result;
char const ** toks = (char const **) alloca (sizeof (char const*) * n_toks);
n_toks = 0;
do
{
if (result_p > result)
{
*result_p++ = '\0';
}
else if (*result_p == '/')
{
/* A leading / creates an empty initial token. */
toks[n_toks++] = result_p;
*result_p++ = '\0';
}
toks[n_toks++] = result_p;
} while ((result_p = strchr (result_p, '/')) != NULL);
/* Remove all non-leading '.' and any '..' we can match
with an earlier forward path (i.e. neither '.' nor '..') */
for (i = 1; i < n_toks; ++i)
{
int removals[2] = { -1, -1 };
if ( strcmp (toks[i], "." ) == 0)
{
removals[0] = i;
}
else if ( strcmp (toks[i], ".." ) == 0)
{
/* Search backwards for a forward path to collapse.
If none are found then the .. also stays. */
for (j = i - 1; j > -1; --j)
{
if ( strcmp (toks[j], "." )
&& strcmp (toks[j], ".." ) )
{
removals[0] = j;
removals[1] = i;
break;
}
}
}
for (j = 0; j < 2; ++j)
{
if (removals[j] >= 0) /* Can become -2 */
{
--n_toks;
memmove (&toks[removals[j]], &toks[removals[j]+1], (n_toks - removals[j])*sizeof (char*));
--i;
if (!j)
{
--removals[1];
}
}
}
}
result_p = result;
for (i = 0; i < n_toks; ++i)
{
tok_size = strlen(toks[i]);
memmove (result_p, toks[i], tok_size);
result_p += tok_size;
if ((!i || tok_size) && ((i < n_toks - 1) || it_ended_with_a_slash == 1))
{
*result_p = '/';
++result_p;
}
}
*result_p = '\0';
}
/* Returns actual_to by calculating the relative path from -> to and
applying that to actual_from. An assumption that actual_from is a
dir is made, and it may or may not end with a '/' */
char const *
get_relocated_path (char const * from, char const * to, char const * actual_from)
{
char const * relative_from_to = get_relative_path (from, to);
char * actual_to = (char *) malloc (strlen(actual_from) + 2 + strlen(relative_from_to));
return actual_to;
}
int
get_executable_path(char const * argv0, char * result, ssize_t max_size)
{
char * system_result = (char *) alloca (max_size);
ssize_t system_result_size = -1;
ssize_t result_size = -1;
if (system_result != NULL)
{
#if defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH)
#if defined(__linux__) || defined(__CYGWIN__) || defined(__MSYS__)
system_result_size = readlink("/proc/self/exe", system_result, max_size);
#elif defined(__APPLE__)
uint32_t bufsize = (uint32_t)max_size;
if (_NSGetExecutablePath(system_result, &bufsize) == 0)
{
system_result_size = (ssize_t)bufsize;
}
#elif defined(_WIN32)
unsigned long bufsize = (unsigned long)max_size;
system_result_size = GetModuleFileNameA(NULL, system_result, bufsize);
if (system_result_size == 0 || system_result_size == (ssize_t)bufsize)
{
/* Error, possibly not enough space. */
system_result_size = -1;
}
else
{
/* Early conversion to unix slashes instead of more changes
everywhere else .. */
char * winslash;
system_result[system_result_size] = '\0';
while ((winslash = strchr (system_result, '\\')) != NULL)
{
*winslash = '/';
}
}
#else
#warning "Don't know how to get executable path on this system"
#endif
#endif /* defined(IMPLEMENT_SYS_GET_EXECUTABLE_PATH) */
}
/* Use argv0 as a default in-case of failure */
if (system_result_size != -1)
{
strncpy (result, system_result, system_result_size);
result[system_result_size] = '\0';
}
else
{
if (argv0 != NULL)
{
strncpy (result, argv0, max_size);
result[max_size-1] = '\0';
}
else
{
result[0] = '\0';
}
}
result_size = strlen (result);
return result_size;
}
#if defined(_WIN32)
int
get_dll_path(char * result, unsigned long max_size)
{
HMODULE handle;
char * p;
int ret;
if (!GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
(LPCSTR) &get_dll_path, &handle))
{
return -1;
}
ret = GetModuleFileNameA(handle, result, max_size);
if (ret == 0 || ret == (int)max_size)
{
return -1;
}
/* Early conversion to unix slashes instead of more changes
everywhere else .. */
result[ret] = '\0';
p = result - 1;
while ((p = strchr (p + 1, '\\')) != NULL)
{
*p = '/';
}
return ret;
}
#endif
char const *
strip_n_prefix_folders(char const * path, size_t n)
{
if (path == NULL)
{
return NULL;
}
if (path[0] != '/')
{
return path;
}
char const * last = path;
while (n-- && path != NULL)
{
last = path;
path = strchr (path + 1, '/');
}
return (path == NULL) ? last : path;
}
void
strip_n_suffix_folders(char * path, size_t n)
{
if (path == NULL)
{
return;
}
while (n--)
{
if (strrchr (path + 1, '/'))
{
*strrchr (path + 1, '/') = '\0';
}
else
{
return;
}
}
return;
}
size_t
split_path_list(char const * path_list, char split_char, char *** arr)
{
size_t path_count;
size_t path_list_size;
char const * path_list_p;
path_list_p = path_list;
if (path_list == NULL || path_list[0] == '\0')
{
return 0;
}
path_list_size = strlen (path_list);
path_count = 0;
do
{
++path_count;
++path_list_p;
}
while ((path_list_p = strchr (path_list_p, split_char)) != NULL);
/* allocate everything in one go. */
char * all_memory = (char *) malloc (sizeof (char *) * path_count + strlen(path_list) + 1);
if (all_memory == NULL)
return 0;
*arr = (char **)all_memory;
all_memory += sizeof (char *) * path_count;
path_count = 0;
path_list_p = path_list;
char const * next_path_list_p = 0;
do
{
next_path_list_p = strchr (path_list_p, split_char);
if (next_path_list_p != NULL)
{
++next_path_list_p;
}
size_t this_size = (next_path_list_p != NULL)
? next_path_list_p - path_list_p - 1
: &path_list[path_list_size] - path_list_p;
memcpy (all_memory, path_list_p, this_size);
all_memory[this_size] = '\0';
(*arr)[path_count++] = all_memory;
all_memory += this_size + 1;
} while ((path_list_p = next_path_list_p) != NULL);
return path_count;
}
char *
get_relocated_path_list(char const * from, char const * to_path_list)
{
char exe_path[MAX_PATH];
char * temp;
get_executable_path (NULL, &exe_path[0], sizeof (exe_path) / sizeof (exe_path[0]));
if ((temp = strrchr (exe_path, '/')) != NULL)
{
temp[1] = '\0';
}
char **arr = NULL;
/* Ask Alexey why he added this. Are we not 100% sure
that we're dealing with unix paths here? */
char split_char = ':';
if (strchr (to_path_list, ';'))
{
split_char = ';';
}
size_t count = split_path_list (to_path_list, split_char, &arr);
int result_size = 1 + (count - 1); /* count - 1 is for ; delim. */
size_t exe_path_size = strlen (exe_path);
size_t i;
/* Space required is:
count * (exe_path_size + strlen (rel_to_datadir))
rel_to_datadir upper bound is:
(count * strlen (from)) + (3 * num_slashes (from))
+ strlen(arr[i]) + 1.
.. pathalogically num_slashes (from) is strlen (from)
(from = ////////) */
size_t space_required = (count * (exe_path_size + 4 * strlen (from))) + count - 1;
for (i = 0; i < count; ++i)
{
space_required += strlen (arr[i]);
}
char * scratch = (char *) alloca (space_required);
if (scratch == NULL)
return NULL;
for (i = 0; i < count; ++i)
{
char * rel_to_datadir = get_relative_path (from, arr[i]);
scratch[0] = '\0';
arr[i] = scratch;
strcat (scratch, exe_path);
strcat (scratch, rel_to_datadir);
simplify_path (arr[i]);
size_t arr_i_size = strlen (arr[i]);
result_size += arr_i_size;
scratch = arr[i] + arr_i_size + 1;
}
char * result = (char *) malloc (result_size);
if (result == NULL)
{
return NULL;
}
result[0] = '\0';
for (i = 0; i < count; ++i)
{
strcat (result, arr[i]);
if (i != count-1)
{
#if defined(_WIN32)
strcat (result, ";");
#else
strcat (result, ":");
#endif
}
}
free ((void*)arr);
return result;
}
char *
single_path_relocation(const char *from, const char *to)
{
#if defined(__MINGW32__)
char exe_path[PATH_MAX];
get_executable_path (NULL, &exe_path[0], sizeof(exe_path)/sizeof(exe_path[0]));
if (strrchr (exe_path, '/') != NULL)
{
strrchr (exe_path, '/')[1] = '\0';
}
char * rel_to_datadir = get_relative_path (from, to);
strcat (exe_path, rel_to_datadir);
simplify_path (&exe_path[0]);
return malloc_copy_string(exe_path);
#else
return malloc_copy_string(to);
#endif
}
char *
pathlist_relocation(const char *from_path, const char *to_path_list)
{
#if defined(__MINGW32__)
static char stored_path[PATH_MAX];
static int stored = 0;
if (stored == 0)
{
char const * relocated = get_relocated_path_list(from_path, to_path_list);
strncpy (stored_path, relocated, PATH_MAX);
stored_path[PATH_MAX-1] = '\0';
free ((void *)relocated);
stored = 1;
}
return stored_path;
#else
return (to_path_list);
#endif
}

57
mingw-w64-curl/pathtools.h Normal file
View File

@@ -0,0 +1,57 @@
/*
.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_H
#define PATHTOOLS_H
#include <unistd.h>
#if defined(__APPLE__)
#include <stdlib.h>
#else
#include <malloc.h>
#endif
#include <stdio.h>
char * malloc_copy_string(char const * original);
/* 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);
#if defined(_WIN32)
int get_dll_path(char * result, unsigned long max_size);
#endif
/* Where possible, in-place removes occourances of '.' and 'path/..' */
void simplify_path(char * path);
/* Allocates (via malloc) and returns the path to get from from to to. */
char * get_relative_path(char const * from, char const * to);
size_t split_path_list(char const * path_list, char split_char, char *** arr);
/* Advances path along by the amount that removes n prefix folders. */
char const *
strip_n_prefix_folders(char const * path, size_t n);
/* NULL terminates path to remove n suffix folders. */
void
strip_n_suffix_folders(char * path, size_t n);
char const * get_relocated_path (char const * from, char const * to, char const * actual_from);
char * get_relocated_path_list(char const * from, char const * to_path_list);
char * single_path_relocation(const char *from, const char *to);
char * pathlist_relocation(const char *from_path, const char *to_path_list);
#endif /* PATHTOOLS_H */