Commit795a5d9

committed

#17 fixed cwk_path_get_relative with relative base

1 parent82eaf2a commit795a5d9Copy full SHA for 795a5d9

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ if(ENABLE_TESTS)`
`184`	`184`	`create_test(DEFAULT relative target_div_skipped_end)`
`185`	`185`	`create_test(DEFAULT relative skip_all)`
`186`	`186`	`create_test(DEFAULT relative different_roots)`
	`187`	`+ create_test(DEFAULT relative relative_and_absolute)`
`187`	`188`	`create_test(DEFAULT relative check)`
`188`	`189`	`create_test(DEFAULT relative root_path_unix)`
`189`	`190`	`create_test(DEFAULT relative root_path_windows)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,8 @@ size_t cwk_path_get_relative(const char base_directory, const char path,`
`729`	`729`	`// different roots.`
`730`	`730`	`cwk_path_get_root(base_directory,&base_root_length);`
`731`	`731`	`cwk_path_get_root(path,&path_root_length);`
`732`		`-if (!cwk_path_is_string_equal(base_directory,path,base_root_length)) {`
	`732`	`+if (base_root_length!=path_root_length\|\|`
	`733`	`+ !cwk_path_is_string_equal(base_directory,path,base_root_length)) {`
`733`	`734`	`cwk_path_terminate_output(buffer,buffer_size,pos);`
`734`	`735`	`returnpos;`
`735`	`736`	`}`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,28 @@ int relative_check()`
`71`	`71`	`returnEXIT_SUCCESS;`
`72`	`72`	`}`
`73`	`73`
	`74`	`+intrelative_relative_and_absolute()`
	`75`	`+{`
	`76`	`+charresult[FILENAME_MAX];`
	`77`	`+size_tlength;`
	`78`	`+`
	`79`	`+cwk_path_set_style(CWK_STYLE_UNIX);`
	`80`	`+`
	`81`	`+*result=1;`
	`82`	`+`
	`83`	`+length=cwk_path_get_relative("./foo","/bar",result,sizeof(result));`
	`84`	`+`
	`85`	`+if (length!=0) {`
	`86`	`+returnEXIT_FAILURE;`
	`87`	`+ }`
	`88`	`+`
	`89`	`+if (*result!='\0') {`
	`90`	`+returnEXIT_FAILURE;`
	`91`	`+ }`
	`92`	`+`
	`93`	`+returnEXIT_SUCCESS;`
	`94`	`+}`
	`95`	`+`
`74`	`96`	`intrelative_different_roots()`
`75`	`97`	`{`
`76`	`98`	`charresult[FILENAME_MAX];`

Comments

(0)