kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

more strncpy/ast_copy_string replacement.

Browse Source 
On passing, simplify code by using strsep() as appropriate



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-21 18:26:54 +00:00
parent 66c4068149
commit 11551079cf
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_musiconhold.c
View File

@@ -364,33 +364,25 @@ static int spawn_mp3(struct mohclass *class)
argv[argc++] = "8192";
/* Look for extra arguments and add them to the list */
strncpy(xargs, class->args, sizeof(xargs) - 1);
ast_copy_string(xargs, class->args, sizeof(xargs));
argptr = xargs;
while (!ast_strlen_zero(argptr)) {
argv[argc++] = argptr;
argptr = strchr(argptr, ',');
if (argptr) {
*argptr = '\0';
argptr++;
}
strsep(&argptr, ",");
}
} else {
/* Format arguments for argv vector */
strncpy(xargs, class->args, sizeof(xargs) - 1);
ast_copy_string(xargs, class->args, sizeof(xargs));
argptr = xargs;
while (!ast_strlen_zero(argptr)) {
argv[argc++] = argptr;
argptr = strchr(argptr, ' ');
if (argptr) {
*argptr = '\0';
argptr++;
}
strsep(&argptr, " ");
}
}
if (strstr(class->dir,"http://") || strstr(class->dir,"HTTP://")) {
strncpy(fns[files], class->dir, sizeof(fns[files]) - 1);
ast_copy_string(fns[files], class->dir, sizeof(fns[files]));
argv[argc++] = fns[files];
files++;
} else if (dir) {
@@ -400,7 +392,7 @@ static int spawn_mp3(struct mohclass *class)
(!strcasecmp(de->d_name + strlen(de->d_name) - 4, ".raw") ||
!strcasecmp(de->d_name + strlen(de->d_name) - 4, ".sln"))) ||
!strcasecmp(de->d_name + strlen(de->d_name) - 4, ".mp3"))) {
strncpy(fns[files], de->d_name, sizeof(fns[files]) - 1);
ast_copy_string(fns[files], de->d_name, sizeof(fns[files]));
argv[argc++] = fns[files];
files++;
}