Merge branch 'jk/flockfile-stdio'

Code clean-up.

* jk/flockfile-stdio:
config: move flockfile() closer to unlocked functions

diff --cc config.c
Simple merge