efreet - fix mime file path messing with short paths like /

this fixes T4015

@fix
This commit is contained in:
Carsten Haitzler 2016-07-05 15:56:43 +09:00
parent e24366de25
commit 2ca5075193
4 changed files with 9 additions and 2 deletions

View File

@ -711,10 +711,13 @@ efreet_mime_special_check(const char *file)
parent[PATH_MAX - 1] = '\0';
/* Kill any trailing slash */
parent[--path_len] = '\0';
if (parent[path_len - 1] == '/')
parent[--path_len] = '\0';
/* Truncate to last slash */
while (parent[--path_len] != '/') parent[path_len] = '\0';
while ((path_len > 0) &&
(parent[--path_len] != '/'))
parent[path_len] = '\0';
#ifdef _WIN32
if (!stat(file, &s2))

View File

@ -120,6 +120,7 @@ eng_window_free(Evas_GL_Cocoa_Window *gw)
void
eng_window_use(Evas_GL_Cocoa_Window *gw)
{
if ((gw) && (!gw->gl_context)) return;
if (_evas_gl_cocoa_window != gw)
{
[[(NSOpenGLView*)gw->view openGLContext] makeCurrentContext];

View File

@ -676,6 +676,8 @@ eng_window_use(Outbuf *gw)
xwin = _tls_outbuf_get();
glsym_evas_gl_preload_render_lock(eng_window_make_current, gw);
if ((gw) && (!gw->gl_context)) return;
#ifdef GL_GLES
if (xwin)
{

View File

@ -233,6 +233,7 @@ eng_window_use(Outbuf *gw)
Eina_Bool force = EINA_FALSE;
glsym_evas_gl_preload_render_lock(eng_preload_make_current, gw);
if ((gw) && (!gw->gl_context)) return;
if (_evas_gl_wl_window)
{