From a36dabc00216aa22ec2953d17b2293ad0c7bf7fc Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Mon, 20 Dec 2021 19:03:18 +0100 Subject: [PATCH] Code cleanup --- src/raspberrypi/rascsi_image.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/raspberrypi/rascsi_image.cpp b/src/raspberrypi/rascsi_image.cpp index 0f582db9..97f96fe3 100644 --- a/src/raspberrypi/rascsi_image.cpp +++ b/src/raspberrypi/rascsi_image.cpp @@ -206,14 +206,15 @@ bool RascsiImage::DeleteImage(int fd, const PbCommand& command) size_t last_slash = filename.rfind('/'); while (last_slash != string::npos) { string folder = filename.substr(0, last_slash); + string full_folder = default_image_folder + "/" + folder; std::error_code error; - if (!filesystem::is_empty(default_image_folder + "/" + folder, error) || error) { + if (!filesystem::is_empty(full_folder, error) || error) { break; } - if (remove((default_image_folder + "/" + folder).c_str())) { - return ReturnStatus(fd, false, "Can't delete empty image folder '" + default_image_folder + "/" + folder +"'"); + if (remove(full_folder.c_str())) { + return ReturnStatus(fd, false, "Can't delete empty image folder '" + full_folder +"'"); } last_slash = folder.rfind('/');