From 10efc4aade55132281c34a3a9d0abb8db1cb62bd Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 25 Sep 2024 09:52:12 +0200 Subject: [PATCH] Prevented a surplus slash in compare_file paths --- test/compare_file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/compare_file.c b/test/compare_file.c index d27f740e..cb6f3925 100644 --- a/test/compare_file.c +++ b/test/compare_file.c @@ -5,7 +5,7 @@ To compare tree /media/dvd and /original/dir : find /media/dvd -exec compare_file '{}' /media/dvd /original/dir ';' - Copyright 2008 - 2015 Thomas Schmitt, + Copyright 2008 - 2024 Thomas Schmitt, Provided under GPL version 2 or later. @@ -304,7 +304,8 @@ int main(int argc, char **argv) strcpy(adr1, argv[1]); strcpy(adrc, argv[1]+strlen(argv[2])); strcpy(adr2, argv[3]); - if(adrc[0] == '/' || adrc[0] == 0) + if(!(adrc[0] == '/' || adrc[0] == 0 || + (strlen(adr2) > 0 && adr2[strlen(adr2) - 1] == '/'))) strcat(adr2, "/"); strcat(adr2, adrc);