Windows required non-NULL anyways (via strlen) where *nix checked it
after passing it to opendir; just assume non-NULL everywhere and take a
string where possible.

Change-Id: I85c6dc71dd11be58ba61e269c4b40b009924d967