[Libreoffice-commits] .: tools/inc tools/source

[François Tigeot]

 tools/inc/tools/fsys.hxx     |    1 -
 tools/source/fsys/comdep.hxx |    6 ++----
 tools/source/fsys/dirent.cxx |    9 ---------
 tools/source/fsys/unx.hxx    |    4 ----
 4 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit fcd3f72dabd721752e1ff6fec2c4e895ebec8052
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sat May 7 08:46:15 2011 +0200

    Unix System V has been dead for a long time.
    
    File names can be longer than 14 characters !

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 92c8c80..9a1adfd 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -122,7 +122,6 @@ enum FSysPathStyle
     FSYS_STYLE_OS2 = FSYS_STYLE_HPFS,
     FSYS_STYLE_NTFS,
     FSYS_STYLE_NWFS,
-    FSYS_STYLE_SYSV,
     FSYS_STYLE_BSD,
     FSYS_STYLE_UNX = FSYS_STYLE_BSD,
     FSYS_STYLE_MAC,
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index bc28901..d59cc02 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -40,11 +40,9 @@
                         ( ( e == FSYS_STYLE_VFAT || e == FSYS_STYLE_HPFS || \
                             e == FSYS_STYLE_FAT ) || e == FSYS_STYLE_NTFS ) \
                           ? '\\' : '/' )
-#define SEARCHDELIM(e)  ( (e == FSYS_STYLE_SYSV || e == FSYS_STYLE_BSD) ? ":" \
-                        : ";" )
+#define SEARCHDELIM(e)  ( (e == FSYS_STYLE_BSD) ? ":" : ";" )
 #define SEARCHDELIM_C(e)(char)\
-                        ( (e == FSYS_STYLE_SYSV || e == FSYS_STYLE_BSD) ? ':' \
-                        : ';' )
+                        ( (e == FSYS_STYLE_BSD) ? ':' : ';' )
 #define ACTPARENT(e)    ( (e == FSYS_STYLE_MAC) ? ":" : ".." )
 #define ACTCURRENT(e)   ( (e == FSYS_STYLE_MAC) ? "" : "." )
 
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 84ed562..96b6453 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -572,7 +572,6 @@ FSysError DirEntry::ImpParseName( const ByteString& rbInitName,
             return ImpParseOs2Name( rbInitName, eStyle );
 
         case FSYS_STYLE_BSD:
-        case FSYS_STYLE_SYSV:
             return ImpParseUnixName( rbInitName, eStyle );
 
         case FSYS_STYLE_MAC:
@@ -664,14 +663,6 @@ void DirEntry::ImpTrim( FSysPathStyle eStyle )
                 aName.ToUpperAscii();
             break;
 
-        case FSYS_STYLE_SYSV:
-            if ( aName.Len() > 14 )
-            {
-                nError = ERRCODE_IO_MISPLACEDCHAR|ERRCODE_WARNING_MASK;
-                aName.Erase( 14 );
-            }
-            break;
-
         case FSYS_STYLE_BSD:
             if ( aName.Len() > 250 )
             {
diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx
index 0436c92..0d5b7c6 100644
--- a/tools/source/fsys/unx.hxx
+++ b/tools/source/fsys/unx.hxx
@@ -47,11 +47,7 @@
 #define _getcwd         getcwd
 #define _access         access
 
-#ifdef SYSV3
-#define DEFSTYLE        FSYS_STYLE_SYSV
-#else
 #define DEFSTYLE        FSYS_STYLE_BSD
-#endif
 
 #define CMP_LOWER(s) 	(s)
 #define TEMPNAME()      tmpnam(0)