Version 0.1.10 from FTP

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2001-10-18 16:47:57 +00:00
parent 39b383b353
commit a07f2c930b
11 changed files with 64 additions and 64 deletions

10
file.c
View File

@@ -96,8 +96,8 @@ int ast_format_register(char *name, char *exts, int format,
ast_pthread_mutex_unlock(&formatlock);
return -1;
}
strncpy(tmp->name, name, sizeof(tmp->name));
strncpy(tmp->exts, exts, sizeof(tmp->exts));
strncpy(tmp->name, name, sizeof(tmp->name)-1);
strncpy(tmp->exts, exts, sizeof(tmp->exts)-1);
tmp->open = open;
tmp->rewrite = rewrite;
tmp->apply = apply;
@@ -369,7 +369,7 @@ int ast_fileexists(char *filename, char *fmt, char *preflang)
snprintf(filename2, sizeof(filename2), "%s-%s", filename, preflang);
res = ast_filehelper(filename2, NULL, fmt, ACTION_EXISTS);
if (res < 1) {
strncpy(lang2, preflang, sizeof(lang2));
strncpy(lang2, preflang, sizeof(lang2)-1);
strtok(lang2, "_");
if (strcmp(lang2, preflang)) {
snprintf(filename2, sizeof(filename2), "%s-%s", filename, lang2);
@@ -422,13 +422,13 @@ int ast_streamfile(struct ast_channel *chan, char *filename, char *preflang)
snprintf(filename2, sizeof(filename2), "%s-%s", filename, preflang);
fmts = ast_fileexists(filename2, NULL, NULL);
if (fmts < 1) {
strncpy(lang2, preflang, sizeof(lang2));
strncpy(lang2, preflang, sizeof(lang2)-1);
snprintf(filename2, sizeof(filename2), "%s-%s", filename, lang2);
fmts = ast_fileexists(filename2, NULL, NULL);
}
}
if (fmts < 1) {
strncpy(filename2, filename, sizeof(filename2));
strncpy(filename2, filename, sizeof(filename2)-1);
fmts = ast_fileexists(filename2, NULL, NULL);
}
if (fmts < 1) {