Merge branch 'jc/report-path-error-to-dir'

Code clean-up. * jc/report-path-error-to-dir: report_path_error(): move to dir.c