cmFileCommand: Fix style and compile issues.
Merge topic 'file-strings-encoding' into next

414a1b6e cmFileCommand: Fix style and compile issues.