This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efm2.
View the commit online.
commit 0b9c076b6bbfdf250c7a09a70c1515d9f9687cc1
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Tue Apr 16 20:41:22 2024 +0100
fix fs scan
---
src/backends/default/mv.c | 21 +++++----------------
src/backends/default/status.c | 1 +
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/backends/default/mv.c b/src/backends/default/mv.c
index bda92dd..e39bf1c 100644
--- a/src/backends/default/mv.c
+++ b/src/backends/default/mv.c
@@ -77,24 +77,10 @@ fs_scan(const char *src)
it = eina_file_ls(src);
if (it)
{
- Eina_Strbuf *buf;
-
- buf = eina_strbuf_new();
EINA_ITERATOR_FOREACH(it, s)
{
- // build new path "src/s"
- eina_strbuf_reset(buf);
- eina_strbuf_append(buf, src);
- // add / if src doesn't end in /
- if (src[strlen(src) - 1] != '/') eina_strbuf_append(buf, "/");
- eina_strbuf_append(buf, s);
- eina_stringshare_del(s);
- // fs_scan this file (or dir)
- // yes - this returns. we make leak our eina_file_ls data, strbuf etc.
- // dont care - we're going to exit the whole process in a bit
- if (!fs_scan(eina_strbuf_string_get(buf))) return EINA_FALSE;
+ if (!fs_scan(s)) return EINA_FALSE;
}
- eina_strbuf_free(buf);
}
}
else
@@ -317,7 +303,10 @@ main(int argc, char **argv)
free(src_meta);
free(dst_meta);
}
- else pause(); // wait here - status thread will exit for us
+ else
+ {
+ status_end();
+ }
err:
if (buf) eina_strbuf_free(buf);
status_end();
diff --git a/src/backends/default/status.c b/src/backends/default/status.c
index aff152e..973e275 100644
--- a/src/backends/default/status.c
+++ b/src/backends/default/status.c
@@ -159,6 +159,7 @@ _cb_status_thread(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
break;
case MSG_END:
{
+ _status_flush();
if (status_fd >= 0)
{
close(status_fd);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
