[prev in list] [next in list] [prev in thread] [next in thread]
List: asterisk-commits
Subject: [asterisk-commits] tilghman: trunk r299990 - in /trunk: ./
From: SVN commits to the Asterisk project <asterisk-commits () lists ! digium ! com>
Date: 2010-12-29 22:03:52
Message-ID: E1PY47c-0007pW-Kz () wibble ! digium ! internal
[Download RAW message or body]
Author: tilghman
Date: Wed Dec 29 16:03:50 2010
New Revision: 299990
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299990
Log:
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.)
........
Modified:
trunk/ (props changed)
trunk/apps/app_voicemail.c
trunk/main/file.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=299990&r1=299989&r2=299990
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Dec 29 16:03:50 2010
@@ -12382,7 +12382,7 @@
}
/* 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 @@
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 @@
#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()");
Modified: trunk/main/file.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/file.c?view=diff&rev=299990&r1=299989&r2=299990
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Wed Dec 29 16:03:50 2010
@@ -315,7 +315,7 @@
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);
}
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic