rerwin: 3+ fixes

There were a couple of oversights in my previous application of rerwin's '3' and '3a' fixes for Woof, as rerwin has posted about here:
http://murga-linux.com/puppy/viewtopic.php?t=76961&start=330

I have applied those fixes. I also found a "-E" is needed for grep on one line, otherwise the search will always return nothing, in script functions4puppy4.

Explanation: a default grep expression treats "|" as just another string character, whereas extended-regular-expression treats it as a OR operation (latter is what we want).

Woof commit:
http://bkhome.org/fossil/woof2.cgi/info/4ca1741e19

Tags: woof