Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CABMAN]

Browse source 
Get rid of MAX_PATH

svn path=/trunk/; revision=55642
This commit is contained in:
Pierre Schweitzer 2012-02-16 17:21:10 +00:00
parent cc6395f4b1
commit 0dd7e4f27f
4 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/tools/cabman/cabinet.cxx
View file

@ -512,7 +512,7 @@ void CCabinet::SetDestinationPath(char* DestinationPath)
strcpy(DestPath, DestinationPath);
ConvertPath(DestPath, false);
if (strlen(DestPath) > 0)
NormalizePath(DestPath, MAX_PATH);
NormalizePath(DestPath, PATH_MAX);
}
ULONG CCabinet::AddSearchCriteria(char* SearchCriteria)
@ -1030,8 +1030,8 @@ ULONG CCabinet::ExtractFile(char* FileName)
#if defined(_WIN32)
FILETIME FileTime;
#endif
CHAR DestName[MAX_PATH];
CHAR TempName[MAX_PATH];
CHAR DestName[PATH_MAX];
CHAR TempName[PATH_MAX];
Status = LocateFile(FileName, &File);
if (Status != CAB_STATUS_SUCCESS)
@ -2086,8 +2086,8 @@ bool CCabinet::CreateSimpleCabinet()
{
bool bRet = false;
char* pszFile;
char szFilePath[MAX_PATH];
char szFile[MAX_PATH];
char szFilePath[PATH_MAX];
char szFile[PATH_MAX];
PSEARCH_CRITERIA Criteria;
ULONG Status;
@ -2554,7 +2554,7 @@ ULONG CCabinet::ReadFileTable()
return CAB_STATUS_INVALID_CAB;
}
File->FileName = (char*)AllocateMemory(MAX_PATH);
File->FileName = (char*)AllocateMemory(PATH_MAX);
if (!File->FileName)
{
DPRINT(MIN_TRACE, ("Insufficient memory.\n"));
@ -2562,7 +2562,7 @@ ULONG CCabinet::ReadFileTable()
}
/* Read file name */
Status = ReadString(File->FileName, MAX_PATH);
Status = ReadString(File->FileName, PATH_MAX);
if (Status != CAB_STATUS_SUCCESS)
return Status;
@ -3654,7 +3654,7 @@ ULONG CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File)
&File->File.FileTime);
#else
struct stat stbuf;
char buf[MAX_PATH];
char buf[PATH_MAX];
// Check for an absolute path
if (IsSeparator(File->FileName[0]))
@ -3698,7 +3698,7 @@ ULONG CCabinet::GetAttributesOnFile(PCFFILE_NODE File)
File->File.Attributes = (USHORT)(Attributes & 0x37);
#else
struct stat stbuf;
char buf[MAX_PATH];
char buf[PATH_MAX];
// Check for an absolute path
if (IsSeparator(File->FileName[0]))

9
reactos/tools/cabman/cabinet.h
View file

@ -16,9 +16,6 @@
#include <time.h>
#include <typedefs.h>
#include <unistd.h>
#ifndef MAX_PATH
#define MAX_PATH 260
#endif
#endif
#include <stdlib.h>
@ -303,7 +300,7 @@ public:
ULONG ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead);
ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten);
private:
char FullName[MAX_PATH];
char FullName[PATH_MAX];
bool FileCreated;
FILEHANDLE FileHandle;
};
@ -449,8 +446,8 @@ private:
ULONG FolderUncompSize; // Uncompressed size of folder
ULONG BytesLeftInBlock; // Number of bytes left in current block
bool ReuseBlock;
char DestPath[MAX_PATH];
char CabinetReservedFile[MAX_PATH];
char DestPath[PATH_MAX];
char CabinetReservedFile[PATH_MAX];
void* CabinetReservedFileBuffer;
ULONG CabinetReservedFileSize;
FILEHANDLE FileHandle;

2
reactos/tools/cabman/cabman.h
View file

@ -38,7 +38,7 @@ private:
bool ProcessAll;
ULONG Mode;
bool PromptOnOverwrite;
char FileName[MAX_PATH];
char FileName[PATH_MAX];
};
/* EOF */

14
reactos/tools/cabman/dfp.cxx
View file

@ -123,7 +123,7 @@ CDFParser::~CDFParser()
void CDFParser::WriteInfLine(char* InfLine)
{
char buf[MAX_PATH];
char buf[PATH_MAX];
char eolbuf[2];
char* destpath;
#if defined(_WIN32)
@ -432,7 +432,7 @@ void CDFParser::SetFileRelativePath(char* Path)
strcpy(FileRelativePath, Path);
ConvertPath(FileRelativePath, false);
if (strlen(FileRelativePath) > 0)
NormalizePath(FileRelativePath, MAX_PATH);
NormalizePath(FileRelativePath, PATH_MAX);
}
@ -498,7 +498,7 @@ bool CDFParser::OnCabinetName(ULONG Number, char* Name)
* true if a cabinet name was returned, false if not
*/
{
char Buffer[MAX_PATH];
char Buffer[PATH_MAX];
ULONG i;
int j;
char ch;
@ -1107,11 +1107,11 @@ ULONG CDFParser::PerformFileCopy()
ULONG Status;
ULONG i, j;
char ch;
char SrcName[MAX_PATH];
char DstName[MAX_PATH];
char InfLine[MAX_PATH];
char SrcName[PATH_MAX];
char DstName[PATH_MAX];
char InfLine[PATH_MAX];
char Options[128];
char BaseFilename[MAX_PATH];
char BaseFilename[PATH_MAX];
*SrcName = '\0';
*DstName = '\0';