mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-24 12:12:19 +03:00
44d8213f4e
When using an external editor (i.e. "Use internal edit" in the Configure Options is unchecked) the environment variable EDITOR is used. However, if $EDITOR contains a command line argument after the executable name, these arguments are not processed properly, and the editor might not be started at all. How to reproduce: (Precondition: vi is available on the system) 1) On the command line, execute: export EDITOR="vi +" && mc (the + argument should let vi start at the document's end instead of the beginning). 2) Go to the Options menu -> Configuration -> uncheck "Use internal edit". 3) Move the cursor to a file that is larger than a single screen (e.g. ABOUT-NLS in mc's source directory). 4) Press F4 to start the external editor. Result: Nothing visible happens Expected result: vi is opened showing the end of the file ABOUT-NLS The bug: my_system_make_arg_array() doesn't perform full-feature parsing of the comman line. * (str_tokenize): mew function based on history_tokenize_internal() from GNU readline-8.2. * (str_tokenize_word): mew function based on history_tokenize_word() from GNU readline-8.2. * (my_system_make_arg_array): reimplement using str_tokenize(). * (my_systemv_flags): use modified my_system_make_arg_array(). * (fork_child_tokens): new test for string tokenization. * (fork_child_tokens2): likewise. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
162 lines
5.2 KiB
C
162 lines
5.2 KiB
C
/*
|
|
lib - tests lib/utilinux:my_system() function
|
|
|
|
Copyright (C) 2013-2024
|
|
Free Software Foundation, Inc.
|
|
|
|
Written by:
|
|
Slava Zanko <slavazanko@gmail.com>, 2013
|
|
|
|
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 "/lib/utilunix"
|
|
|
|
#include "tests/mctest.h"
|
|
|
|
#include "lib/util.h"
|
|
#include "lib/utilunix.h"
|
|
|
|
#include "utilunix__my_system-common.c"
|
|
|
|
/* --------------------------------------------------------------------------------------------- */
|
|
|
|
/* *INDENT-OFF* */
|
|
START_TEST (fork_child)
|
|
/* *INDENT-ON* */
|
|
{
|
|
int actual_value;
|
|
/* given */
|
|
fork__return_value = 0;
|
|
|
|
/* when */
|
|
actual_value = my_system (0, "/bin/some-command", "some parameter");
|
|
|
|
/* then */
|
|
ck_assert_int_eq (actual_value, 0);
|
|
|
|
VERIFY_SIGACTION_CALLS ();
|
|
VERIFY_SIGNAL_CALLS ();
|
|
|
|
mctest_assert_str_eq (execvp__file__captured, "/bin/some-command");
|
|
ck_assert_int_eq (execvp__args__captured->len, 2);
|
|
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 0), "/bin/some-command");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 1), "some parameter");
|
|
|
|
/* All exec* calls is mocked, so call to _exit() function with 127 status code it's a normal situation */
|
|
ck_assert_int_eq (my_exit__status__captured, 127);
|
|
}
|
|
/* *INDENT-OFF* */
|
|
END_TEST
|
|
/* *INDENT-ON* */
|
|
|
|
/* --------------------------------------------------------------------------------------------- */
|
|
|
|
/* *INDENT-OFF* */
|
|
START_TEST (fork_child_tokens)
|
|
/* *INDENT-ON* */
|
|
{
|
|
int actual_value;
|
|
/* given */
|
|
fork__return_value = 0;
|
|
|
|
/* when */
|
|
actual_value = my_system (0, "vi +", "foo.txt");
|
|
|
|
/* then */
|
|
ck_assert_int_eq (actual_value, 0);
|
|
|
|
VERIFY_SIGACTION_CALLS ();
|
|
VERIFY_SIGNAL_CALLS ();
|
|
|
|
mctest_assert_str_eq (execvp__file__captured, "vi");
|
|
ck_assert_int_eq (execvp__args__captured->len, 3);
|
|
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 0), "vi");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 1), "+");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 2), "foo.txt");
|
|
|
|
/* All exec* calls is mocked, so call to _exit() function with 127 status code it's a normal situation */
|
|
ck_assert_int_eq (my_exit__status__captured, 127);
|
|
}
|
|
/* *INDENT-OFF* */
|
|
END_TEST
|
|
/* *INDENT-ON* */
|
|
|
|
/* --------------------------------------------------------------------------------------------- */
|
|
|
|
/* *INDENT-OFF* */
|
|
START_TEST (fork_child_tokens2)
|
|
/* *INDENT-ON* */
|
|
{
|
|
int actual_value;
|
|
/* given */
|
|
fork__return_value = 0;
|
|
|
|
/* when */
|
|
actual_value = my_system (0, "qwe -a 'aa bb' -b -c cc -d \"dd ee\" -f ff\\ gg", "foo.txt");
|
|
|
|
/* then */
|
|
ck_assert_int_eq (actual_value, 0);
|
|
|
|
VERIFY_SIGACTION_CALLS ();
|
|
VERIFY_SIGNAL_CALLS ();
|
|
|
|
mctest_assert_str_eq (execvp__file__captured, "qwe");
|
|
ck_assert_int_eq (execvp__args__captured->len, 11);
|
|
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 0), "qwe");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 1), "-a");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 2), "'aa bb'");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 3), "-b");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 4), "-c");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 5), "cc");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 6), "-d");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 7), "\"dd ee\"");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 8), "-f");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 9), "ff\\ gg");
|
|
mctest_assert_str_eq (g_ptr_array_index (execvp__args__captured, 10), "foo.txt");
|
|
|
|
/* All exec* calls is mocked, so call to _exit() function with 127 status code it's a normal situation */
|
|
ck_assert_int_eq (my_exit__status__captured, 127);
|
|
}
|
|
/* *INDENT-OFF* */
|
|
END_TEST
|
|
/* *INDENT-ON* */
|
|
|
|
/* --------------------------------------------------------------------------------------------- */
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
TCase *tc_core;
|
|
|
|
tc_core = tcase_create ("Core");
|
|
|
|
tcase_add_checked_fixture (tc_core, setup, teardown);
|
|
|
|
/* Add new tests here: *************** */
|
|
tcase_add_test (tc_core, fork_child);
|
|
tcase_add_test (tc_core, fork_child_tokens);
|
|
tcase_add_test (tc_core, fork_child_tokens2);
|
|
/* *********************************** */
|
|
|
|
return mctest_run_all (tc_core);
|
|
}
|
|
|
|
/* --------------------------------------------------------------------------------------------- */
|