Untested changes to make the '-s windows' option
work on Windows.
2 files changed