Skip to content

Minor update on 'GetFileSystemItem' #6984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 1 commit into from
Jun 5, 2018
Merged

Minor update on 'GetFileSystemItem' #6984

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,10 +1218,10 @@ private FileSystemInfo GetFileSystemItem(string path, ref bool isContainer, bool
path = NormalizePath(path);
FileInfo result = new FileInfo(path);

// FileInfo.Exists is always false for a directory path, so we check the attribute for existence.
var attributes = result.Attributes;
// FileInfo.Exists is true for files but false for directories
// so we check attributes directly.
bool exists = (int)attributes != -1;
if ((int)attributes == -1) { /* Path doesn't exist. */ return null; }

bool hidden = attributes.HasFlag(FileAttributes.Hidden);
isContainer = attributes.HasFlag(FileAttributes.Directory);

Expand Down Expand Up @@ -1250,10 +1250,9 @@ private FileSystemInfo GetFileSystemItem(string path, ref bool isContainer, bool
// also return the object
if (!isContainer)
{
if (exists && (!hidden || Force || showHidden || filterHidden || switchFilterHidden))
if (!hidden || Force || showHidden || filterHidden || switchFilterHidden)
{
s_tracer.WriteLine("Got file info: {0}", result);

return result;
}
}
Expand All @@ -1270,10 +1269,9 @@ private FileSystemInfo GetFileSystemItem(string path, ref bool isContainer, bool

// if "Hidden" is specified in the attribute filter dynamic parameters
// also return the object
if (exists && (isRootPath || !hidden || Force || showHidden || filterHidden || switchFilterHidden))
if (isRootPath || !hidden || Force || showHidden || filterHidden || switchFilterHidden)
{
s_tracer.WriteLine("Got directory info: {0}", result);

return new DirectoryInfo(path);
}
}
Expand Down