86e239c98f
plus a bunch of other fixes and cleanups:
- Fix comment misstatements of fact in nsIFile.idl, improve style slightly.
- Fix typo in comment in nsILocalFile.idl.
- Avoid gratuitous nsCString and nsXPIDLCString copy-constructions, which
entail malloc'ing, in nsLocalFileUnix.cpp's CopyTo and GetParent methods.
But do use nsXPIDLCString instead of raw nsMemory::Alloc/Free.
- Get rid of unnecessary mLL_II2L and mLL_L2II macros, use "prlong.h" API only.
Also use the LL_* macros consistently in case a Unix lacking long long type
support wants to use this code.
* BTW, the "Date" methods should be renamed to use "Time" instead -- after all
PRTime is the type, and traditionally "time" refers to the time-number, a
scalar independent of one's position on the surface of the earth, while
"date" refers to a struct full of locale-specific information derived from
time and some "environment" variables such as DST. Can we rename these
nsIFile methods before Mozilla 0.9 / Netscape 6?
- Use CHECK_mPath consistently and first, before any assertions relating to
arguments (which logically come after the 'this' parameter CHECK_mPath is
making assertions about).
- Use nsCOMPtr for singly-inheriting implementations of XPCOM interfaces, to
avoid scary-when-scaled 0-refcnt instances from being handled (these all
got a ref via QI or equivalent soon enough, but you never know). This also
removed some naked deletes.
- Canonize all paths copied into mPath to lack trailing slashes, so we don't
need to strip trailing slashes elsewhere, in higher-frequency methods (you
set path less often than you get it or a substring of it).
- ssize_t for strlen return values.
- Since shaver used a function pointer to consolidate creat/mkdir logic, but
didn't fold the necessary close of the new fd returned by non-failing creat
into the pointed-at function, I did that.
- AppendRelativePath forbids .. as a component (bounded by / or beginning or
end of string on either side), not just in the middle of fragment (so that
foo..bar is not an illegal relative pathname -- it should not be). BTW,
what the heck is the difference between NS_ERROR_FILE_UNRECOGNIZED_PATH and
...INVALID_PATH?
- SetLeafName was overallocating the new pathname buffer by failing to subtract
the old leafname's length.
- CopyTo was failing to return an NSRESULT_FOR_ERRNO(), it just called that
macro on a line by itself -- eek! It also contained redundant if (newFD
== nsnull) {...} cleanup code, it did a useless PR_GetFileInfo call, and it
leaked FDs on read or write error.
- Implemented CopyToFollowingLinks as a forwarded call to CopyTo, Unix does
not support "copying" a symlink via normal file i/o. Should we instead
lstat in CopyTo and if a link is the source of the copy, do readlink and
then symlink?
- Fixed the readlink method (GetTarget) to null-terminate the link string in
the out parameter (readlink does not do that for you).
- Lots of little nsnull vs. NULL vs. 0, == and != applied to boolean or null
literals, white-space, indentation, bracing, comment, and sloppy code order
(e.g., declaring an initialized variable that's not used till after early
returns) fixes. Also invert some return logic so that NS_OK is the normal,
least indented, final return.
git-svn-id: svn://10.0.0.236/trunk@79492 18797224-902f-48f8-a5cc-f745e15eee43
116 lines
2.9 KiB
C++
116 lines
2.9 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* The contents of this file are subject to the Netscape Public
|
|
* License Version 1.1 (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.mozilla.org/NPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is Mozilla Communicator client code,
|
|
* released March 31, 1998.
|
|
*
|
|
* The Initial Developer of the Original Code is Netscape Communications
|
|
* Corporation. Portions created by Netscape are
|
|
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
* Mike Shaver <shaver@mozilla.org>
|
|
*/
|
|
|
|
/*
|
|
* Implementation of nsIFile for ``Unixy'' systems.
|
|
*/
|
|
|
|
#ifndef _nsLocalFileUNIX_H_
|
|
#define _nsLocalFileUNIX_H_
|
|
|
|
#include <sys/stat.h>
|
|
#include <errno.h>
|
|
|
|
#include "nscore.h"
|
|
#include "nsIFile.h"
|
|
#include "nsILocalFile.h"
|
|
#include "nsLocalFile.h"
|
|
#include "nsXPIDLString.h"
|
|
|
|
#define NSRESULT_FOR_RETURN(ret) (((ret) < 0) ? NSRESULT_FOR_ERRNO() : NS_OK)
|
|
|
|
inline nsresult
|
|
nsresultForErrno(int err)
|
|
{
|
|
#ifdef DEBUG_shaver
|
|
if (err)
|
|
fprintf(stderr, "errno %d\n", err);
|
|
#endif
|
|
switch(err) {
|
|
case 0:
|
|
return NS_OK;
|
|
case ENOENT:
|
|
return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST;
|
|
case ENOTDIR:
|
|
return NS_ERROR_FILE_DESTINATION_NOT_DIR;
|
|
#ifdef ENOLINK
|
|
case ENOLINK:
|
|
return NS_ERROR_FILE_UNRESOLVABLE_SYMLINK;
|
|
#endif /* ENOLINK */
|
|
case EEXIST:
|
|
return NS_ERROR_FILE_ALREADY_EXISTS;
|
|
case EACCES:
|
|
default:
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
#define NSRESULT_FOR_ERRNO() nsresultForErrno(errno)
|
|
|
|
class NS_COM nsLocalFile : public nsILocalFile
|
|
{
|
|
public:
|
|
NS_DEFINE_STATIC_CID_ACCESSOR(NS_LOCAL_FILE_CID)
|
|
|
|
nsLocalFile();
|
|
virtual ~nsLocalFile();
|
|
|
|
static NS_METHOD nsLocalFileConstructor(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
|
|
|
|
// nsISupports
|
|
NS_DECL_ISUPPORTS
|
|
|
|
// nsIFile
|
|
NS_DECL_NSIFILE
|
|
|
|
// nsILocalFile
|
|
NS_DECL_NSILOCALFILE
|
|
|
|
protected:
|
|
PRBool mHaveCachedStat;
|
|
struct stat mCachedStat;
|
|
nsXPIDLCString mPath;
|
|
|
|
nsresult CreateAllAncestors(PRUint32 permissions);
|
|
nsresult GetLeafNameRaw(const char **_retval);
|
|
nsresult GetTargetPathName(nsIFile *newParent, const char *newName,
|
|
char **_retval);
|
|
|
|
void InvalidateCache() { mHaveCachedStat = PR_FALSE; }
|
|
|
|
nsresult FillStatCache() {
|
|
if (stat(mPath, &mCachedStat) == -1) {
|
|
#ifdef DEBUG_shaver
|
|
fprintf(stderr, "stat(%s) -> %d\n", (const char *)mPath, errno);
|
|
#endif
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
mHaveCachedStat = PR_TRUE;
|
|
return NS_OK;
|
|
}
|
|
|
|
};
|
|
|
|
#endif /* _nsLocalFileUNIX_H_ */
|