mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-01 21:51:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

(examine_cd): return GString.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2020-12-18 14:02:01 +03:00
parent 38fee964bc
commit 6f96cad1ca
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/filemanager/command.c
View File

@ -91,7 +91,7 @@ static input_colors_t command_colors;
* @return newly allocated string
*/
static char *
static GString *
examine_cd (const char *_path)
{
/* *INDENT-OFF* */
@ -181,7 +181,7 @@ examine_cd (const char *_path)
g_free (path_tilde);
return g_string_free (q, FALSE);
return q;
}
/* --------------------------------------------------------------------------------------------- */
@ -424,20 +424,20 @@ do_cd_command (char *orig_cmd)
}
else
{
char *path;
GString *s_path;
vfs_path_t *q_vpath;
gboolean ok;
path = examine_cd (&cmd[operand_pos]);
s_path = examine_cd (cmd + operand_pos);
if (*path == '\0')
if (s_path->len == 0)
q_vpath = vfs_path_from_str (mc_config_get_home_dir ());
else
q_vpath = vfs_path_from_str_flags (path, VPF_NO_CANON);
q_vpath = vfs_path_from_str_flags (s_path->str, VPF_NO_CANON);
ok = do_cd (current_panel, q_vpath, cd_parse_command);
if (!ok)
ok = handle_cdpath (path);
ok = handle_cdpath (s_path->str);
if (!ok)
{
@ -450,7 +450,7 @@ do_cd_command (char *orig_cmd)
}
vfs_path_free (q_vpath);
g_free (path);
g_string_free (s_path, TRUE);
}
}

11
tests/src/filemanager/examine_cd.c
View File

@ -5,7 +5,7 @@
Free Software Foundation, Inc.
Written by:
Andrew Borodin <aborodin@vmail.ru>, 2012
Andrew Borodin <aborodin@vmail.ru>, 2012, 2020
Slava Zanko <slavazanko@gmail.com>, 2013
This file is part of the Midnight Commander.
@ -120,19 +120,20 @@ teardown (void)
}
/* --------------------------------------------------------------------------------------------- */
#define check_examine_cd(input, etalon) \
{ \
result = examine_cd (input); \
fail_unless (strcmp (result, etalon) == 0, \
"\ninput (%s)\nactial (%s) not equal to\netalon (%s)", input, result, etalon); \
g_free (result); \
fail_unless (strcmp (result->str, etalon) == 0, \
"\ninput (%s)\nactial (%s) not equal to\netalon (%s)", input, result->str, etalon); \
g_string_free (result, TRUE); \
}
/* *INDENT-OFF* */
START_TEST (test_examine_cd)
/* *INDENT-ON* */
{
char *result;
GString *result;
g_setenv ("AAA", "aaa", TRUE);