walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Formatting: uniformize end of lines.

This commit is contained in:
Nicolas Le Cam 2008-12-14 22:03:49 +00:00
parent 3851c0f019
commit 24c978d5d2
2 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
FileLister.cpp
View File

@ -17,8 +17,8 @@
*/
#include "FileLister.h"
#include <sstream>
#include <vector>
#include <sstream>
#include <vector>
#include <string>
#ifdef __GNUC__
@ -28,61 +28,61 @@
#if defined(__BORLANDC__) || defined(_MSC_VER)
#include <windows.h>
#endif
std::string FileLister::simplifyPath( const char *originalPath )
{
std::string subPath = "";
std::vector<std::string> pathParts;
for( ; *originalPath; ++originalPath )
{
if( *originalPath == '/' )
{
if( subPath.length() > 0 )
{
pathParts.push_back( subPath );
subPath = "";
}
pathParts.push_back( "/" );
}
else
subPath.append( 1, *originalPath );
}
if( subPath.length() > 0 )
pathParts.push_back( subPath );
for( std::vector<std::string>::size_type i = 0; i < pathParts.size(); ++i )
{
if( pathParts[i] == ".." && i > 1 )
{
pathParts.erase( pathParts.begin() + i );
pathParts.erase( pathParts.begin()+i-1 );
pathParts.erase( pathParts.begin()+i-2 );
i = 0;
}
else if( i > 0 && pathParts[i] == "." )
{
pathParts.erase( pathParts.begin()+i );
i = 0;
}
else if( pathParts[i] == "/" && i > 0 && pathParts[i-1] == "/" )
{
pathParts.erase( pathParts.begin()+i-1 );
i = 0;
}
}
std::ostringstream oss;
for( std::vector<std::string>::size_type i = 0; i < pathParts.size(); ++i )
{
oss << pathParts[i];
}
return oss.str();
}
std::string FileLister::simplifyPath( const char *originalPath )
{
std::string subPath = "";
std::vector<std::string> pathParts;
for( ; *originalPath; ++originalPath )
{
if( *originalPath == '/' )
{
if( subPath.length() > 0 )
{
pathParts.push_back( subPath );
subPath = "";
}
pathParts.push_back( "/" );
}
else
subPath.append( 1, *originalPath );
}
if( subPath.length() > 0 )
pathParts.push_back( subPath );
for( std::vector<std::string>::size_type i = 0; i < pathParts.size(); ++i )
{
if( pathParts[i] == ".." && i > 1 )
{
pathParts.erase( pathParts.begin() + i );
pathParts.erase( pathParts.begin()+i-1 );
pathParts.erase( pathParts.begin()+i-2 );
i = 0;
}
else if( i > 0 && pathParts[i] == "." )
{
pathParts.erase( pathParts.begin()+i );
i = 0;
}
else if( pathParts[i] == "/" && i > 0 && pathParts[i-1] == "/" )
{
pathParts.erase( pathParts.begin()+i-1 );
i = 0;
}
}
std::ostringstream oss;
for( std::vector<std::string>::size_type i = 0; i < pathParts.size(); ++i )
{
oss << pathParts[i];
}
return oss.str();
}
bool FileLister::AcceptFile( const std::string &filename )
{

2
tokenize.cpp
View File

@ -33,7 +33,7 @@
#include <list>
#include <algorithm>
#include <stdlib.h> // <- strtoul
#include <stdio.h>
#include <stdio.h>
#include <filelister.h>
#ifdef __BORLANDC__