planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformatted.

Browse Source 
FossilOrigin-Name: b5bd38e7b93d1a297c35a2b4b912c607ce70150d2e2341841c826ac97c44294b
This commit is contained in:
7u83@mail.ru 2018-03-31 05:43:30 +00:00
parent 8a9ca46554
commit 370994b0b4
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actube.workspace
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="actube" Database="">
<Project Name="ac" Path="ac.project" Active="No"/>
<Project Name="wtp" Path="wtp.project" Active="Yes"/>
<Project Name="wtp" Path="wtp.project" Active="No"/>
<Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
<Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
<Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
<Project Name="libcw" Path="libcw.project" Active="No"/>
<Project Name="libcw" Path="libcw.project" Active="Yes"/>
<Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
<Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
<BuildMatrix>

45
src/cw/cw_filename.c
View File

@ -31,51 +31,48 @@
* @return a pointer to the create filename which has to be
* released using free.
*/
char * cw_filename(const char * path, const char * name, const char * ext){
char *cw_filename(const char *path, const char *name, const char *ext)
{
int name_len;
int ext_len;
int size=0;
int size = 0;
int path_len;
char c;
char * result;
char * slash="";
char *result;
char *slash = "";
path_len = strlen(path);
if (path_len>0){
c = path[path_len-1];
if (!strchr(CW_FILE_PATH_DELIMITERS,c)){
if (path_len > 0) {
c = path[path_len - 1];
if (!strchr(CW_FILE_PATH_DELIMITERS, c)) {
path_len++;
slash = "/";
}
}
name_len = strlen (name);
name_len = strlen(name);
if (ext != NULL){
if (ext[0]=='.'){
if (ext != NULL) {
if (ext[0] == '.') {
ext++;
}
ext_len = strlen(ext);
}
else
ext_len=-1;
} else
ext_len = -1;
size = (path_len) + name_len + (ext_len+1) + 1;
size = (path_len) + name_len + (ext_len + 1) + 1;
result = malloc(size);
if (!result)
return NULL;
strncpy(result,path,path_len);
result[path_len]=0;
strcat(result,slash);
strcat(result,name);
if (ext){
strcat(result,".");
strcat(result,ext);
strncpy(result, path, path_len);
result[path_len] = 0;
strcat(result, slash);
strcat(result, name);
if (ext) {
strcat(result, ".");
strcat(result, ext);
}
return result;