Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 16:33:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues noted at the PR review

Browse Source
This commit is contained in:
John Oberschelp 2019-09-10 15:58:35 -07:00 committed by GitHub
parent 05b37c744b
commit aa9354773b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tst/airfs/airfs.cpp
View File

@ -1139,7 +1139,7 @@ void AirfsDelete(AIRFS_ Airfs)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
NTSTATUS AirfsCreate( NTSTATUS AirfsCreate(
PWSTR VolumeName, PWSTR StorageFileName,
PWSTR MapName, PWSTR MapName,
ULONG Flags, ULONG Flags,
ULONG FileInfoTimeout, ULONG FileInfoTimeout,
@ -1160,12 +1160,12 @@ NTSTATUS AirfsCreate(
*PAirfs = 0; *PAirfs = 0;
boolean VolumeExists = *VolumeName && (_waccess(VolumeName, 0) != -1); boolean StorageFileExists = *StorageFileName && (_waccess(StorageFileName, 0) != -1);
Result = StorageStartup(Airfs, MapName, VolumeName, VolumeSize); Result = StorageStartup(Airfs, MapName, StorageFileName, VolumeSize);
if (Result) return Result; if (Result) return Result;
boolean ShouldFormat = !VolumeExists || memcmp(Airfs->VolumeLabel, L"AIRFS", 10); boolean ShouldFormat = !StorageFileExists || memcmp(Airfs->Signature, "Airfs\0\0\0", 8);
if (ShouldFormat) if (ShouldFormat)
{ {
@ -1177,10 +1177,10 @@ NTSTATUS AirfsCreate(
&RootSecurity, &RootSecuritySize)) &RootSecurity, &RootSecuritySize))
return GetLastErrorAsStatus(); return GetLastErrorAsStatus();
Airfs->VolumeName[0] = 0;
Airfs->VolumeSize = ROUND_DOWN(VolumeSize, ALLOCATION_UNIT); Airfs->VolumeSize = ROUND_DOWN(VolumeSize, ALLOCATION_UNIT);
Airfs->CaseInsensitive = CaseInsensitive; Airfs->CaseInsensitive = CaseInsensitive;
Airfs->VolumeLabelLength = sizeof L"AIRFS" - sizeof WCHAR;
memcpy(Airfs->VolumeLabel, L"AIRFS", Airfs->VolumeLabelLength);
FSP_FSCTL_VOLUME_PARAMS V; FSP_FSCTL_VOLUME_PARAMS V;
memset(&V, 0, sizeof V); memset(&V, 0, sizeof V);
@ -1206,9 +1206,6 @@ NTSTATUS AirfsCreate(
FileSystemName ? FileSystemName : L"-AIRFS"); FileSystemName ? FileSystemName : L"-AIRFS");
Airfs->VolumeParams = V; Airfs->VolumeParams = V;
Airfs->VolumeLabelLength = sizeof L"AIRFS" - sizeof WCHAR;
memcpy(Airfs->VolumeLabel, L"AIRFS", Airfs->VolumeLabelLength);
// Set up the available storage in chunks. // Set up the available storage in chunks.
Airfs->FreeSize = 0; Airfs->FreeSize = 0;
Airfs->Available = 0; Airfs->Available = 0;
@ -1278,7 +1275,7 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
ULONG Flags = AirfsDisk; ULONG Flags = AirfsDisk;
ULONG OtherFlags = 0; ULONG OtherFlags = 0;
ULONG FileInfoTimeout = INFINITE; ULONG FileInfoTimeout = INFINITE;
PWSTR VolumeName = L""; PWSTR StorageFileName = L"";
PWSTR MapName = L""; PWSTR MapName = L"";
UINT64 VolumeSize = 16LL * 1024 * 1024; UINT64 VolumeSize = 16LL * 1024 * 1024;
PWSTR FileSystemName = 0; PWSTR FileSystemName = 0;
@ -1302,7 +1299,7 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
case L'F': ARG_TO_S(FileSystemName); break; case L'F': ARG_TO_S(FileSystemName); break;
case L'i': OtherFlags = AirfsCaseInsensitive; break; case L'i': OtherFlags = AirfsCaseInsensitive; break;
case L'm': ARG_TO_S(MountPoint); break; case L'm': ARG_TO_S(MountPoint); break;
case L'N': ARG_TO_S(VolumeName); break; case L'N': ARG_TO_S(StorageFileName); break;
case L'n': ARG_TO_S(MapName); break; case L'n': ARG_TO_S(MapName); break;
case L'S': ARG_TO_S(RootSddl); break; case L'S': ARG_TO_S(RootSddl); break;
case L's': ARG_TO_8(VolumeSize); break; case L's': ARG_TO_8(VolumeSize); break;
@ -1345,7 +1342,7 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
} }
Result = AirfsCreate( Result = AirfsCreate(
VolumeName, StorageFileName,
MapName, MapName,
Flags | OtherFlags, Flags | OtherFlags,
FileInfoTimeout, FileInfoTimeout,
@ -1386,12 +1383,12 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
WCHAR buffer[1024]; WCHAR buffer[1024];
_snwprintf_s(buffer, 1024, L"%S%S%s%S%s -t %ld -s %lld%S%s%S%s%S%s", _snwprintf_s(buffer, 1024, L"%S%S%s%S%s -t %ld -s %lld%S%s%S%s%S%s",
PROGNAME, PROGNAME,
*VolumeName ? " -N " : "", *VolumeName ? VolumeName : L"", *StorageFileName ? " -N " : "", *StorageFileName ? StorageFileName : L"",
*MapName ? " -n " : "", *MapName ? MapName : L"", *MapName ? " -n " : "", *MapName ? MapName : L"",
FileInfoTimeout, VolumeSize, FileInfoTimeout, VolumeSize,
RootSddl ? " -S " : "", RootSddl ? RootSddl : L"", RootSddl ? " -S " : "", RootSddl ? RootSddl : L"",
*VolumePrefix ? " -u " : "", *VolumePrefix ? VolumePrefix : L"", *VolumePrefix ? " -u " : "", *VolumePrefix ? VolumePrefix : L"",
MountPoint ? " -m " : "", MountPoint ? MountPoint : L""); MountPoint ? " -m " : "", MountPoint ? MountPoint : L"");
INFO(buffer); INFO(buffer);
Service->UserContext = Airfs; Service->UserContext = Airfs;
@ -1416,11 +1413,11 @@ NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
" -i [case insensitive file system]\n" " -i [case insensitive file system]\n"
" -m MountPoint [X:|* (required if no UNC prefix)]\n" " -m MountPoint [X:|* (required if no UNC prefix)]\n"
" -n MapName [(ex) \"Local\\Airfs\"]\n" " -n MapName [(ex) \"Local\\Airfs\"]\n"
" -N VolumeName [\"\": in memory only]\n" " -N StorageFileName [\"\": in memory only]\n"
" -s VolumeSize [bytes]\n" " -s VolumeSize [bytes]\n"
" -S RootSddl [file rights: FA, etc; NO generic rights: GA, etc.]\n" " -S RootSddl [file rights: FA, etc; NO generic rights: GA, etc.]\n"
" -t FileInfoTimeout [millis]\n" " -t FileInfoTimeout [millis]\n"
" -u \\Server\\Share [UNC prefix (single backslash)]\n"; " -u \\Server\\Share [UNC prefix (single backslash)]\n";
FAIL(usage, L"" PROGNAME); FAIL(usage, L"" PROGNAME);