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

Reformatted. 

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"?> <?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="actube" Database=""> <CodeLite_Workspace Name="actube" Database="">
<Project Name="ac" Path="ac.project" Active="No"/> <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_cipwap" Path="mod_cipwap.project" Active="No"/>
<Project Name="mod_capwap" Path="mod_capwap.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="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_capwap80211" Path="mod_capwap80211.project" Active="No"/>
<Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/> <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
<BuildMatrix> <BuildMatrix>

57
src/cw/cw_filename.c
View File

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