summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--autodoc/source/display/html/html_kit.cxx5
-rw-r--r--autodoc/source/exes/adc_uni/cmd_run.cxx9
-rw-r--r--autodoc/source/parser/cpp/cx_c_sub.cxx5
-rw-r--r--cosv/inc/cosv/ploc_dir.hxx8
-rw-r--r--cosv/source/service/std_outp.cxx6
-rw-r--r--cosv/source/storage/ploc_dir.cxx27
-rw-r--r--cosv/source/storage/plocroot.cxx6
7 files changed, 41 insertions, 25 deletions
diff --git a/autodoc/source/display/html/html_kit.cxx b/autodoc/source/display/html/html_kit.cxx
index c148730c3437..f5cc14619c7e 100644
--- a/autodoc/source/display/html/html_kit.cxx
+++ b/autodoc/source/display/html/html_kit.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: html_kit.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: np $ $Date: 2002-03-08 14:45:23 $
+ * last change: $Author: np $ $Date: 2002-05-02 12:36:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,6 +65,7 @@
// NOT FULLY DEFINED SERVICES
+#include <stdio.h>
#include <ary/cpp/c_slntry.hxx>
#include "hdimpl.hxx"
diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx
index af55940f2679..e9b4dda18288 100644
--- a/autodoc/source/exes/adc_uni/cmd_run.cxx
+++ b/autodoc/source/exes/adc_uni/cmd_run.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cmd_run.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: np $ $Date: 2002-03-08 14:45:27 $
+ * last change: $Author: np $ $Date: 2002-05-02 12:36:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -66,6 +66,7 @@
// NOT FULLY DEFINED SERVICES
#include <cosv/x.hxx>
+#include <cosv/ploc.hxx>
#include <ary/ary.hxx>
#include <ary/ary.hxx>
#include <ary/cpp/c_rwgate.hxx>
@@ -346,7 +347,7 @@ CommandRunner::GatherFiles( FileCollector_Ifc & o_rFiles,
i_rProject.aRootDirectory.Get( aDir );
uintt nProjectDir_AddPosition =
- (strcmp(aDir.c_str(),".\\") == 0)
+ ( strcmp(aDir.c_str(),".\\") == 0 OR strcmp(aDir.c_str(),"./") == 0 )
? 0
: uintt( aDir.tellp() );
@@ -457,7 +458,7 @@ Recursive_PutOutNamespace( csi::uidl::Display & o_rDisplay,
{
static StreamStr sPath(512);
sPath.seekp(0);
- i_rNamespace.GetFullName( sPath, "\\");
+ i_rNamespace.GetFullName( sPath, csv::ploc::Delimiter() );
o_rDisplay.InitModule( i_rNamespace.Name(),
sPath.c_str(),
i_rNamespace.Depth() );
diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx
index 99fc8953b213..4bf4fb3113f2 100644
--- a/autodoc/source/parser/cpp/cx_c_sub.cxx
+++ b/autodoc/source/parser/cpp/cx_c_sub.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cx_c_sub.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: np $ $Date: 2002-03-08 14:45:29 $
+ * last change: $Author: np $ $Date: 2002-05-02 12:36:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,6 +65,7 @@
// NOT FULLY DECLARED SERVICES
+#include <ctype.h>
#include "c_dealer.hxx"
#include <tokens/parseinc.hxx>
#include <x_parse.hxx>
diff --git a/cosv/inc/cosv/ploc_dir.hxx b/cosv/inc/cosv/ploc_dir.hxx
index 585af589fae0..1dfd2634dd39 100644
--- a/cosv/inc/cosv/ploc_dir.hxx
+++ b/cosv/inc/cosv/ploc_dir.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ploc_dir.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: np $ $Date: 2002-03-08 14:25:39 $
+ * last change: $Author: np $ $Date: 2002-05-02 12:35:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -109,7 +109,7 @@ class Directory : public Persistent
// OPERATIONS
bool PhysicalCreate(
- bool i_bCreateParentsIfNecessary = true );
+ bool i_bCreateParentsIfNecessary = true ) const;
// INQUIRY
void GetContainedDirectories(
@@ -133,7 +133,7 @@ class Directory : public Persistent
true, if parent(!) directory exists or could be created.
false, if this is a root directory.
*/
- bool Check_Parent();
+ bool Check_Parent() const;
bool PhysicalCreate_Dir(
const char * i_sStr ) const;
// DATA
diff --git a/cosv/source/service/std_outp.cxx b/cosv/source/service/std_outp.cxx
index c40f6c704dde..6496303802ac 100644
--- a/cosv/source/service/std_outp.cxx
+++ b/cosv/source/service/std_outp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: std_outp.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: np $ $Date: 2002-03-08 14:25:39 $
+ * last change: $Author: np $ $Date: 2002-05-02 12:35:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -63,6 +63,8 @@
#include <cosv/std_outp.hxx>
// NOT FULLY DECLARED SERVICES
+#include <stdlib.h>
+
namespace csv
{
diff --git a/cosv/source/storage/ploc_dir.cxx b/cosv/source/storage/ploc_dir.cxx
index d734c07c91a5..3b8e805bf940 100644
--- a/cosv/source/storage/ploc_dir.cxx
+++ b/cosv/source/storage/ploc_dir.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ploc_dir.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: np $ $Date: 2002-03-22 10:28:16 $
+ * last change: $Author: np $ $Date: 2002-05-02 12:35:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -126,7 +126,7 @@ Directory::operator-=( uintt i_nLevels )
}
bool
-Directory::PhysicalCreate( bool i_bCreateParentsIfNecessary )
+Directory::PhysicalCreate( bool i_bCreateParentsIfNecessary ) const
{
bool ret = PhysicalCreate_Dir( StrPath() );
if ( ret OR NOT i_bCreateParentsIfNecessary )
@@ -139,7 +139,7 @@ Directory::PhysicalCreate( bool i_bCreateParentsIfNecessary )
}
bool
-Directory::Check_Parent()
+Directory::Check_Parent() const
{
// There is no parent of root directories:
if ( aPath.DirChain().Size() == 0 )
@@ -147,7 +147,7 @@ Directory::Check_Parent()
// Become my own parent:
String sLastToken = aPath.DirChain().Back();
- operator-=(1);
+ const_cast< Directory* >(this)->operator-=(1);
// Begin behaving as parent:
bool ret = Exists();
@@ -160,7 +160,7 @@ Directory::Check_Parent()
// End behaving as parent.
// Become myself again:
- operator+=(sLastToken);
+ const_cast< Directory* >(this)->operator+=(sLastToken);
return ret;
}
@@ -267,13 +267,21 @@ Directory::PhysicalCreate_Dir( const char * i_sStr ) const
void
Directory::GetContainedDirectories( StringVector & o_rResult ) const
{
+ StreamStr sNew(240);
+ sNew << aPath;
+ StreamStr::size_type
+ nStartFilename = sNew.tellp();
+
DIR * pDir = opendir( StrPath() );
dirent * pEntry = 0;
struct stat aEntryStatus;
while ( (pEntry = readdir(pDir)) != 0 )
{
- stat(pEntry->d_name, &aEntryStatus);
+ sNew.seekp(nStartFilename);
+ sNew << pEntry->d_name;
+
+ stat(sNew.c_str(), &aEntryStatus);
if ( (aEntryStatus.st_mode & S_IFDIR) == S_IFDIR
AND *pEntry->d_name != '.' )
{
@@ -304,7 +312,10 @@ Directory::GetContainedFiles( StringVector & o_rResult,
while ( (pEntry = readdir(pDir)) != 0 )
{
- stat(pEntry->d_name, &aEntryStatus);
+ sNew.seekp(nStartFilename);
+ sNew << pEntry->d_name;
+
+ stat(sNew.c_str(), &aEntryStatus);
if ( (aEntryStatus.st_mode & S_IFDIR) == S_IFDIR )
continue; // Don't gather directories.
diff --git a/cosv/source/storage/plocroot.cxx b/cosv/source/storage/plocroot.cxx
index b6f7f57d2f8c..b44a1dc7cddc 100644
--- a/cosv/source/storage/plocroot.cxx
+++ b/cosv/source/storage/plocroot.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: plocroot.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: np $ $Date: 2002-03-08 14:25:40 $
+ * last change: $Author: np $ $Date: 2002-05-02 12:35:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,7 +64,7 @@
// NOT FULLY DECLARED SERVICES
// #include <cosv/bstream.hxx>
-// #include <ctype.h>
+#include <ctype.h>
namespace csv
generated by cgit (git 2.34.1) at 2024-07-11 17:41:55 +0000