Import getcwd and readutmp changes from coreutils.