[PATCH 2/4] properly quote strings