Correct strchr_r() traking pointer incerement on reentry