Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 07:03:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB][USETUP] Transform the existing ConcatPaths() function into a variadic function, and derive a CombinePaths() from it (plus their equivalent taking va_list).

Browse source 
This allows building concatenated paths with an arbitrary number of separated components.
- Use the newly-introduced CombinePaths() and ConcatPaths() functions.
- Fix also few comments, and place some UNICODE_NULLs here & there.

svn path=/branches/setup_improvements/; revision=74637
svn path=/branches/setup_improvements/; revision=74640
This commit is contained in:
Hermès Bélusca-Maïto 2017-05-23 22:30:54 +00:00
parent 92b99b865e
commit d27ef70aab
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
8 changed files with 201 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/setup/lib/arcname.c
View file

@ -798,7 +798,7 @@ ArcPathToNtPath(
*/
if (BeginOfPath && *BeginOfPath)
{
Status = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), BeginOfPath);
Status = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), 1, BeginOfPath);
if (!NT_SUCCESS(Status))
{
/* Buffer not large enough, or whatever...: just bail out */

133
base/setup/lib/filesup.c
View file

@ -13,36 +13,113 @@
#include <debug.h>
/* FUNCTIONS ****************************************************************/
NTSTATUS
ConcatPaths(
IN OUT PWSTR PathElem1,
ConcatPathsV(
IN OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN PCWSTR PathElem2 OPTIONAL)
IN ULONG NumberOfPathComponents,
IN va_list PathComponentsList)
{
NTSTATUS Status;
NTSTATUS Status = STATUS_SUCCESS;
SIZE_T cchPathLen;
PCWSTR PathComponent;
if (!PathElem2)
return STATUS_SUCCESS;
if (cchPathSize <= 1)
if (cchPathSize < 1)
return STATUS_SUCCESS;
cchPathLen = min(cchPathSize, wcslen(PathElem1));
if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\')
while (NumberOfPathComponents--)
{
/* PathElem2 does not start with '\' and PathElem1 does not end with '\' */
Status = RtlStringCchCatW(PathElem1, cchPathSize, L"\\");
PathComponent = va_arg(PathComponentsList, PCWSTR);
if (!PathComponent)
continue;
cchPathLen = min(cchPathSize, wcslen(PathBuffer));
if (cchPathLen >= cchPathSize)
return STATUS_BUFFER_OVERFLOW;
if (PathComponent[0] != OBJ_NAME_PATH_SEPARATOR &&
cchPathLen > 0 && PathBuffer[cchPathLen-1] != OBJ_NAME_PATH_SEPARATOR)
{
/* PathComponent does not start with '\' and PathBuffer does not end with '\' */
Status = RtlStringCchCatW(PathBuffer, cchPathSize, L"\\");
if (!NT_SUCCESS(Status))
return Status;
}
else if (PathComponent[0] == OBJ_NAME_PATH_SEPARATOR &&
cchPathLen > 0 && PathBuffer[cchPathLen-1] == OBJ_NAME_PATH_SEPARATOR)
{
/* PathComponent starts with '\' and PathBuffer ends with '\' */
while (*PathComponent == OBJ_NAME_PATH_SEPARATOR)
++PathComponent; // Skip any backslash
}
Status = RtlStringCchCatW(PathBuffer, cchPathSize, PathComponent);
if (!NT_SUCCESS(Status))
return Status;
}
else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\')
{
/* PathElem2 starts with '\' and PathElem1 ends with '\' */
while (*PathElem2 == L'\\')
++PathElem2; // Skip any backslash
}
Status = RtlStringCchCatW(PathElem1, cchPathSize, PathElem2);
return Status;
}
NTSTATUS
CombinePathsV(
OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN ULONG NumberOfPathComponents,
IN va_list PathComponentsList)
{
if (cchPathSize < 1)
return STATUS_SUCCESS;
*PathBuffer = UNICODE_NULL;
return ConcatPathsV(PathBuffer, cchPathSize,
NumberOfPathComponents,
PathComponentsList);
}
NTSTATUS
ConcatPaths(
IN OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN ULONG NumberOfPathComponents,
IN /* PCWSTR */ ...)
{
NTSTATUS Status;
va_list PathComponentsList;
if (cchPathSize < 1)
return STATUS_SUCCESS;
va_start(PathComponentsList, NumberOfPathComponents);
Status = ConcatPathsV(PathBuffer, cchPathSize,
NumberOfPathComponents,
PathComponentsList);
va_end(PathComponentsList);
return Status;
}
NTSTATUS
CombinePaths(
OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN ULONG NumberOfPathComponents,
IN /* PCWSTR */ ...)
{
NTSTATUS Status;
va_list PathComponentsList;
if (cchPathSize < 1)
return STATUS_SUCCESS;
*PathBuffer = UNICODE_NULL;
va_start(PathComponentsList, NumberOfPathComponents);
Status = CombinePathsV(PathBuffer, cchPathSize,
NumberOfPathComponents,
PathComponentsList);
va_end(PathComponentsList);
return Status;
}
@ -95,14 +172,7 @@ DoesFileExist(
UNICODE_STRING Name;
WCHAR FullName[MAX_PATH];
if (PathName)
RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName);
else
FullName[0] = UNICODE_NULL;
if (FileName)
ConcatPaths(FullName, ARRAYSIZE(FullName), FileName);
CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName);
RtlInitUnicodeString(&Name, FullName);
InitializeObjectAttributes(&ObjectAttributes,
@ -243,14 +313,7 @@ OpenAndMapFile(
UNICODE_STRING Name;
WCHAR FullName[MAX_PATH];
if (PathName)
RtlStringCchCopyW(FullName, ARRAYSIZE(FullName), PathName);
else
FullName[0] = UNICODE_NULL;
if (FileName)
ConcatPaths(FullName, ARRAYSIZE(FullName), FileName);
CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName);
RtlInitUnicodeString(&Name, FullName);
InitializeObjectAttributes(&ObjectAttributes,

28
base/setup/lib/filesup.h
View file

@ -16,10 +16,32 @@ IsValidPath(
#endif
NTSTATUS
ConcatPaths(
IN OUT PWSTR PathElem1,
ConcatPathsV(
IN OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN PCWSTR PathElem2 OPTIONAL);
IN ULONG NumberOfPathComponents,
IN va_list PathComponentsList);
NTSTATUS
CombinePathsV(
OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN ULONG NumberOfPathComponents,
IN va_list PathComponentsList);
NTSTATUS
ConcatPaths(
IN OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN ULONG NumberOfPathComponents,
IN /* PCWSTR */ ...);
NTSTATUS
CombinePaths(
OUT PWSTR PathBuffer,
IN SIZE_T cchPathSize,
IN ULONG NumberOfPathComponents,
IN /* PCWSTR */ ...);
BOOLEAN
DoesPathExist(