[stable28] Fix remaining readdir() calls in loops with undesirable false evaluation potential

[stable28] Fix remaining readdir() calls in loops with undesirable false evaluation potential #2031