seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/Windows/FileFind.h

@@ -1,10 +1,10 @@
 // Windows/FileFind.h
 
-#ifndef __WINDOWS_FILEFIND_H
-#define __WINDOWS_FILEFIND_H
+#ifndef __WINDOWS_FILE_FIND_H
+#define __WINDOWS_FILE_FIND_H
 
 #include "../Common/MyString.h"
-#include "FileName.h"
+#include "../Common/MyTypes.h"
 #include "Defs.h"
 
 #include <sys/types.h> /* for DIR */
@@ -26,38 +26,54 @@ namespace NAttributes
 }
 
 class CFileInfoBase
-{ 
-  bool MatchesMask(UINT32 mask) const  { return ((Attrib & mask) != 0); }
+{
+  bool MatchesMask(UINT32 mask) const { return ((Attrib & mask) != 0); }
 public:
   UInt64 Size;
   FILETIME CTime;
   FILETIME ATime;
   FILETIME MTime;
   DWORD Attrib;
+  bool IsAltStream;
   bool IsDevice;
-  
+
+  /*
+  #ifdef UNDER_CE
+  DWORD ObjectID;
+  #else
+  UINT32 ReparseTag;
+  #endif
+  */
+
+  CFileInfoBase() { ClearBase(); }
+  void ClearBase() throw();
+
+  void SetAsDir() { Attrib = FILE_ATTRIBUTE_DIRECTORY; }
+
+  bool IsArchived() const { return MatchesMask(FILE_ATTRIBUTE_ARCHIVE); }
+  bool IsCompressed() const { return MatchesMask(FILE_ATTRIBUTE_COMPRESSED); }
   bool IsDir() const { return MatchesMask(FILE_ATTRIBUTE_DIRECTORY); }
+  bool IsEncrypted() const { return MatchesMask(FILE_ATTRIBUTE_ENCRYPTED); }
+  bool IsHidden() const { return MatchesMask(FILE_ATTRIBUTE_HIDDEN); }
+  bool IsNormal() const { return MatchesMask(FILE_ATTRIBUTE_NORMAL); }
+  bool IsOffline() const { return MatchesMask(FILE_ATTRIBUTE_OFFLINE); }
+  bool IsReadOnly() const { return MatchesMask(FILE_ATTRIBUTE_READONLY); }
+  bool HasReparsePoint() const { return MatchesMask(FILE_ATTRIBUTE_REPARSE_POINT); }
+  bool IsSparse() const { return MatchesMask(FILE_ATTRIBUTE_SPARSE_FILE); }
+  bool IsSystem() const { return MatchesMask(FILE_ATTRIBUTE_SYSTEM); }
+  bool IsTemporary() const { return MatchesMask(FILE_ATTRIBUTE_TEMPORARY); }
 };
 
-class CFileInfo: public CFileInfoBase
-{ 
-public:
-  AString Name; // FIXME CSysString Name;
-  bool IsDots() const;
-  bool Find(LPCSTR wildcard);
-};
+struct CFileInfo: public CFileInfoBase
+{
+  FString Name;
+  #if defined(_WIN32) && !defined(UNDER_CE)
+  // FString ShortName;
+  #endif
 
-// FIXME #ifdef _UNICODE
-// typedef CFileInfo CFileInfoW;
-// #else
-class CFileInfoW: public CFileInfoBase
-{ 
-public:
-  UString Name;
-  bool IsDots() const;
-  bool Find(LPCWSTR wildcard);
+  bool IsDots() const throw();
+  bool Find(CFSTR wildcard, bool ignoreLink = false);
 };
-// #endif
 
 class CFindFile
 {
@@ -66,61 +82,49 @@ class CFindFile
   AString _pattern;
   AString _directory;  
 public:
-  bool IsHandleAllocated() const { return (_dirp != 0); }
+  bool IsHandleAllocated() const { return  (_dirp != 0); }
   CFindFile(): _dirp(0) {}
-  ~CFindFile() {  Close(); }
-  // bool FindFirst(LPCTSTR wildcard, CFileInfo &fileInfo);
-  bool FindFirst(LPCSTR wildcard, CFileInfo &fileInfo);
+  ~CFindFile() { Close(); }
+  bool FindFirst(CFSTR wildcard, CFileInfo &fileInfo, bool ignoreLink = false);
   bool FindNext(CFileInfo &fileInfo);
-  // FIXME #ifndef _UNICODE
-  bool FindFirst(LPCWSTR wildcard, CFileInfoW &fileInfo);
-  bool FindNext(CFileInfoW &fileInfo);
-  // FIXME #endif
   bool Close();
 };
 
-bool FindFile(LPCSTR wildcard, CFileInfo &fileInfo);
-
-bool DoesFileExist(LPCSTR name);
-bool DoesDirExist(LPCTSTR name);
-bool DoesFileOrDirExist(LPCSTR name);
-// #ifndef _UNICODE
-bool FindFile(LPCWSTR wildcard, CFileInfoW &fileInfo);
-bool DoesFileExist(LPCWSTR name);
-bool DoesDirExist(LPCWSTR name);
-bool DoesFileOrDirExist(LPCWSTR name);
-// #endif
+bool DoesFileExist(CFSTR name);
+bool DoesDirExist(CFSTR name);
+bool DoesFileOrDirExist(CFSTR name);
 
 class CEnumerator
 {
   CFindFile _findFile;
-  AString _wildcard; // FIXME CSysString _wildcard;
+  FString _wildcard;
+
   bool NextAny(CFileInfo &fileInfo);
 public:
-  CEnumerator(): _wildcard(NName::kAnyStringWildcard) {}
-  // FIXME CEnumerator(const CSysString &wildcard): _wildcard(wildcard) {}
-  CEnumerator(const AString &wildcard): _wildcard(wildcard) {}
+  CEnumerator(const FString &wildcard): _wildcard(wildcard) {}
   bool Next(CFileInfo &fileInfo);
   bool Next(CFileInfo &fileInfo, bool &found);
 };
 
-// FIXME #ifdef _UNICODE
-// typedef CEnumerator CEnumeratorW;
-// #else
-class CEnumeratorW
+#ifdef _WIN32
+class CFindChangeNotification
 {
-  CFindFile _findFile;
-  UString _wildcard;
-  bool NextAny(CFileInfoW &fileInfo);
+  HANDLE _handle;
 public:
-  CEnumeratorW(): _wildcard(NName::kAnyStringWildcard) {}
-  CEnumeratorW(const UString &wildcard): _wildcard(wildcard) {}
-  bool Next(CFileInfoW &fileInfo);
-  bool Next(CFileInfoW &fileInfo, bool &found);
+  operator HANDLE () { return _handle; }
+  bool IsHandleAllocated() const { return _handle != INVALID_HANDLE_VALUE && _handle != 0; }
+  CFindChangeNotification(): _handle(INVALID_HANDLE_VALUE) {}
+  ~CFindChangeNotification() { Close(); }
+  bool Close() throw();
+  HANDLE FindFirst(CFSTR pathName, bool watchSubtree, DWORD notifyFilter);
+  bool FindNext() { return BOOLToBool(::FindNextChangeNotification(_handle)); }
 };
-// FIXME #endif
+#endif
+
+#ifndef UNDER_CE
+bool MyGetLogicalDriveStrings(CObjectVector<FString> &driveStrings);
+#endif
 
 }}}
 
 #endif
-

data/ext/p7zip/CPP/Windows/FileIO.cpp

@@ -25,6 +25,13 @@
 #define GENERIC_READ	0x80000000
 #define GENERIC_WRITE	0x40000000
 
+#ifdef ENV_HAVE_LSTAT
+extern "C"
+{
+int global_use_lstat=1; // default behaviour : p7zip stores symlinks instead of dumping the files they point to
+}
+#endif
+
 extern BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *Time, DWORD *Seconds );
 
 namespace NWindows {
@@ -36,13 +43,18 @@ CFileBase::~CFileBase()
   Close();
 }
 
-bool CFileBase::Create(LPCSTR filename, DWORD dwDesiredAccess,
+bool CFileBase::Create(CFSTR filename, DWORD dwDesiredAccess,
     DWORD dwShareMode, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,bool ignoreSymbolicLink)
 {
   Close();
   
   int   flags = 0;
+#ifdef USE_UNICODE_FSTRING
+   AString astr = UnicodeStringToMultiByte(filename);
+   const char * name = nameWindowToUnix((const char *)astr);
+#else
   const char * name = nameWindowToUnix(filename);
+#endif
 
 #ifdef O_BINARY
   flags |= O_BINARY;
@@ -98,7 +110,7 @@ bool CFileBase::Create(LPCSTR filename, DWORD dwDesiredAccess,
     UString ustr = MultiByteToUnicodeString(AString(name), 0);
     AString resultString;
     int is_good = 1;
-    for (int i = 0; i < ustr.Length(); i++)
+    for (int i = 0; i < ustr.Len(); i++)
     {
       if (ustr[i] >= 256) {
         is_good = 0;
@@ -122,6 +134,7 @@ bool CFileBase::Create(LPCSTR filename, DWORD dwDesiredAccess,
   return true;
 }
 
+/* FIXME
 bool CFileBase::Create(LPCWSTR fileName, DWORD desiredAccess,
     DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes,bool ignoreSymbolicLink)
 {
@@ -129,6 +142,7 @@ bool CFileBase::Create(LPCWSTR fileName, DWORD desiredAccess,
     return Create(UnicodeStringToMultiByte(fileName, CP_ACP), 
       desiredAccess, shareMode, creationDisposition, flagsAndAttributes,ignoreSymbolicLink);
 }
+*/
 
 bool CFileBase::Close()
 {
@@ -254,33 +268,19 @@ bool CFileBase::Seek(UINT64 position, UINT64 &newPosition)
 /////////////////////////
 // CInFile
 
-bool CInFile::Open(LPCTSTR fileName, DWORD shareMode, 
+bool CInFile::Open(CFSTR fileName, DWORD shareMode, 
     DWORD creationDisposition,  DWORD flagsAndAttributes)
 {
   return Create(fileName, GENERIC_READ, shareMode, 
       creationDisposition, flagsAndAttributes);
 }
 
-bool CInFile::Open(LPCTSTR fileName,bool ignoreSymbolicLink)
+bool CInFile::Open(CFSTR fileName,bool ignoreSymbolicLink)
 {
   return Create(fileName, GENERIC_READ , FILE_SHARE_READ, OPEN_EXISTING, 
      FILE_ATTRIBUTE_NORMAL,ignoreSymbolicLink);
 }
 
-#ifndef _UNICODE
-bool CInFile::Open(LPCWSTR fileName, DWORD shareMode, 
-    DWORD creationDisposition,  DWORD flagsAndAttributes)
-{
-  return Create(fileName, GENERIC_READ, shareMode, 
-      creationDisposition, flagsAndAttributes);
-}
-
-bool CInFile::Open(LPCWSTR fileName,bool ignoreSymbolicLink)
-{
-  return Create(fileName, GENERIC_READ , FILE_SHARE_READ, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,ignoreSymbolicLink);
-}
-#endif
-
 // ReadFile and WriteFile functions in Windows have BUG:
 // If you Read or Write 64MB or more (probably min_failure_size = 64MB - 32KB + 1) 
 // from/to Network file, it returns ERROR_NO_SYSTEM_RESOURCES 
@@ -339,7 +339,7 @@ bool CInFile::Read(void *buffer, UINT32 bytesToRead, UINT32 &bytesRead)
 /////////////////////////
 // COutFile
 
-bool COutFile::Open(LPCTSTR fileName, DWORD shareMode, 
+bool COutFile::Open(CFSTR fileName, DWORD shareMode, 
     DWORD creationDisposition, DWORD flagsAndAttributes)
 {
   return CFileBase::Create(fileName, GENERIC_WRITE, shareMode, 
@@ -349,40 +349,23 @@ bool COutFile::Open(LPCTSTR fileName, DWORD shareMode,
 static inline DWORD GetCreationDisposition(bool createAlways)
   {  return createAlways? CREATE_ALWAYS: CREATE_NEW; }
 
-bool COutFile::Open(LPCTSTR fileName, DWORD creationDisposition)
+bool COutFile::Open(CFSTR fileName, DWORD creationDisposition)
 {
   return Open(fileName, FILE_SHARE_READ, 
       creationDisposition, FILE_ATTRIBUTE_NORMAL);
 }
 
-bool COutFile::Create(LPCTSTR fileName, bool createAlways)
+bool COutFile::Create(CFSTR fileName, bool createAlways)
 {
   return Open(fileName, GetCreationDisposition(createAlways));
 }
 
-#ifndef _UNICODE
-
-bool COutFile::Open(LPCWSTR fileName, DWORD shareMode, 
-    DWORD creationDisposition, DWORD flagsAndAttributes)
+bool COutFile::CreateAlways(CFSTR fileName, DWORD /* flagsAndAttributes */ )
 {
-  return CFileBase::Create(fileName, GENERIC_WRITE, shareMode, 
-      creationDisposition, flagsAndAttributes);
+  return Open(fileName, true); // FIXME
 }
 
-bool COutFile::Open(LPCWSTR fileName, DWORD creationDisposition)
-{
-  return Open(fileName, FILE_SHARE_READ, 
-      creationDisposition, FILE_ATTRIBUTE_NORMAL);
-}
-
-bool COutFile::Create(LPCWSTR fileName, bool createAlways)
-{
-  return Open(fileName, GetCreationDisposition(createAlways));
-}
-
-#endif
-
-bool COutFile::SetTime(const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime)
+bool COutFile::SetTime(const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime) throw()
 {
   LARGE_INTEGER  ltime;
   DWORD dw;
@@ -409,12 +392,12 @@ bool COutFile::SetTime(const FILETIME *cTime, const FILETIME *aTime, const FILET
   return true;
 }
 
-bool COutFile::SetMTime(const FILETIME *mTime)
+bool COutFile::SetMTime(const FILETIME *mTime) throw()
 {
   return SetTime(NULL, NULL, mTime);
 }
 
-bool COutFile::WritePart(const void *data, UINT32 size, UINT32 &processedSize)
+bool COutFile::WritePart(const void *data, UINT32 size, UINT32 &processedSize) throw()
 {
 //  if (size > kChunkSizeMax)
 //    size = kChunkSizeMax;
@@ -422,7 +405,7 @@ bool COutFile::WritePart(const void *data, UINT32 size, UINT32 &processedSize)
   return Write(data,size,processedSize);
 }
 
-bool COutFile::Write(const void *buffer, UINT32 bytesToWrite, UINT32 &bytesWritten)
+bool COutFile::Write(const void *buffer, UINT32 bytesToWrite, UINT32 &bytesWritten) throw()
 {
   if (_fd == -1)
   {
@@ -443,7 +426,7 @@ bool COutFile::Write(const void *buffer, UINT32 bytesToWrite, UINT32 &bytesWritt
   return FALSE;
 }
 
-bool COutFile::SetEndOfFile()
+bool COutFile::SetEndOfFile() throw()
 {
   if (_fd == -1)
   {
@@ -462,7 +445,7 @@ bool COutFile::SetEndOfFile()
   return bret;
 }
 
-bool COutFile::SetLength(UINT64 length)
+bool COutFile::SetLength(UINT64 length) throw()
 {
   UINT64 newPosition;
   if(!Seek(length, newPosition))

data/ext/p7zip/CPP/Windows/FileIO.h

@@ -15,16 +15,35 @@
 #define FILE_END	SEEK_END
 #define INVALID_SET_FILE_POINTER	((DWORD)-1)
 
-#define CREATE_NEW	  1
-#define CREATE_ALWAYS	  2
-#define OPEN_EXISTING	  3
-#define OPEN_ALWAYS	  4
-/* #define TRUNCATE_EXISTING 5 */
-
 #endif
 
+#define _my_IO_REPARSE_TAG_MOUNT_POINT  (0xA0000003L)
+#define _my_IO_REPARSE_TAG_SYMLINK      (0xA000000CL)
+
+#define _my_SYMLINK_FLAG_RELATIVE 1
+
 namespace NWindows {
 namespace NFile {
+
+struct CReparseAttr
+{
+  UInt32 Tag;
+  UInt32 Flags;
+  UString SubsName;
+  UString PrintName;
+
+  CReparseAttr(): Tag(0), Flags(0) {}
+  bool Parse(const Byte *p, size_t size);
+
+  bool IsMountPoint() const { return Tag == _my_IO_REPARSE_TAG_MOUNT_POINT; } // it's Junction
+  bool IsSymLink() const { return Tag == _my_IO_REPARSE_TAG_SYMLINK; }
+  bool IsRelative() const { return Flags == _my_SYMLINK_FLAG_RELATIVE; }
+  // bool IsVolume() const;
+
+  bool IsOkNamePair() const;
+  UString GetPath() const;
+};
+
 namespace NIO {
 
 
@@ -41,9 +60,7 @@ protected:
   int     _offset;
 #endif
 
-  bool Create(LPCSTR fileName, DWORD desiredAccess,
-      DWORD shareMode, DWORD creationDisposition,  DWORD flagsAndAttributes,bool ignoreSymbolicLink=false);
-  bool Create(LPCWSTR fileName, DWORD desiredAccess,
+  bool Create(CFSTR fileName, DWORD desiredAccess,
       DWORD shareMode, DWORD creationDisposition,  DWORD flagsAndAttributes,bool ignoreSymbolicLink=false);
 
 public:
@@ -61,18 +78,11 @@ public:
 class CInFile: public CFileBase
 {
 public:
-  bool Open(LPCTSTR fileName, DWORD shareMode, DWORD creationDisposition,  DWORD flagsAndAttributes);
-  bool OpenShared(LPCTSTR fileName, bool /* shareForWrite */ ,bool ignoreSymbolicLink=false) {
-    return Open(fileName,ignoreSymbolicLink);
-  }
-  bool Open(LPCTSTR fileName,bool ignoreSymbolicLink=false);
-  #ifndef _UNICODE
-  bool Open(LPCWSTR fileName, DWORD shareMode, DWORD creationDisposition,  DWORD flagsAndAttributes);
-  bool OpenShared(LPCWSTR fileName, bool /* shareForWrite */ ,bool ignoreSymbolicLink=false) {
+  bool Open(CFSTR fileName, DWORD shareMode, DWORD creationDisposition,  DWORD flagsAndAttributes);
+  bool OpenShared(CFSTR fileName, bool /* shareForWrite */ ,bool ignoreSymbolicLink=false) {
     return Open(fileName,ignoreSymbolicLink);
   }
-  bool Open(LPCWSTR fileName,bool ignoreSymbolicLink=false);
-  #endif
+  bool Open(CFSTR fileName,bool ignoreSymbolicLink=false);
   bool ReadPart(void *data, UINT32 size, UINT32 &processedSize);
   bool Read(void *data, UINT32 size, UINT32 &processedSize);
 };
@@ -80,29 +90,17 @@ public:
 class COutFile: public CFileBase
 {
 public:
-  bool Open(LPCTSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes);
-  bool Open(LPCTSTR fileName, DWORD creationDisposition);
-  bool Create(LPCTSTR fileName, bool createAlways);
-
-  #ifndef _UNICODE
-  bool Open(LPCWSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes);
-  bool Open(LPCWSTR fileName, DWORD creationDisposition);
-  bool Create(LPCWSTR fileName, bool createAlways);
-  #endif
-
-  /*
-  void SetOpenCreationDisposition(DWORD creationDisposition)
-    { m_CreationDisposition = creationDisposition; }
-  void SetOpenCreationDispositionCreateAlways()
-    { m_CreationDisposition = CREATE_ALWAYS; }
-  */
-
-  bool SetTime(const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime);
-  bool SetMTime(const FILETIME *mTime);
-  bool WritePart(const void *data, UINT32 size, UINT32 &processedSize);
-  bool Write(const void *data, UINT32 size, UINT32 &processedSize);
-  bool SetEndOfFile();
-  bool SetLength(UINT64 length);
+  bool Open(CFSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes);
+  bool Open(CFSTR fileName, DWORD creationDisposition);
+  bool Create(CFSTR fileName, bool createAlways);
+  bool CreateAlways(CFSTR fileName, DWORD flagsAndAttributes);
+
+  bool SetTime(const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime) throw();
+  bool SetMTime(const FILETIME *mTime) throw();
+  bool WritePart(const void *data, UInt32 size, UInt32 &processedSize) throw();
+  bool Write(const void *data, UInt32 size, UInt32 &processedSize) throw();
+  bool SetEndOfFile() throw();
+  bool SetLength(UInt64 length) throw();
 };
 
 }}}