mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-03 18:14:25 +03:00
Added vfs_path_cmp() ans vfs_path_ncmp() functions
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko
parent
89e5604c9c
commit
d71e62c9fc
@ -1351,3 +1351,66 @@ vfs_path_build_url_params_str (const vfs_path_element_t * element, gboolean keep
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
/**
|
||||
* Compare two path objects as strings
|
||||
*
|
||||
* @param vpath1 first path object
|
||||
* @param vpath2 second vpath object
|
||||
*
|
||||
* @return integer value like to strcmp.
|
||||
*/
|
||||
|
||||
int
|
||||
vfs_path_cmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2)
|
||||
{
|
||||
char *path1;
|
||||
char *path2;
|
||||
int ret_val;
|
||||
|
||||
if (vpath1 == NULL || vpath2 == NULL)
|
||||
return -1;
|
||||
|
||||
path1 = vfs_path_to_str (vpath1);
|
||||
path2 = vfs_path_to_str (vpath2);
|
||||
|
||||
ret_val = strcmp (path1, path2);
|
||||
|
||||
g_free (path1);
|
||||
g_free (path2);
|
||||
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
/**
|
||||
* Compare two path objects as strings
|
||||
*
|
||||
* @param vpath1 first path object
|
||||
* @param vpath2 second vpath object
|
||||
* @param len number of first 'len' characters
|
||||
*
|
||||
* @return integer value like to strcmp.
|
||||
*/
|
||||
|
||||
int
|
||||
vfs_path_ncmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2, size_t len)
|
||||
{
|
||||
char *path1;
|
||||
char *path2;
|
||||
int ret_val;
|
||||
|
||||
if (vpath1 == NULL || vpath2 == NULL)
|
||||
return -1;
|
||||
|
||||
path1 = vfs_path_to_str (vpath1);
|
||||
path2 = vfs_path_to_str (vpath2);
|
||||
|
||||
ret_val = strncmp (path1, path2, len);
|
||||
|
||||
g_free (path1);
|
||||
g_free (path2);
|
||||
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
@ -76,6 +76,8 @@ char *vfs_path_serialize (const vfs_path_t * vpath, GError ** error);
|
||||
vfs_path_t *vfs_path_deserialize (const char *data, GError ** error);
|
||||
|
||||
char *vfs_path_build_url_params_str (const vfs_path_element_t * element, gboolean keep_password);
|
||||
int vfs_path_cmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2);
|
||||
int vfs_path_ncmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2, size_t len);
|
||||
|
||||
/*** inline functions ****************************************************************************/
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ LIBS=@CHECK_LIBS@ \
|
||||
TESTS = \
|
||||
canonicalize_pathname \
|
||||
current_dir \
|
||||
path_cmp \
|
||||
path_manipulations \
|
||||
path_recode \
|
||||
path_serialize \
|
||||
@ -29,6 +30,9 @@ canonicalize_pathname_SOURCES = \
|
||||
current_dir_SOURCES = \
|
||||
current_dir.c
|
||||
|
||||
path_cmp_SOURCES = \
|
||||
path_cmp.c
|
||||
|
||||
path_manipulations_SOURCES = \
|
||||
path_manipulations.c
|
||||
|
||||
|
||||
151
tests/lib/vfs/path_cmp.c
Normal file
151
tests/lib/vfs/path_cmp.c
Normal file
@ -0,0 +1,151 @@
|
||||
/* lib/vfs - vfs_path_t compare 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"
|
||||
|
||||
|
||||
static void
|
||||
setup (void)
|
||||
{
|
||||
str_init_strings (NULL);
|
||||
|
||||
vfs_init ();
|
||||
init_localfs ();
|
||||
vfs_setup_work_dir ();
|
||||
|
||||
mc_global.sysconfig_dir = (char *) TEST_SHARE_DIR;
|
||||
load_codepages_list ();
|
||||
}
|
||||
|
||||
static void
|
||||
teardown (void)
|
||||
{
|
||||
free_codepages_list ();
|
||||
|
||||
vfs_shut ();
|
||||
str_uninit_strings ();
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
#define path_cmp_one_check(input1, input2, etalon) {\
|
||||
vpath1 = vfs_path_from_str (input1);\
|
||||
vpath2 = vfs_path_from_str (input2);\
|
||||
result = vfs_path_cmp (vpath1, vpath2);\
|
||||
vfs_path_free (vpath1); \
|
||||
vfs_path_free (vpath2); \
|
||||
fail_unless ( result == etalon, "\ninput1: %s\ninput2: %s\nexpected: %d\nactual: %d\n",\
|
||||
input1, input2, etalon, result); \
|
||||
}
|
||||
|
||||
START_TEST (test_path_compare)
|
||||
{
|
||||
vfs_path_t *vpath1, *vpath2;
|
||||
int result;
|
||||
|
||||
path_cmp_one_check ("/тестовый/путь", "/тестовый/путь", 0);
|
||||
|
||||
path_cmp_one_check ("/#enc:KOI8-R/тестовый/путь", "/тестовый/путь", -174);
|
||||
|
||||
path_cmp_one_check ("/тестовый/путь", "/#enc:KOI8-R/тестовый/путь", 174);
|
||||
|
||||
path_cmp_one_check (NULL, "/тестовый/путь", -1);
|
||||
path_cmp_one_check ("/тестовый/путь", NULL, -1);
|
||||
path_cmp_one_check (NULL, NULL, -1);
|
||||
}
|
||||
END_TEST
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
#undef path_cmp_one_check
|
||||
|
||||
#define path_cmp_one_check(input1, input2, len, etalon) {\
|
||||
vpath1 = vfs_path_from_str (input1);\
|
||||
vpath2 = vfs_path_from_str (input2);\
|
||||
result = vfs_path_ncmp (vpath1, vpath2, len);\
|
||||
vfs_path_free (vpath1); \
|
||||
vfs_path_free (vpath2); \
|
||||
fail_unless ( result == etalon, "\ninput1: %s\ninput2: %s\nexpected: %d\nactual: %d\n",\
|
||||
input1, input2, etalon, result); \
|
||||
}
|
||||
|
||||
START_TEST (test_path_compare_len)
|
||||
{
|
||||
vfs_path_t *vpath1, *vpath2;
|
||||
int result;
|
||||
|
||||
path_cmp_one_check ("/тестовый/путь", "/тестовый/путь", 10, 0);
|
||||
|
||||
path_cmp_one_check ("/тест/овый/путь", "/тестовый/путь", 10, -161);
|
||||
|
||||
path_cmp_one_check ("/тестовый/путь", "/тест/овый/путь", 10, 161);
|
||||
|
||||
path_cmp_one_check ("/тест/овый/путь", "/тестовый/путь", 9, 0);
|
||||
|
||||
path_cmp_one_check (NULL, "/тестовый/путь", 0, -1);
|
||||
path_cmp_one_check ("/тестовый/путь", NULL, 0, -1);
|
||||
path_cmp_one_check (NULL, NULL, 0, -1);
|
||||
}
|
||||
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, test_path_compare);
|
||||
tcase_add_test (tc_core, test_path_compare_len);
|
||||
/* *********************************** */
|
||||
|
||||
suite_add_tcase (s, tc_core);
|
||||
sr = srunner_create (s);
|
||||
srunner_set_log (sr, "path_cmp.log");
|
||||
srunner_run_all (sr, CK_NORMAL);
|
||||
number_failed = srunner_ntests_failed (sr);
|
||||
srunner_free (sr);
|
||||
return (number_failed == 0) ? 0 : 1;
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
Loading…
Reference in New Issue
Block a user