Merge "Prevent user-defined basename_r from breaking basename(3)."