Nothing to do with the changes, but here `getenv()` may be called twice.