some fixes for solaris compiles. toupper was redefined to handle strings, now renamed to toupper_str disk.c has some more problems (it uses statfs and dirfd)