Move the search_buf wrapper into search_file. Rename search_nonzipped_buf back to search_buf.