[ooo-build-commit] .: patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 04:31:02 PDT 2010
patches/dev300/accept-underscores-in-hostnames.diff | 102 --------------------
patches/dev300/apply | 10 -
patches/dev300/win32-invalid-names.diff | 62 ------------
3 files changed, 174 deletions(-)
New commits:
commit 6e6d3da92f9c452a7d4bb6fb0f5b438818c85c8b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 13:30:37 2010 +0200
Move to git some more win32 patches
diff --git a/patches/dev300/accept-underscores-in-hostnames.diff b/patches/dev300/accept-underscores-in-hostnames.diff
deleted file mode 100644
index 8d743e4..0000000
--- a/patches/dev300/accept-underscores-in-hostnames.diff
+++ /dev/null
@@ -1,102 +0,0 @@
---- tools/source/fsys/urlobj.cxx
-+++ tools/source/fsys/urlobj.cxx
-@@ -2365,7 +2365,7 @@ bool INetURLObject::parseHost(
- aTheCanonic.append(sal_Unicode('['));
- eState = STATE_IP6;
- }
-- else if (INetMIME::isAlpha(*p))
-+ else if (INetMIME::isAlpha(*p) || *p == '_')
- eState = STATE_TOPLABEL;
- else if (INetMIME::isDigit(*p))
- {
-@@ -2383,19 +2383,19 @@ bool INetURLObject::parseHost(
- eState = STATE_LABEL_DOT;
- else if (*p == '-')
- eState = STATE_LABEL_HYPHEN;
-- else if (!INetMIME::isAlphanumeric(*p))
-+ else if (!INetMIME::isAlphanumeric(*p) && *p != '_')
- goto done;
- break;
-
- case STATE_LABEL_HYPHEN:
-- if (INetMIME::isAlphanumeric(*p))
-+ if (INetMIME::isAlphanumeric(*p) || *p == '_')
- eState = STATE_LABEL;
- else if (*p != '-')
- goto done;
- break;
-
- case STATE_LABEL_DOT:
-- if (INetMIME::isAlpha(*p))
-+ if (INetMIME::isAlpha(*p) || *p == '_')
- eState = STATE_TOPLABEL;
- else if (INetMIME::isDigit(*p))
- eState = STATE_LABEL;
-@@ -2408,19 +2408,19 @@ bool INetURLObject::parseHost(
- eState = STATE_TOPLABEL_DOT;
- else if (*p == '-')
- eState = STATE_TOPLABEL_HYPHEN;
-- else if (!INetMIME::isAlphanumeric(*p))
-+ else if (!INetMIME::isAlphanumeric(*p) && *p != '_')
- goto done;
- break;
-
- case STATE_TOPLABEL_HYPHEN:
-- if (INetMIME::isAlphanumeric(*p))
-+ if (INetMIME::isAlphanumeric(*p) || *p == '_')
- eState = STATE_TOPLABEL;
- else if (*p != '-')
- goto done;
- break;
-
- case STATE_TOPLABEL_DOT:
-- if (INetMIME::isAlpha(*p))
-+ if (INetMIME::isAlpha(*p) || *p == '_')
- eState = STATE_TOPLABEL;
- else if (INetMIME::isDigit(*p))
- eState = STATE_LABEL;
-@@ -2442,7 +2442,7 @@ bool INetURLObject::parseHost(
- eState = STATE_LABEL_DOT;
- else if (*p == '-')
- eState = STATE_LABEL_HYPHEN;
-- else if (INetMIME::isAlpha(*p))
-+ else if (INetMIME::isAlpha(*p) || *p == '_')
- eState = STATE_LABEL;
- else if (INetMIME::isDigit(*p))
- if (nDigits < 3)
-@@ -2457,7 +2457,7 @@ bool INetURLObject::parseHost(
- break;
-
- case STATE_IP4_DOT:
-- if (INetMIME::isAlpha(*p))
-+ if (INetMIME::isAlpha(*p) || *p == '_')
- eState = STATE_TOPLABEL;
- else if (INetMIME::isDigit(*p))
- {
-@@ -5311,7 +5311,7 @@
- switch (eState)
- {
- case STATE_DOT:
-- if (p != pEnd && INetMIME::isAlphanumeric(*p))
-+ if (p != pEnd && (INetMIME::isAlphanumeric(*p) || *p == '_'))
- {
- ++nLabels;
- eState = STATE_LABEL;
-@@ -5324,7 +5324,7 @@
- case STATE_LABEL:
- if (p != pEnd)
- {
-- if (INetMIME::isAlphanumeric(*p))
-+ if (INetMIME::isAlphanumeric(*p) || *p == '_')
- break;
- else if (*p == '.')
- {
-@@ -5342,7 +5342,7 @@
- case STATE_HYPHEN:
- if (p != pEnd)
- {
-- if (INetMIME::isAlphanumeric(*p))
-+ if (INetMIME::isAlphanumeric(*p) || *p == '_')
- {
- eState = STATE_LABEL;
- break;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1ab77a6..a8ec9c7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -417,12 +417,6 @@ xmlhelp-work-with-symlinks.diff, i#81138, pmladek
localize-pl-cygwin-paths.diff, tml
-# Allow some technically illegal pathname components on Win32
-# (directories with trailing spaces or periods) because some SMB
-# servers like Netware (and Samba, if mangled names = No) do serve
-# such directories if they exist on the server's host system.
-win32-invalid-names.diff, n#277603, tml
-
# make CustomUnitText "Pixel" localisable
customunittext-pixel.diff, i#61043, atimar
@@ -454,10 +448,6 @@ dialog-groupname-persist.diff, noelpwer, i#30823
ooo80816.selinux.bridges.diff, i#80816
-[ Win32Only ]
-accept-underscores-in-hostnames.diff, n#182422, tml
-
-
[ WebDAVUpstream ]
SectionOwner => jholesov
SectionIssue => i#29152
diff --git a/patches/dev300/win32-invalid-names.diff b/patches/dev300/win32-invalid-names.diff
deleted file mode 100644
index 02b96d9..0000000
--- a/patches/dev300/win32-invalid-names.diff
+++ /dev/null
@@ -1,62 +0,0 @@
----
- sal/osl/w32/file_url.cxx | 16 +++++++++++-----
- sal/osl/w32/file_url.h | 1 +
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git sal/osl/w32/file_url.cxx sal/osl/w32/file_url.cxx
-index 246874a..7f2e6ca 100644
---- sal/osl/w32/file_url.cxx
-+++ sal/osl/w32/file_url.cxx
-@@ -89,9 +89,10 @@ static BOOL IsValidFilePathComponent(
- case '.':
- if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
- {
-- if ( 1 == lpCurrent - lpComponent )
-+ if ( (dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD) ||
-+ 1 == lpCurrent - lpComponent )
- {
-- /* Current directory is O.K. */
-+ /* Either do allow periods anywhere, or current directory */
- lpComponentEnd = lpCurrent;
- break;
- }
-@@ -104,8 +105,13 @@ static BOOL IsValidFilePathComponent(
- }
- case 0:
- case ' ':
-- lpComponentEnd = lpCurrent - 1;
-- fValid = FALSE;
-+ if ( dwFlags & VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD )
-+ lpComponentEnd = lpCurrent;
-+ else
-+ {
-+ lpComponentEnd = lpCurrent - 1;
-+ fValid = FALSE;
-+ }
- break;
- default:
- lpComponentEnd = lpCurrent;
-@@ -375,7 +381,7 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
- lpComponent = lpszPath + i;
- }
-
-- fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags );
-+ fValid = IsValidFilePathComponent( lpComponent, &lpComponent, dwFlags | VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD);
-
- if ( fValid && lpComponent )
- {
-diff --git sal/osl/w32/file_url.h sal/osl/w32/file_url.h
-index 8af4b8a..7806eab 100644
---- sal/osl/w32/file_url.h
-+++ sal/osl/w32/file_url.h
-@@ -61,6 +61,7 @@ extern "C" {
- #define VALIDATEPATH_ALLOW_ELLIPSE 0x0002
- #define VALIDATEPATH_ALLOW_RELATIVE 0x0004
- #define VALIDATEPATH_ALLOW_UNC 0x0008
-+#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
-
- #define MAX_LONG_PATH 32767
-
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list