From acd02c003d6e0407db0760fcfde424a173595e14 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Tue, 7 Jan 2020 16:25:29 +0100 Subject: [PATCH] wastebasket: Stop infinite loop if .waste is not found. --- Makefile | 3 ++- .../{ => dotlocal/share/vlc/lua/extensions}/WasteBasket.lua | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) rename wastebasket/{ => dotlocal/share/vlc/lua/extensions}/WasteBasket.lua (97%) diff --git a/Makefile b/Makefile index 650cb44..0510480 100644 --- a/Makefile +++ b/Makefile @@ -26,4 +26,5 @@ install: mkdir -p /usr/local/share/man/man1 parallel ln -sf `pwd`/{} /usr/local/share/man/man1/{/} ::: */*.1 mkdir -p $(HOME)/.local/share/vlc/lua/extensions - ln -s `pwd`/splitvideo/dotlocal/share/vlc/lua/extensions/splitvideo.lua $(HOME)/.local/share/vlc/lua/extensions/splitvideo.lua + ln -sf `pwd`/splitvideo/dotlocal/share/vlc/lua/extensions/splitvideo.lua $(HOME)/.local/share/vlc/lua/extensions/splitvideo.lua + ln -sf `pwd`/wastebasket/dotlocal/share/vlc/lua/extensions/WasteBasket.lua $(HOME)/.local/share/vlc/lua/extensions/WasteBasket.lua diff --git a/wastebasket/WasteBasket.lua b/wastebasket/dotlocal/share/vlc/lua/extensions/WasteBasket.lua similarity index 97% rename from wastebasket/WasteBasket.lua rename to wastebasket/dotlocal/share/vlc/lua/extensions/WasteBasket.lua index 5a9c4f6..432ad53 100644 --- a/wastebasket/WasteBasket.lua +++ b/wastebasket/dotlocal/share/vlc/lua/extensions/WasteBasket.lua @@ -74,6 +74,11 @@ function wastedir(dir) end -- try the parent dir local parent = dirname(dir) + if(parent == dir) then + -- we have reached root (/) + -- return wdir (which does not exist) + return wdir + end vlc.msg.dbg("[Wastebasket/wastedir] parent " .. parent) if directory_exists(parent) then return wastedir(parent)