[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-8-gb
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-8-gb5c07e8 |
|
Date: |
Thu, 18 Feb 2010 16:53:05 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via b5c07e87e944324e3870d63b10115b87d45345f9 (commit)
from f94f2ccdd45fc7d0ebb4f41f125f706df0d755f4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b5c07e87e944324e3870d63b10115b87d45345f9
Author: Giuseppe Scrivano <address@hidden>
Date: Thu Feb 18 17:51:25 2010 +0100
Rename FilesUtility::fileExists to nodeExists and change its semantic.
Now FilesUtility::nodeExists return nonzero for any type of file, not
only regular files and directories.
diff --git a/myserver/include/base/file/files_utility.h
b/myserver/include/base/file/files_utility.h
index b2207d4..77e06a6 100644
--- a/myserver/include/base/file/files_utility.h
+++ b/myserver/include/base/file/files_utility.h
@@ -65,9 +65,9 @@ public:
static int getShortFileName (char*,char*,int);
- static int fileExists (const char * );
- static int fileExists (string const &file)
- {return fileExists (file.c_str ());}
+ static int nodeExists (const char * );
+ static int nodeExists (string const &file)
+ {return nodeExists (file.c_str ());}
static int deleteFile (const char * );
static int deleteFile (string const &file)
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index cc91636..90f50fa 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -229,7 +229,7 @@ const char *File::getFilename ()
*/
int File::createTemporaryFile (const char* filename)
{
- if (FilesUtility::fileExists (filename))
+ if (FilesUtility::nodeExists (filename))
FilesUtility::deleteFile (filename);
return openFile (filename, File::READ
diff --git a/myserver/src/base/file/files_utility.cpp
b/myserver/src/base/file/files_utility.cpp
index 971aa9b..4915950 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -259,7 +259,7 @@ int FilesUtility::isLink (const char* filename)
if (ret < 0)
return 0;
- return (S_ISLNK (F_Stats.st_mode))? 1 : 0;
+ return S_ISLNK (F_Stats.st_mode) ? 1 : 0;
#endif
}
@@ -268,7 +268,7 @@ int FilesUtility::isLink (const char* filename)
* Returns a non-null value if the given path is a valid file.
* \param filename The path to check.
*/
-int FilesUtility::fileExists (const char* filename)
+int FilesUtility::nodeExists (const char* filename)
{
#ifdef WIN32
HANDLE hFile = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ,
@@ -283,8 +283,8 @@ int FilesUtility::fileExists (const char* filename)
int ret = stat (filename, &fstats);
if (ret < 0)
return 0;
- /*! Return 1 if it is a regular file or a directory. */
- return (S_ISREG (fstats.st_mode) | S_ISDIR (fstats.st_mode))? 1 : 0;
+
+ return 1;
#endif
}
diff --git a/myserver/src/base/home_dir/home_dir.cpp
b/myserver/src/base/home_dir/home_dir.cpp
index 90b346c..23db24a 100644
--- a/myserver/src/base/home_dir/home_dir.cpp
+++ b/myserver/src/base/home_dir/home_dir.cpp
@@ -237,7 +237,7 @@ int HomeDir::getHomeDir (string& userName, string& out)
out.assign (data);
out.append ("/");
out.append (userName);
- return FilesUtility::fileExists (out.c_str ()) ? 0 : 1;
+ return FilesUtility::nodeExists (out.c_str ()) ? 0 : 1;
#elif HAVE_GETPWNAM
struct passwd *p;
int ret = 0;
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index 0a6dd3b..e175b86 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -65,7 +65,7 @@ int SslContext::initialize ()
/*
* The specified file doesn't exist.
*/
- if (FilesUtility::fileExists (certificateFile.c_str ()) == 0)
+ if (FilesUtility::nodeExists (certificateFile.c_str ()) == 0)
return -1;
if (SSL_CTX_use_certificate_file (context, certificateFile.c_str (),
@@ -75,7 +75,7 @@ int SslContext::initialize ()
/*
* The specified file doesn't exist.
*/
- if (FilesUtility::fileExists (privateKeyFile) == 0)
+ if (FilesUtility::nodeExists (privateKeyFile) == 0)
return -1;
if (SSL_CTX_use_PrivateKey_file (context, privateKeyFile.c_str (),
diff --git a/myserver/src/base/xml/xml_parser.cpp
b/myserver/src/base/xml/xml_parser.cpp
index b4845d9..efbe0f6 100644
--- a/myserver/src/base/xml/xml_parser.cpp
+++ b/myserver/src/base/xml/xml_parser.cpp
@@ -86,7 +86,7 @@ int XmlParser::open (const char* filename, bool useXpath)
cur = NULL;
this->useXpath = useXpath;
- if (!FilesUtility::fileExists (filename))
+ if (!FilesUtility::nodeExists (filename))
return -1;
if (doc!= NULL)
diff --git a/myserver/src/conf/security/security_cache.cpp
b/myserver/src/conf/security/security_cache.cpp
index d1e7398..e8d7e89 100644
--- a/myserver/src/conf/security/security_cache.cpp
+++ b/myserver/src/conf/security/security_cache.cpp
@@ -107,7 +107,7 @@ int SecurityCache::getSecurityFile (const string& dir,
secFile.append (secFileName);
/* The security file exists in the directory. */
- if (FilesUtility::fileExists (secFile))
+ if (FilesUtility::nodeExists (secFile))
{
out.assign (secFile);
return 0;
@@ -136,14 +136,14 @@ int SecurityCache::getSecurityFile (const string& dir,
out.assign (sys);
out.append ("/");
out.append (secFileName);
- return !FilesUtility::fileExists (out);
+ return !FilesUtility::nodeExists (out);
}
secFile.assign (file);
secFile.append ("/");
secFile.append (secFileName);
- found = FilesUtility::fileExists (secFile);
+ found = FilesUtility::nodeExists (secFile);
}
out.assign (secFile);
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index c647554..1b887d4 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -87,7 +87,7 @@ int Cgi::send (HttpThreadContext* td, const char* scriptpath,
td->scriptPath.assign (scriptpath);
- if (!FilesUtility::fileExists (scriptpath))
+ if (!FilesUtility::nodeExists (scriptpath))
return td->http->raiseHTTPError (404);
int subString = cgipath[0] == '"';
@@ -174,7 +174,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
}
else
{
- if (!FilesUtility::fileExists (tmpCgiPath.c_str ()))
+ if (!FilesUtility::nodeExists (tmpCgiPath.c_str ()))
{
if (tmpCgiPath.length () > 0)
td->connection->host->warningsLogWrite (_("Cgi: cannot find the %s
file")),
diff --git a/myserver/src/http_handler/http_file/http_file.cpp
b/myserver/src/http_handler/http_file/http_file.cpp
index 0bf2218..e59ca9d 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -54,7 +54,7 @@ int HttpFile::putFile (HttpThreadContext* td, string&
filename)
if (!(td->permissions & MYSERVER_PERMISSION_WRITE))
return td->http->sendAuth ();
- if (FilesUtility::fileExists (td->filenamePath.c_str ()))
+ if (FilesUtility::nodeExists (td->filenamePath.c_str ()))
{
File file;
if (file.openFile (td->filenamePath.c_str (), File::OPEN_IF_EXISTS
@@ -156,7 +156,7 @@ int HttpFile::deleteFile (HttpThreadContext* td,
if (!(td->permissions & MYSERVER_PERMISSION_DELETE))
return td->http->sendAuth ();
- if (FilesUtility::fileExists (td->filenamePath))
+ if (FilesUtility::nodeExists (td->filenamePath))
{
FilesUtility::deleteFile (td->filenamePath.c_str ());
return td->http->raiseHTTPError (202);
@@ -232,7 +232,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
if (!(td->permissions & MYSERVER_PERMISSION_READ))
return td->http->sendAuth ();
- if (!FilesUtility::fileExists (filenamePath))
+ if (!FilesUtility::nodeExists (filenamePath))
return td->http->raiseHTTPError (404);
lastMT = FilesUtility::getLastModTime (td->filenamePath.c_str ());
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp
b/myserver/src/http_handler/wincgi/wincgi.cpp
index d4bef52..8122d43 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -89,7 +89,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
if (!(td->permissions & MYSERVER_PERMISSION_EXECUTE))
return td->http->sendAuth ();
- if (!FilesUtility::fileExists (scriptpath))
+ if (!FilesUtility::nodeExists (scriptpath))
return td->http->raiseHTTPError (404);
FilesUtility::splitPath (scriptpath, pathname, execname);
@@ -260,7 +260,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
/*
*Create the out file.
*/
- if (!FilesUtility::fileExists (outFilePath))
+ if (!FilesUtility::nodeExists (outFilePath))
{
ret = OutFileHandle.openFile (outFilePath, File::FILE_CREATE_ALWAYS);
if (ret)
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index c61acf7..4f58c70 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -230,7 +230,7 @@ int loadExternalPath (string &externalPath)
#ifdef WIN32
externalPath.assign ("plugins");
#else
- if (FilesUtility::fileExists ("plugins"))
+ if (FilesUtility::nodeExists ("plugins"))
externalPath.assign ("plugins");
else
{
@@ -263,7 +263,7 @@ int loadConfFileLocation (string &outFile, string fileName,
const char *dir)
#ifdef WIN32
outFile = fileName;
- return FilesUtility::fileExists (fileName) ? 0 : -1;
+ return FilesUtility::nodeExists (fileName) ? 0 : -1;
#else
if (dir)
@@ -273,7 +273,7 @@ int loadConfFileLocation (string &outFile, string fileName,
const char *dir)
outFile += "/";
outFile += fileName;
- return !FilesUtility::fileExists (outFile);
+ return !FilesUtility::nodeExists (outFile);
}
/* Look for .xml files in the following order:
@@ -282,18 +282,18 @@ int loadConfFileLocation (string &outFile, string
fileName, const char *dir)
2) ~/.myserver/
3) /etc/myserver/
*/
- if (FilesUtility::fileExists (fileName))
+ if (FilesUtility::nodeExists (fileName))
{
outFile = fileName;
return 0;
}
outFile = "~/.myserver/" + fileName;
- if (FilesUtility::fileExists (outFile))
+ if (FilesUtility::nodeExists (outFile))
return 0;
outFile = "/etc/myserver/" + fileName;
- if (FilesUtility::fileExists (outFile))
+ if (FilesUtility::nodeExists (outFile))
return 0;
#endif
}
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index bc31a78..1a62d86 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -1463,7 +1463,7 @@ bool Ftp::getLocalPath (const std::string & sPath,
std::string & sOutPath)
return false;
if (sOutPath.empty () ||
- !FilesUtility::fileExists (sOutPath) ||
+ !FilesUtility::nodeExists (sOutPath) ||
FilesUtility::isLink (sOutPath.c_str ()))
{
ftpReply (550);
@@ -2194,7 +2194,7 @@ void Ftp::stou (const std::string & sPath)
return;
nCount++;
}
- while (FilesUtility::fileExists (sOutPath));
+ while (FilesUtility::nodeExists (sOutPath));
retrstor (false, false, sOutPath);
}
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index 2c0cdb5..2b94ec3 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -520,7 +520,7 @@ int Http::preprocessHttpRequest (string& filename, int
yetmapped, int* permissio
if (next >= filenamePathLen)
break;
- if (mimeLoc || (FilesUtility::fileExists (curr.c_str ())
+ if (mimeLoc || (FilesUtility::nodeExists (curr.c_str ())
&& !FilesUtility::isDirectory (curr.c_str ())))
{
td->pathInfo.assign (&(td->filenamePath.c_str ()[next]));
@@ -1425,7 +1425,7 @@ int Http::raiseHTTPError (int ID)
HttpErrors::getErrorPage (ID, page);
errorFile << td->getVhostSys () << "/" << page;
- if (FilesUtility::fileExists (errorFile.str ().c_str ()))
+ if (FilesUtility::nodeExists (errorFile.str ().c_str ()))
{
string errorFileStr = errorFile.str ();
return sendHTTPResource (errorFileStr, 1, td->onlyHeader);
@@ -1645,7 +1645,7 @@ int Http::processDefaultFile (string& uri, int
permissions, int onlyHeader)
defaultFileName.clear ();
defaultFileName << td->filenamePath << "/" << *file;
- if (FilesUtility::fileExists (defaultFileName.str ().c_str ()))
+ if (FilesUtility::nodeExists (defaultFileName.str ().c_str ()))
{
ostringstream nUrl;
diff --git a/myserver/tests/test_fork_server.cpp
b/myserver/tests/test_fork_server.cpp
index bc295e9..dcc6378 100644
--- a/myserver/tests/test_fork_server.cpp
+++ b/myserver/tests/test_fork_server.cpp
@@ -89,7 +89,7 @@ public:
spi.stdError = -1;
spi.stdOut = pipe.getWriteHandle ();
- if (!FilesUtility::fileExists ("/bin/echo"))
+ if (!FilesUtility::nodeExists ("/bin/echo"))
return;
spi.cmd.assign ("/bin/echo");
diff --git a/myserver/tests/test_unix_socket.cpp
b/myserver/tests/test_unix_socket.cpp
index 0ce109a..4abd19a 100644
--- a/myserver/tests/test_unix_socket.cpp
+++ b/myserver/tests/test_unix_socket.cpp
@@ -91,26 +91,22 @@ public:
string path;
FilesUtility::temporaryFileName (0, path);
-
CPPUNIT_ASSERT (sock->socket ());
- //FIXME: find a better place inside FilesUtility.
- struct stat F_Stats;
- ret = stat (path.c_str (), &F_Stats);
- CPPUNIT_ASSERT (ret);
- /////////////////////////////////////////////////
+ ret = FilesUtility::nodeExists (path.c_str ());
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
CPPUNIT_ASSERT_EQUAL (sock->bind (path.c_str ()), 0);
- ret = stat (path.c_str (), &F_Stats);
- CPPUNIT_ASSERT_EQUAL (ret, 0);
+ ret = FilesUtility::nodeExists (path.c_str ());
+ CPPUNIT_ASSERT (ret);
CPPUNIT_ASSERT_EQUAL (sock->shutdown (), 0);
CPPUNIT_ASSERT_EQUAL (sock->close (), 0);
- ret = stat (path.c_str (), &F_Stats);
- CPPUNIT_ASSERT (ret);
+ ret = FilesUtility::nodeExists (path.c_str ());
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
}
void testClient ()
-----------------------------------------------------------------------
Summary of changes:
myserver/include/base/file/files_utility.h | 6 +++---
myserver/src/base/file/file.cpp | 2 +-
myserver/src/base/file/files_utility.cpp | 8 ++++----
myserver/src/base/home_dir/home_dir.cpp | 2 +-
myserver/src/base/ssl/ssl.cpp | 4 ++--
myserver/src/base/xml/xml_parser.cpp | 2 +-
myserver/src/conf/security/security_cache.cpp | 6 +++---
myserver/src/http_handler/cgi/cgi.cpp | 4 ++--
myserver/src/http_handler/http_file/http_file.cpp | 6 +++---
myserver/src/http_handler/wincgi/wincgi.cpp | 4 ++--
myserver/src/myserver.cpp | 12 ++++++------
myserver/src/protocol/ftp/ftp.cpp | 4 ++--
myserver/src/protocol/http/http.cpp | 6 +++---
myserver/tests/test_fork_server.cpp | 2 +-
myserver/tests/test_unix_socket.cpp | 16 ++++++----------
15 files changed, 40 insertions(+), 44 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-8-gb5c07e8,
Giuseppe Scrivano <=