archive/archived
Archived
1
0
Fork 0
Code Activity

common/path.c: normalize function (old fmt_path) using strbuf.

Browse source
This commit is contained in:
H Hautakoski 2010-09-14 12:58:39 +02:00 • committed by Henrik Hautakoski
parent ccdad9c6aa
commit 25d789c77b
9 changed files with 30 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/Makefile
View file

@ -12,7 +12,7 @@ strbuf :
$(CC) $(CFLAGS) ../src/common/strbuf.c t_strbuf.c -o test_strbuf
path :
$(CC) $(DEFS) $(CFLAGS) unit.c ../src/common/path.c t_path.c -o test_path
$(CC) $(DEFS) $(CFLAGS) unit.c ../src/common/strbuf.c ../src/common/path.c t_path.c -o test_path
rbtree :
$(CC) $(DEFS) $(CFLAGS) unit.c ../src/common/rbtree.c t_rbtree.c -o test_rbtree

14
test/t_path.c
View file

@ -4,26 +4,26 @@
#include "unit.h"
#include "../src/common/path.h"
void test_fmt_path() {
void test_normalize() {
char *ptr;
ptr = fmt_path("usr/", "include/", 0);
ptr = path_normalize("usr/", "include/", 0);
assert(ptr == NULL);
ptr = fmt_path("/usr/src/", "linux", 0);
ptr = path_normalize("/usr/src/", "linux", 0);
assert_string(ptr, "/usr/src/linux");
free(ptr);
ptr = fmt_path("/segment1/segment2/", "segment3", 1);
ptr = path_normalize("/segment1///segment2//", "segment3", 1);
assert_string(ptr, "/segment1/segment2/segment3/");
free(ptr);
ptr = fmt_path("/stuff/with/ahell/lot/of/slashes/at/the/", "end", 1);
ptr = path_normalize("/stuff/with/ahell/lot/of/slashes/at/the///", "end", 1);
assert_string(ptr, "/stuff/with/ahell/lot/of/slashes/at/the/end/");
free(ptr);
ptr = fmt_path("/mnt/cdrom", "keff", 0);
ptr = path_normalize("/mnt/cdrom", "keff", 0);
assert_string(ptr, "/mnt/cdrom/keff");
free(ptr);
}
@ -98,7 +98,7 @@ void test_dirname() {
int main(int argc, char *argv[]) {
test_isabspath();
test_fmt_path();
test_normalize();
test_pathlen();
test_basename();
test_dirname();