Fold file_path_helper.h into file_path_helper.hxx

Change-Id: Ifad9594eb6fa396e32818b6d2bafc16adb478994

5 files changed, 200 insertions, 237 deletions

diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index ae3781e11eaf..1ccd9bea484f 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file_path_helper.h"
 #include "file_path_helper.hxx"
 #include "uunxapi.hxx"
 
@@ -79,7 +78,7 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
     }
 }
 
-sal_Bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath)
+bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath)
 {
     OSL_PRECOND(0 != pustrPath, "osl_systemPathIsRelativePath: Invalid parameter");
     return ((0 == pustrPath) || (0 == pustrPath->length) || (pustrPath->buffer[0] != FPH_CHAR_PATH_SEPARATOR));
@@ -124,12 +123,12 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
     rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData);
 }
 
-sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
+bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
     const rtl_uString* pustrPath)
 {
     OSL_PRECOND(0 != pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter");
     if ((0 == pustrPath) || (0 == pustrPath->length))
-        return sal_False;
+        return false;
 
     rtl::OUString fdp;
     osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
@@ -139,7 +138,7 @@ sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
             !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData));
 }
 
-sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
+bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
     const rtl_uString* pustrPath)
 {
     OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
@@ -219,7 +218,7 @@ private:
     const sal_Unicode*  m_path_segment_end;
 };
 
-sal_Bool SAL_CALL osl_searchPath(
+bool SAL_CALL osl_searchPath(
     const rtl_uString* pustrFilePath,
     const rtl_uString* pustrSearchPathList,
     rtl_uString**      ppustrPathFound)
diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h
deleted file mode 100644
index 799f497ce475..000000000000
--- a/sal/osl/unx/file_path_helper.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
-#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
-
-#include <sal/types.h>
-#include <rtl/ustring.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/*******************************************
-   osl_systemPathRemoveSeparator
-   Removes the last separator from the
-   given system path if any and if the path
-   is not the root path '/'
-
-   @param  ppustrPath [inout] a system path
-           if the path is not the root path
-           and the last character is a
-           path separator it will be cut off
-              ppustrPath must not be NULL and
-           must point to a valid rtl_uString
-
-   @returns nothing
-
- ******************************************/
-
-void SAL_CALL osl_systemPathRemoveSeparator(
-    /*inout*/ rtl_uString* pustrPath);
-
-/*******************************************
-   osl_systemPathEnsureSeparator
-   Adds a trailing path separator to the
-   given system path if not already there
-   and if the path is not the root path '/'
-
-   @param  pustrPath [inout] a system path
-           if the path is not the root path
-           '/' and has no trailing separator
-           a separator will be added
-           ppustrPath must not be NULL and
-           must point to a valid rtl_uString
-
-   @returns nothing
-
- ******************************************/
-
-void SAL_CALL osl_systemPathEnsureSeparator(
-    rtl_uString** ppustrPath);
-
-/*******************************************
-   osl_systemPathIsRelativePath
-   Returns true if the given path is a
-   relative path and so starts not with '/'
-
-   @param  pustrPath [in] a system path
-           pustrPath must not be NULL
-
-   @returns sal_True if the given path
-            doesn't start with a separator
-            else sal_False will be returned
-
- ******************************************/
-
-sal_Bool SAL_CALL osl_systemPathIsRelativePath(
-    const rtl_uString* pustrPath);
-
-/******************************************
-   osl_systemPathMakeAbsolutePath
-   Append a relative path to a base path
-
-   @param  pustrBasePath [in] a system
-           path that will be considered as
-           base path
-           pustrBasePath must not be NULL
-
-   @param  pustrRelPath [in] a system path
-           that will be considered as
-           relative path
-           pustrBasePath must not be NULL
-
-   @param  ppustrAbsolutePath [out] the
-           resulting path which is a
-           concatination of the base and
-           the relative path
-           if base path is empty the
-           resulting absolute path is the
-           relative path
-           if relative path is empty the
-           resulting absolute path is the
-           base path
-           if base and relative path are
-           empty the resulting absolute
-           path is also empty
-           ppustrAbsolutePath must not be
-           NULL and *ppustrAbsolutePath
-           must be 0 or point to a valid
-           rtl_uString
-
- *****************************************/
-
-void SAL_CALL osl_systemPathMakeAbsolutePath(
-    const rtl_uString* pustrBasePath,
-    const rtl_uString* pustrRelPath,
-    rtl_uString**      ppustrAbsolutePath);
-
-/*****************************************
-   osl_systemPathGetFileOrLastDirectoryPart
-   Returns the file or the directory part
-   of the given path
-
-   @param pustrPath [in] a system path,
-          must not be NULL
-
-   @param ppustrFileOrDirPart [out] on
-          return receives the last part
-          of the given directory or the
-          file name
-          if pustrPath is the root path
-          '/' an empty string will be
-          returned
-          if pustrPath has a trailing
-          '/' the last part before the
-          '/' will be returned else
-          the part after the last '/'
-          will be returned
-
-   @returns nothing
-
- ****************************************/
-
-void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-    const rtl_uString*     pustrPath,
-    rtl_uString**       ppustrFileNameOrLastDirPart);
-
-/********************************************
-   osl_systemPathIsHiddenFileOrDirectoryEntry
-   Returns sal_True if the last part of
-   given system path is not '.' or '..'
-   alone and starts with a '.'
-
-   @param   pustrPath [in] a system path,
-            must not be NULL
-
-   @returns sal_True if the last part of
-            the given system path starts
-            with '.' or sal_False the last
-            part is '.' or '..' alone or
-            doesn't start with a dot
-
-*********************************************/
-
-sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
-    const rtl_uString* pustrPath);
-
-/************************************************
-   osl_systemPathIsLocalOrParentDirectoryEntry
-   Returns sal_True if the last part of the given
-   system path is the local directory entry '.'
-   or the parent directory entry '..'
-
-   @param   pustrPath [in] a system path,
-            must not be NULL
-
-   @returns sal_True if the last part of the
-            given system path is '.' or '..'
-            else sal_False
-
-************************************************/
-
-sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
-    const rtl_uString* pustrPath);
-
-/************************************************
-   osl_searchPath
-   Searches for a file name or path name in all
-   directories specified by a given path list.
-   Symbolic links in the resulting path will not be
-   resolved, it's up to the caller to do this.
-
-   @param   pustrFilePath [in] a file name or
-            directory name to search for, the name must
-            be provided as system path not as a file URL
-
-   @param   pustrSearchPathList [in] a ':'
-            separated list of paths in which to search for
-            the file or directory name
-
-   @param   ppustrPathFound [out] on success receives the
-            complete path of the file or directory found
-            as a system path
-
-   @returns sal_True if the specified file or
-   directory was found else sal_False
- ***********************************************/
-
-sal_Bool SAL_CALL osl_searchPath(
-    const rtl_uString* pustrFilePath,
-    const rtl_uString* pustrSearchPathList,
-    rtl_uString**      ppustrPathFound);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef _OSL_PATH_HELPER_H_ */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 6396ddbe96f1..9e72bf54cf16 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -20,9 +20,201 @@
 #ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
 #define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
 
-#include "file_path_helper.h"
+#include <sal/types.h>
+#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
+/*******************************************
+   osl_systemPathRemoveSeparator
+   Removes the last separator from the
+   given system path if any and if the path
+   is not the root path '/'
+
+   @param  ppustrPath [inout] a system path
+           if the path is not the root path
+           and the last character is a
+           path separator it will be cut off
+              ppustrPath must not be NULL and
+           must point to a valid rtl_uString
+
+   @returns nothing
+
+ ******************************************/
+
+void SAL_CALL osl_systemPathRemoveSeparator(
+    /*inout*/ rtl_uString* pustrPath);
+
+/*******************************************
+   osl_systemPathEnsureSeparator
+   Adds a trailing path separator to the
+   given system path if not already there
+   and if the path is not the root path '/'
+
+   @param  pustrPath [inout] a system path
+           if the path is not the root path
+           '/' and has no trailing separator
+           a separator will be added
+           ppustrPath must not be NULL and
+           must point to a valid rtl_uString
+
+   @returns nothing
+
+ ******************************************/
+
+void SAL_CALL osl_systemPathEnsureSeparator(
+    rtl_uString** ppustrPath);
+
+/*******************************************
+   osl_systemPathIsRelativePath
+   Returns true if the given path is a
+   relative path and so starts not with '/'
+
+   @param  pustrPath [in] a system path
+           pustrPath must not be NULL
+
+   @returns sal_True if the given path
+            doesn't start with a separator
+            else sal_False will be returned
+
+ ******************************************/
+
+bool SAL_CALL osl_systemPathIsRelativePath(
+    const rtl_uString* pustrPath);
+
+/******************************************
+   osl_systemPathMakeAbsolutePath
+   Append a relative path to a base path
+
+   @param  pustrBasePath [in] a system
+           path that will be considered as
+           base path
+           pustrBasePath must not be NULL
+
+   @param  pustrRelPath [in] a system path
+           that will be considered as
+           relative path
+           pustrBasePath must not be NULL
+
+   @param  ppustrAbsolutePath [out] the
+           resulting path which is a
+           concatination of the base and
+           the relative path
+           if base path is empty the
+           resulting absolute path is the
+           relative path
+           if relative path is empty the
+           resulting absolute path is the
+           base path
+           if base and relative path are
+           empty the resulting absolute
+           path is also empty
+           ppustrAbsolutePath must not be
+           NULL and *ppustrAbsolutePath
+           must be 0 or point to a valid
+           rtl_uString
+
+ *****************************************/
+
+void SAL_CALL osl_systemPathMakeAbsolutePath(
+    const rtl_uString* pustrBasePath,
+    const rtl_uString* pustrRelPath,
+    rtl_uString**      ppustrAbsolutePath);
+
+/*****************************************
+   osl_systemPathGetFileOrLastDirectoryPart
+   Returns the file or the directory part
+   of the given path
+
+   @param pustrPath [in] a system path,
+          must not be NULL
+
+   @param ppustrFileOrDirPart [out] on
+          return receives the last part
+          of the given directory or the
+          file name
+          if pustrPath is the root path
+          '/' an empty string will be
+          returned
+          if pustrPath has a trailing
+          '/' the last part before the
+          '/' will be returned else
+          the part after the last '/'
+          will be returned
+
+   @returns nothing
+
+ ****************************************/
+
+void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
+    const rtl_uString*     pustrPath,
+    rtl_uString**       ppustrFileNameOrLastDirPart);
+
+/********************************************
+   osl_systemPathIsHiddenFileOrDirectoryEntry
+   Returns sal_True if the last part of
+   given system path is not '.' or '..'
+   alone and starts with a '.'
+
+   @param   pustrPath [in] a system path,
+            must not be NULL
+
+   @returns sal_True if the last part of
+            the given system path starts
+            with '.' or sal_False the last
+            part is '.' or '..' alone or
+            doesn't start with a dot
+
+*********************************************/
+
+bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
+    const rtl_uString* pustrPath);
+
+/************************************************
+   osl_systemPathIsLocalOrParentDirectoryEntry
+   Returns sal_True if the last part of the given
+   system path is the local directory entry '.'
+   or the parent directory entry '..'
+
+   @param   pustrPath [in] a system path,
+            must not be NULL
+
+   @returns sal_True if the last part of the
+            given system path is '.' or '..'
+            else sal_False
+
+************************************************/
+
+bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
+    const rtl_uString* pustrPath);
+
+/************************************************
+   osl_searchPath
+   Searches for a file name or path name in all
+   directories specified by a given path list.
+   Symbolic links in the resulting path will not be
+   resolved, it's up to the caller to do this.
+
+   @param   pustrFilePath [in] a file name or
+            directory name to search for, the name must
+            be provided as system path not as a file URL
+
+   @param   pustrSearchPathList [in] a ':'
+            separated list of paths in which to search for
+            the file or directory name
+
+   @param   ppustrPathFound [out] on success receives the
+            complete path of the file or directory found
+            as a system path
+
+   @returns sal_True if the specified file or
+   directory was found else sal_False
+ ***********************************************/
+
+bool SAL_CALL osl_searchPath(
+    const rtl_uString* pustrFilePath,
+    const rtl_uString* pustrSearchPathList,
+    rtl_uString**      ppustrPathFound);
+
 namespace osl
 {
 
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 749bfc0f693f..56c4925a2391 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -31,7 +31,7 @@
 #include "rtl/ustring.hxx"
 #include "rtl/strbuf.h"
 
-#include "file_path_helper.h"
+#include "file_path_helper.hxx"
 
 #include "uunxapi.hxx"
 #include "getexecutablefile.hxx"
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 49f0e119c867..75d3329fcb22 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -75,7 +75,7 @@
 #include <rtl/bootstrap.h>
 #include <rtl/digest.h>
 
-#include "file_path_helper.h"
+#include "file_path_helper.hxx"
 
 #define ACT_IGNORE  1
 #define ACT_EXIT    2