Issue #16121: Fix line number accounting in shlex
4 files changed