vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'terminology-1.7'

This commit is contained in:
Boris Faure 2020-05-18 22:29:25 +02:00
parent 6836f16ee6 446823b6ea
commit 13fce0866c
Signed by untrusted user who does not match committer: borisfaure
GPG Key ID: 35C0410516166BE8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snap/local/efl-efreetd-search.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index f859c630f0..159cc81155 100644
index f859c630f0..f7d196ef6b 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -112,6 +112,53 @@ EAPI int EFREET_EVENT_DESKTOP_CACHE_BUILD = 0;
@ -29,12 +29,12 @@ index f859c630f0..159cc81155 100644
+ int res;
+ int len = (int)(end - start);
+ if (*(end-1) == '/')
+ len = snprintf(buf, PATH_MAX, "%.*s%s",
+ snprintf(buf, PATH_MAX, "%.*s%s",
+ len,
+ start,
+ name);
+ else
+ len = snprintf(buf, PATH_MAX, "%.*s/%s",
+ snprintf(buf, PATH_MAX, "%.*s/%s",
+ len,
+ start,
+ name);

2
src/bin/options_elm.c
View File

@ -65,7 +65,7 @@ _find_binary(void)
struct stat st;
int res;
const char *lookup_path;
if (*end == '/')
if (*(end-1) == '/')
lookup_path = eina_stringshare_printf("%.*s%s",
(int)(end - start),
start,