-Removed the faulty implementation of basename
-Replaced the use of basename() from util.c with the one from libgen.h