You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/11/27 14:44:41 UTC

[openoffice] branch Pilot-Pirx-patch-1 updated: Add files via upload

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch Pilot-Pirx-patch-1
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/Pilot-Pirx-patch-1 by this push:
     new 592db1f78e Add files via upload
592db1f78e is described below

commit 592db1f78e707e02edf9f484cf4fe864bc33fb94
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Sun Nov 27 15:44:37 2022 +0100

    Add files via upload
---
 main/solenv/src/dmake-cygwin64.patch | 48 ++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/main/solenv/src/dmake-cygwin64.patch b/main/solenv/src/dmake-cygwin64.patch
new file mode 100644
index 0000000000..31b6eedb99
--- /dev/null
+++ b/main/solenv/src/dmake-cygwin64.patch
@@ -0,0 +1,48 @@
+diff -Nur path.c path.c
+--- path.c	2011-09-25 18:53:42.000000000 +0200
++++ path.c	2018-03-04 08:13:24.836905800 +0200
+@@ -317,8 +317,8 @@
+ #if __CYGWIN__
+    /* Use cygwin function to convert a DOS path to a POSIX path. */
+    if( *path && path[1] == ':' && isalpha(*path) ) {
+-      int err = cygwin_conv_to_posix_path(path, cpath);
+-      if (err)
++      int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, path, cpath, PATH_MAX);
++      if (err < 0)
+ 	 Fatal( "error converting \"%s\" - %s\n",
+ 		path, strerror (errno));
+       if( path[2] != '/' && path[2] != '\\' )
+diff -Nur sysintf.c sysintf.c
+--- sysintf.c	2011-09-25 18:53:42.000000000 +0200
++++ sysintf.c	2018-03-04 08:15:54.315421400 +0200
+@@ -69,7 +69,7 @@
+ #   include <sys/timeb.h>
+ #endif
+ 
+-/* for cygwin_conv_to_posix_path() in Prolog() and for cygdospath()*/
++/* for cygwin_conv_path() in Prolog() and for cygdospath()*/
+ #if __CYGWIN__
+ #   include <sys/cygwin.h>
+ #endif
+@@ -538,8 +538,8 @@
+    if ( (CygDrvPre = MALLOC( PATH_MAX, char)) == NIL(char) )
+       No_ram();
+    else {
+-      int err = cygwin_conv_to_posix_path("c:", CygDrvPre);
+-      if (err)
++      int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, "c:", CygDrvPre, PATH_MAX);
++      if (err < 0)
+ 	 Fatal( "error converting \"%s\" - %s\n",
+ 		CygDrvPre, strerror (errno));
+       if( (CygDrvPreLen = strlen(CygDrvPre)) == 2 ) {
+@@ -1144,8 +1144,8 @@
+ 
+    if( *src && src[0] == '/' ) {
+       char *tmp;
+-      int err = cygwin_conv_to_win32_path(src, buf);
+-      if (err)
++      int err = cygwin_conv_path(CCP_POSIX_TO_WIN_A, src, buf, PATH_MAX);
++      if (err < 0)
+ 	 Fatal( "error converting \"%s\" - %s\n",
+ 		src, strerror (errno));
+