Merge branch '2776_archive_selection_in_root'

* 2776_archive_selection_in_root:
  Ticket #2776: file selection reset after exit from the archive in the root.
This commit is contained in:
Andrew Borodin 2012-04-13 14:54:10 +04:00
commit 81a8c428ec

View File

@ -2980,10 +2980,15 @@ get_parent_dir_name (const char *cwd, const char *lwd)
return NULL; return NULL;
} }
while (--p > lwd && *p != PATH_SEP); /* skip VFS prefix */
while (--p > lwd && *p != PATH_SEP); while (--p > lwd && *p != PATH_SEP)
;
/* get last component */
while (--p > lwd && *p != PATH_SEP)
;
return (p != lwd) ? p + 1 : NULL; /* return last component */
return (*p == PATH_SEP) ? p + 1 : p;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */