wow, major screwup here. please revert #3 also. given that almost anything can be in a filename (incl newlines!), this needs to be redone.