Previous implementation was introducing ambiguity on a
potential off-by-one.

Rework the statement so it is clear that char_file_end
is to be considered as collection's end().

Change-Id: I7af6f9333c80c8a897ff21ca5ccfe2a2c268546d