Ticket #2758: cd command not working in shell link

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

lib/vfs/interface.c

@@ -658,34 +658,36 @@ mc_chdir (const vfs_path_t * vpath)
     vfsid old_vfsid;
     int result;
     const vfs_path_element_t *path_element;
-    vfs_path_t *abcolute_vpath;
+    vfs_path_t *cd_vpath;
 
     if (vpath == NULL)
         return -1;
 
-    path_element = vfs_path_get_by_index (vpath, -1);
+    if (vpath->relative)
+        cd_vpath = vfs_path_to_absolute (vpath);
+    else
+        cd_vpath = vfs_path_clone (vpath);
+
+    path_element = vfs_path_get_by_index (cd_vpath, -1);
 
     if (!vfs_path_element_valid (path_element) || path_element->class->chdir == NULL)
     {
-        return -1;
+        goto error_end;
     }
 
-    abcolute_vpath = vfs_path_to_absolute (vpath);
+    result = (*path_element->class->chdir) (cd_vpath);
-
-    result = (*path_element->class->chdir) (abcolute_vpath);
 
     if (result == -1)
     {
-        vfs_path_free (abcolute_vpath);
         errno = vfs_ferrno (path_element->class);
-        return -1;
+        goto error_end;
     }
 
     old_vfsid = vfs_getid (vfs_get_raw_current_dir ());
     old_vfs = current_vfs;
 
     /* Actually change directory */
-    vfs_set_raw_current_dir (abcolute_vpath);
+    vfs_set_raw_current_dir (cd_vpath);
 
     current_vfs = path_element->class;
 
@@ -702,6 +704,10 @@ mc_chdir (const vfs_path_t * vpath)
             *p = 0;
     }
     return 0;
+
+  error_end:
+    vfs_path_free (cd_vpath);
+    return -1;
 }
 
 /* --------------------------------------------------------------------------------------------- */

tests/lib/vfs/Makefile.am

@@ -16,6 +16,7 @@ TESTS = \
 	path_manipulations \
 	path_recode \
 	path_serialize \
+	relative_cd \
 	tempdir \
 	vfs_parse_ls_lga \
 	vfs_path_string_convert \
@@ -46,6 +47,9 @@ path_recode_SOURCES = \
 path_serialize_SOURCES = \
 	path_serialize.c
 
+relative_cd_SOURCES = \
+	relative_cd.c
+
 tempdir_SOURCES = \
 	tempdir.c
 

tests/lib/vfs/current_dir.c

@@ -115,8 +115,10 @@ START_TEST (set_up_current_dir_url)
 }
 
 END_TEST
-    /* --------------------------------------------------------------------------------------------- */
+
-    int
+/* --------------------------------------------------------------------------------------------- */
+
+int
 main (void)
 {
     int number_failed;

tests/lib/vfs/relative_cd.c

@@ -0,0 +1,134 @@
+/* lib/vfs - test vfs_path_t manipulation functions
+
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   Written by:
+    Slava Zanko <slavazanko@gmail.com>, 2011
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License
+   as published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#define TEST_SUITE_NAME "/lib/vfs"
+
+#include <check.h>
+
+#include "lib/global.c"
+
+#ifndef HAVE_CHARSET
+#define HAVE_CHARSET 1
+#endif
+
+#include "lib/charsets.h"
+
+#include "lib/strutil.h"
+#include "lib/vfs/xdirentry.h"
+#include "lib/vfs/path.h"
+
+#include "src/vfs/local/local.c"
+
+
+struct vfs_s_subclass test_subclass1;
+struct vfs_class vfs_test_ops1;
+
+static int test_chdir (const vfs_path_t * vpath);
+
+
+static void
+setup (void)
+{
+
+    str_init_strings (NULL);
+
+    vfs_init ();
+    init_localfs ();
+    vfs_setup_work_dir ();
+
+    test_subclass1.flags = VFS_S_REMOTE;
+    vfs_s_init_class (&vfs_test_ops1, &test_subclass1);
+
+    vfs_test_ops1.name = "testfs1";
+    vfs_test_ops1.flags = VFSF_NOLINKS;
+    vfs_test_ops1.prefix = "test1";
+    vfs_test_ops1.chdir = test_chdir;
+    vfs_register_class (&vfs_test_ops1);
+
+    mc_global.sysconfig_dir = (char *) TEST_SHARE_DIR;
+    load_codepages_list ();
+}
+
+static void
+teardown (void)
+{
+    free_codepages_list ();
+
+    vfs_shut ();
+    str_uninit_strings ();
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+static int
+test_chdir (const vfs_path_t * vpath)
+{
+    char *path = vfs_path_to_str (vpath);
+    printf ("test_chdir: %s\n", path);
+    g_free (path);
+    return 0;
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+START_TEST (relative_cd)
+{
+    vfs_path_t *vpath;
+
+    vpath = vfs_path_from_str ("/test1://user:pass@some.host:12345/path/to/dir");
+    fail_if (mc_chdir(vpath) == -1);
+    vfs_path_free (vpath);
+
+    vpath = vfs_path_from_str_flags ("some-non-exists-dir", VPF_NO_CANON);
+    fail_if (mc_chdir(vpath) == -1);
+    vfs_path_free (vpath);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+END_TEST
+
+int
+main (void)
+{
+    int number_failed;
+
+    Suite *s = suite_create (TEST_SUITE_NAME);
+    TCase *tc_core = tcase_create ("Core");
+    SRunner *sr;
+
+    tcase_add_checked_fixture (tc_core, setup, teardown);
+
+    /* Add new tests here: *************** */
+    tcase_add_test (tc_core, relative_cd);
+    /* *********************************** */
+
+    suite_add_tcase (s, tc_core);
+    sr = srunner_create (s);
+    srunner_set_log (sr, "relative_cd.log");
+    srunner_run_all (sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed (sr);
+    srunner_free (sr);
+    return (number_failed == 0) ? 0 : 1;
+}
+
+/* --------------------------------------------------------------------------------------------- */