Skip to content

Remove alternate file stream code from non-Windows #4567

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
daxian-dbw merged 5 commits into from
Aug 28, 2017
Merged

Remove alternate file stream code from non-Windows #4567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
154a1ee
AlternateStreams support relies on pinvoke to win32 apis which don't …
SteveL-MSFT Aug 14, 2017
77cc9d9
address PR feedback
SteveL-MSFT Aug 14, 2017
6ae0bf9
address PR feedback
SteveL-MSFT Aug 16, 2017
aed2f24
address PR feedback, remove -Stream parameter for Unix
SteveL-MSFT Aug 16, 2017
7701b7a
ifdef out alternate stream syntax checks not applicable to unix
Aug 21, 2017
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
4 changes: 3 additions & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if !UNIX
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
Expand Down Expand Up @@ -161,4 +162,5 @@ private bool IsValidFileForUnblocking(string resolvedpath)
return isValidUnblockableFile;
}
}
}
}
#endif
2 changes: 2 additions & 0 deletions src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,9 @@ private IEnumerable<string> CreateCimModuleFiles(
fullPath,
file.RawFileData);

#if !UNIX
Copy link
Contributor

@PaulHigin PaulHigin Aug 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering if we need this #if here. This is part of CIM modules which I believe is not supported on Linux platforms and so this code should never run on non-Windows platforms.

Copy link
Member Author

@SteveL-MSFT SteveL-MSFT Aug 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe CDXML cmdlets can work on Linux via OMI

AlternateDataStreamUtilities.SetZoneOfOrigin(fullPath, SecurityZone.Intranet);
#endif
}

return relativePathsToCreatedFiles;
Expand Down
4 changes: 4 additions & 0 deletions src/System.Management.Automation/namespaces/FileSystemContentStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,22 +841,26 @@ private void CreateStreams(string filePath, string streamName, FileMode fileMode

try
{
#if !UNIX
if (!String.IsNullOrEmpty(streamName))
{
_stream = AlternateDataStreamUtilities.CreateFileStream(filePath, streamName, fileMode, fileAccess, fileShare);
}
else
#endif
{
_stream = new FileStream(filePath, fileMode, fileAccess, fileShare);
}
}
catch (IOException)
{
#if !UNIX
if (!String.IsNullOrEmpty(streamName))
{
_stream = AlternateDataStreamUtilities.CreateFileStream(filePath, streamName, fileMode, requestedAccess, fileShare);
}
else
#endif
{
_stream = new FileStream(filePath, fileMode, requestedAccess, fileShare);
}
Expand Down
Loading