[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sal/osl

2015-10-16 Thread Giuseppe Castagno 
 sal/osl/w32/file_error.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9a75c72495ed6014d6c84fdead14bef68ea32858
Author: Giuseppe Castagno 
Date:   Thu Oct 8 11:04:07 2015 +0200

tdf#94888: Accessing Sharepoint r/o share through UNC path does not work

Added a Windows API missing error.

The error added:

ERROR_CANT_ACCESS_FILE
returned when a file cannot be accessed by the system.

Mapped to existent osl_File_E_ for compatibility.

Change-Id: Ia68cdf761a62db8960b143a69ccfa3e12fc6eac5
Reviewed-on: https://gerrit.libreoffice.org/19270
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit b49a2f7373e950efc3fe11b89309313ac69c1e1f)
Reviewed-on: https://gerrit.libreoffice.org/19374
Reviewed-by: Stephan Bergmann 

diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index 2d7243d..cdb8571 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -86,6 +86,7 @@ static const struct osl_file_error_entry errtable[] = {
   {  ERROR_FILE_CHECKED_OUT,   osl_File_E_ACCES},  /* 220 */
   {  ERROR_DIRECTORY,  osl_File_E_NOENT},  /* 267 */
   {  ERROR_NOT_ENOUGH_QUOTA,   osl_File_E_NOMEM},  /* 1816 */
+  {  ERROR_CANT_ACCESS_FILE,   osl_File_E_ACCES},  /* 1920 */
   {  ERROR_UNEXP_NET_ERR,  osl_File_E_NETWORK  }   /* 59 */
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sal/osl

2015-09-28 Thread Stephan Bergmann 
 sal/osl/unx/file_misc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23be91deb8858bb29793ae8cc9749cf1e5c3c9b2
Author: Stephan Bergmann 
Date:   Wed Sep 23 14:01:33 2015 +0200

Better fail with E_EXIST if rename(3) fails

...it leads to better handling of the failure downstream, if e.g. this is an
attempt to copy a file from the presets to an existing file of a previously
partly generated UserInstallation, and the presets and the UserInstallation 
are
on different drives and rename(3) fails with EXDEV.  (Without this fix, 
removing
the UserInstallation's registrymodifications.xcu caused restarting soffice 
to
fail with "User installation could not be completed" in this case; 
regression
introduced with 6edbcc1b231feb02f304ff646c323b5df051d9a4 "cid#1242936 handle
rename failure.")

Change-Id: I409698c4e2e6cc6ccd8b2be80a393c9657b5125d
(cherry picked from commit d2a7abebf210cacf9ea357dd8b4a0772be7308df)
Reviewed-on: https://gerrit.libreoffice.org/18898
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index a5bfc99..1e157d9 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -816,7 +816,7 @@ static oslFileError oslDoCopy(const sal_Char* 
pszSourceFileName, const sal_Char*
 "sal.osl",
 "rename(" << pszDestFileName << ", " << tmpDestFile
 << ") failed with errno " << e);
-return osl_File_E_BUSY; // for want of a better error code
+return osl_File_E_EXIST; // for want of a better error code
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sal/osl

2015-08-25 Thread Michael Meeks 
 sal/osl/unx/signal.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5cc5bb38445c9b0acf33b463d722b504ac84df6
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Aug 21 10:00:47 2015 +0100

tdf#93569 - restore ACT_ABORT distinction.

In order to handle signals, we need to have ACT_ABORT in place
and distinct from ACT_SYSTEM.

cf. if (Signals[i].Action != ACT_SYSTEM) during setup.

Change-Id: I8c69d48244ba462f2e2385a530cbbf4740ccee9a
Reviewed-on: https://gerrit.libreoffice.org/17893
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 050aa81..76ee790 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -65,7 +65,7 @@
 #define ACT_EXIT2
 #define ACT_SYSTEM  3
 #define ACT_HIDE4
-#define ACT_ABORT   ACT_SYSTEM
+#define ACT_ABORT   5
 
 #if defined HAVE_VALGRIND_HEADERS
 #include valgrind/memcheck.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sal/osl

2015-08-15 Thread Giuseppe Castagno 
 sal/osl/w32/file_error.c |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cbb45cdac9934aed4d4f98452ecd5a2b0bb05781
Author: Giuseppe Castagno giuseppe.casta...@acca-esse.eu
Date:   Tue Jul 14 17:15:15 2015 +0200

tdf#60381: Accessing Sharepoint share using UNC path does not work.

Added two Windows API missing errors.

The errors added:
ERROR_FILE_CHECKED_OUT
returned when trying to access a file that is locked
by another user.

ERROR_INVALID_NAME
returned when trying to access a local file with the wrong
chars in the path or file name.

Mapped to existent osl_File_E_ for compatibility.

Change-Id: I0bea1ff2727729c569b0a2cb6befd0d38289b8a2
Reviewed-on: https://gerrit.libreoffice.org/17412
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
(cherry picked from commit b7ae14655f8969069b882ae0bd43d79a4c92f357)
Reviewed-on: https://gerrit.libreoffice.org/17650
Reviewed-by: Giuseppe Castagno giuseppe.casta...@acca-esse.eu
Reviewed-by: Thorsten Behrens thorsten.behr...@cib.de

diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index 3697c9d..2d7243d 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -68,6 +68,7 @@ static const struct osl_file_error_entry errtable[] = {
   {  ERROR_BROKEN_PIPE,osl_File_E_PIPE },  /* 109 */
   {  ERROR_DISK_FULL,  osl_File_E_NOSPC},  /* 112 */
   {  ERROR_INVALID_TARGET_HANDLE,  osl_File_E_BADF },  /* 114 */
+  {  ERROR_INVALID_NAME,   osl_File_E_NOENT},  /* 123 */
   {  ERROR_INVALID_HANDLE, osl_File_E_INVAL},  /* 124 */
   {  ERROR_WAIT_NO_CHILDREN,   osl_File_E_CHILD},  /* 128 */
   {  ERROR_CHILD_NOT_COMPLETE, osl_File_E_CHILD},  /* 129 */
@@ -82,6 +83,7 @@ static const struct osl_file_error_entry errtable[] = {
   {  ERROR_ALREADY_EXISTS, osl_File_E_EXIST},  /* 183 */
   {  ERROR_FILENAME_EXCED_RANGE,   osl_File_E_NOENT},  /* 206 */
   {  ERROR_NESTING_NOT_ALLOWED,osl_File_E_AGAIN},  /* 215 */
+  {  ERROR_FILE_CHECKED_OUT,   osl_File_E_ACCES},  /* 220 */
   {  ERROR_DIRECTORY,  osl_File_E_NOENT},  /* 267 */
   {  ERROR_NOT_ENOUGH_QUOTA,   osl_File_E_NOMEM},  /* 1816 */
   {  ERROR_UNEXP_NET_ERR,  osl_File_E_NETWORK  }   /* 59 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits