dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 299989 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r299989 | tilghman | 2010-12-29 16:02:59 -0600 (Wed, 29 Dec 2010) | 4 lines
  
  Quote arguments, just in case there's a space in a pathname.
  
  (Diagnosed by pabelanger on #asterisk-dev, fixed by me.)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@299990 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2010-12-29 22:03:50 +00:00
parent 406ba6fcc5
commit e24818679e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_voicemail.c
View File

@ -12382,7 +12382,7 @@ AST_TEST_DEFINE(test_voicemail_msgcount)
}
/* Make sure the original path was completely empty */
snprintf(syscmd, sizeof(syscmd), "rm -rf %s%s/%s", VM_SPOOL_DIR, testcontext, testmailbox);
snprintf(syscmd, sizeof(syscmd), "rm -rf \"%s%s/%s\"", VM_SPOOL_DIR, testcontext, testmailbox);
if ((syserr = ast_safe_system(syscmd))) {
ast_test_status_update(test, "Unable to clear test directory: %s\n",
syserr > 0 ? strerror(syserr) : "unable to fork()");
@ -12413,7 +12413,7 @@ AST_TEST_DEFINE(test_voicemail_msgcount)
snprintf(tmp[i].txtfile, sizeof(tmp[i].txtfile), "%s.txt", tmp[i].file);
if (ast_fileexists(origweasels, "gsm", "en") > 0) {
snprintf(syscmd, sizeof(syscmd), "cp %s/sounds/en/%s.gsm %s/%s/%s/%s/msg0000.gsm", ast_config_AST_DATA_DIR, origweasels,
snprintf(syscmd, sizeof(syscmd), "cp \"%s/sounds/en/%s.gsm\" \"%s/%s/%s/%s/msg0000.gsm\"", ast_config_AST_DATA_DIR, origweasels,
VM_SPOOL_DIR, testcontext, testmailbox, folders[i]);
if ((syserr = ast_safe_system(syscmd))) {
ast_test_status_update(test, "Unable to create test voicemail: %s\n",
@ -12496,7 +12496,7 @@ AST_TEST_DEFINE(test_voicemail_msgcount)
#endif
/* And remove test directory */
snprintf(syscmd, sizeof(syscmd), "rm -rf %s%s/%s", VM_SPOOL_DIR, testcontext, testmailbox);
snprintf(syscmd, sizeof(syscmd), "rm -rf \"%s%s/%s\"", VM_SPOOL_DIR, testcontext, testmailbox);
if ((syserr = ast_safe_system(syscmd))) {
ast_test_status_update(test, "Unable to clear test directory: %s\n",
syserr > 0 ? strerror(syserr) : "unable to fork()");

2
main/file.c
View File

@ -315,7 +315,7 @@ static void filestream_destructor(void *arg)
size = strlen(f->filename) + strlen(f->realfilename) + 15;
cmd = alloca(size);
memset(cmd,0,size);
snprintf(cmd,size,"/bin/mv -f %s %s",f->filename,f->realfilename);
snprintf(cmd, size, "/bin/mv -f \"%s\" \"%s\"", f->filename, f->realfilename);
ast_safe_system(cmd);
}