Update based on reviewer comments.

This commit is contained in:
Doug Lyons 2020-02-09 12:15:50 -06:00 committed by Victor Perevertkin
parent e1d0128ffc
commit f68efe516e

View file

@ -129,13 +129,13 @@ PrintAttribute(
if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
continue; continue;
if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) if (!wcscmp(findData.cFileName, L".") ||
!wcscmp(findData.cFileName, L".."))
continue; continue;
wcscpy(pszFileName, findData.cFileName); wcscpy(pszFileName, findData.cFileName);
wcscat(pszFileName, L"\\"); wcscat(pszFileName, L"\\");
bFound = PrintAttribute(szFullName, pszFile, bRecurse, bFound != PrintAttribute(szFullName, pszFile, bRecurse, bDirectories);
bDirectories) || bFound;
} }
while (FindNextFileW(hFind, &findData)); while (FindNextFileW(hFind, &findData));
FindClose(hFind); FindClose(hFind);
@ -159,7 +159,8 @@ PrintAttribute(
if (bIsDir && !bDirectories && !bExactMatch) if (bIsDir && !bDirectories && !bExactMatch)
continue; continue;
if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) if (!wcscmp(findData.cFileName, L".") ||
!wcscmp(findData.cFileName, L".."))
continue; continue;
wcscpy(pszFileName, findData.cFileName); wcscpy(pszFileName, findData.cFileName);
@ -226,13 +227,14 @@ ChangeAttribute(
if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
continue; continue;
if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) if (!wcscmp(findData.cFileName, L".") ||
!wcscmp(findData.cFileName, L".."))
continue; continue;
wcscpy(pszFileName, findData.cFileName); wcscpy(pszFileName, findData.cFileName);
wcscat(pszFileName, L"\\"); wcscat(pszFileName, L"\\");
bFound = ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, bFound != ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories,
dwMask, dwAttrib) || bFound; dwMask, dwAttrib);
} }
while (FindNextFileW(hFind, &findData)); while (FindNextFileW(hFind, &findData));
FindClose(hFind); FindClose(hFind);
@ -256,7 +258,8 @@ ChangeAttribute(
if (bIsDir && !bDirectories && !bExactMatch) if (bIsDir && !bDirectories && !bExactMatch)
continue; continue;
if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) if (!wcscmp(findData.cFileName, L".") ||
!wcscmp(findData.cFileName, L".."))
continue; continue;
if (bRecurse && bIsDir && !bDirectories) if (bRecurse && bIsDir && !bDirectories)