[C] Synch igrep with upstream 2.113