Merge branch 'rs/in-obsd-basename-dirname-take-const'