Merge branch '3235_copy_with_special_symbols'

* 3235_copy_with_special_symbols:
  Add '?' sign as a possible mark of wildcard.
  Fix for issue:
  Ticket #3235: copy files dosn't work as expected, when copying to a directory with the special symbol in its name

src/filemanager/filegui.c

@@ -610,14 +610,23 @@ overwrite_query_dialog (file_op_context_t * ctx, enum OperationMode mode)
 /* --------------------------------------------------------------------------------------------- */
 
 static gboolean
-is_wildcarded (char *p)
+is_wildcarded (const char *p)
 {
+    gboolean escaped = FALSE;
     for (; *p; p++)
     {
-        if (*p == '*')
+        if (*p == '\\')
+        {
+            if (p[1] >= '1' && p[1] <= '9' && !escaped)
                 return TRUE;
-        if (*p == '\\' && p[1] >= '1' && p[1] <= '9')
+            escaped = !escaped;
+        }
+        else
+        {
+            if ((*p == '*' || *p == '?') && !escaped)
                 return TRUE;
+            escaped = FALSE;
+        }
     }
     return FALSE;
 }

tests/src/filemanager/Makefile.am

@@ -19,10 +19,11 @@ endif
 EXTRA_DIST = hints/mc.hint
 
 TESTS = \
+	cmd__get_random_hint \
 	do_cd_command \
 	examine_cd \
 	exec_get_export_variables_ext \
-	cmd__get_random_hint
+	filegui_is_wildcarded
 
 check_PROGRAMS = $(TESTS)
 
@@ -37,3 +38,6 @@ exec_get_export_variables_ext_SOURCES = \
 
 cmd__get_random_hint_SOURCES = \
 	cmd__get_random_hint.c
+
+filegui_is_wildcarded_SOURCES = \
+	filegui_is_wildcarded.c

tests/src/filemanager/filegui_is_wildcarded.c

@@ -0,0 +1,167 @@
+/*
+   src/filemanager - tests for is_wildcarded() function
+
+   Copyright (C) 2011-2014
+   Free Software Foundation, Inc.
+
+   Written by:
+   Slava Zanko <slavazanko@gmail.com>, 2015
+
+   This file is part of the Midnight Commander.
+
+   The Midnight Commander is free software: you can redistribute it
+   and/or modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   The Midnight Commander 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define TEST_SUITE_NAME "/src/filemanager"
+
+#include "tests/mctest.h"
+
+#include "src/vfs/local/local.c"
+
+#include "src/filemanager/filegui.c"
+
+
+/* --------------------------------------------------------------------------------------------- */
+
+/* @Before */
+static void
+setup (void)
+{
+    str_init_strings (NULL);
+
+    vfs_init ();
+    init_localfs ();
+    vfs_setup_work_dir ();
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+/* @After */
+static void
+teardown (void)
+{
+    vfs_shut ();
+    str_uninit_strings ();
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+/* @DataSource("test_is_wildcarded_ds") */
+/* *INDENT-OFF* */
+static const struct test_is_wildcarded_ds
+{
+    const char *input_value;
+    gboolean expected_result;
+} test_is_wildcarded_ds[] =
+{
+    { /* 0 */
+        "blabla",
+        FALSE
+    },
+    { /* 1 */
+        "bla?bla",
+        TRUE
+    },
+    { /* 2 */
+        "bla*bla",
+        TRUE
+    },
+    { /* 3 */
+        "bla\\*bla",
+        FALSE
+    },
+
+    { /* 4 */
+        "bla\\\\*bla",
+        TRUE
+    },
+    { /* 5 */
+        "bla\\1bla",
+        TRUE
+    },
+    { /* 6 */
+        "bla\\\\1bla",
+        FALSE
+    },
+    { /* 7 */
+        "bla\\\t\\\\1bla",
+        FALSE
+    },
+    { /* 8 */
+        "bla\\\t\\\\\\1bla",
+        TRUE
+    },
+    { /* 9 */
+        "bla\\9bla",
+        TRUE
+    },
+    { /* 10 */
+        "blabla\\",
+        FALSE
+    },
+    { /* 11 */
+        "blab\\?la",
+        FALSE
+    },
+    { /* 12 */
+        "blab\\\\?la",
+        TRUE
+    },
+};
+/* *INDENT-ON* */
+
+/* @Test(dataSource = "test_is_wildcarded_ds") */
+/* *INDENT-OFF* */
+START_PARAMETRIZED_TEST (test_is_wildcarded, test_is_wildcarded_ds)
+/* *INDENT-ON* */
+{
+    /* given */
+    gboolean actual_result;
+
+    /* when */
+    actual_result = is_wildcarded (data->input_value);
+    /* then */
+    mctest_assert_int_eq (actual_result, data->expected_result);
+}
+/* *INDENT-OFF* */
+END_PARAMETRIZED_TEST
+/* *INDENT-ON* */
+
+/* --------------------------------------------------------------------------------------------- */
+
+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: *************** */
+    mctest_add_parameterized_test (tc_core, test_is_wildcarded, test_is_wildcarded_ds);
+    /* *********************************** */
+
+    suite_add_tcase (s, tc_core);
+    sr = srunner_create (s);
+    srunner_set_log (sr, "filegui_is_wildcarded.log");
+    srunner_run_all (sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed (sr);
+    srunner_free (sr);
+    return (number_failed == 0) ? 0 : 1;
+}
+
+/* --------------------------------------------------------------------------------------------- */