[svn-commits] seanbright: branch 1.8 r316709 - in /branches/1.8: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed May  4 11:15:32 2011
New Revision: 316709

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316709
Log:
Merged revisions 316708 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r316708 | seanbright | 2011-05-04 12:10:59 -0400 (Wed, 04 May 2011) | 15 lines
  
  Merged revisions 316707 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r316707 | seanbright | 2011-05-04 12:08:50 -0400 (Wed, 04 May 2011) | 8 lines
    
    If sox fails when processing a voicemail, don't delete the original file.
    
    (closes issue #18111)
    Reported by: sysreq
    Patches:
          issue18111_trunk.patch uploaded by seanbright (license 71)
    Tested by: seanbright
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_voicemail.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_voicemail.c?view=diff&rev=316709&r1=316708&r2=316709
==============================================================================
--- branches/1.8/apps/app_voicemail.c (original)
+++ branches/1.8/apps/app_voicemail.c Wed May  4 11:15:32 2011
@@ -4743,6 +4743,7 @@
 	char fname[256];
 	char tmpcmd[256];
 	int tmpfd = -1;
+	int soxstatus = 0;
 
 	/* Eww. We want formats to tell us their own MIME type */
 	char *ctype = (!strcasecmp(format, "ogg")) ? "application/" : "audio/x-";
@@ -4754,7 +4755,6 @@
 		chmod(newtmp, VOICEMAIL_FILE_MODE & ~my_umask);
 		ast_debug(3, "newtmp: %s\n", newtmp);
 		if (tmpfd > -1) {
-			int soxstatus;
 			snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, attach, format, newtmp, format);
 			if ((soxstatus = ast_safe_system(tmpcmd)) == 0) {
 				attach = newtmp;
@@ -4782,7 +4782,9 @@
 	if (last)
 		fprintf(p, ENDL ENDL "--%s--" ENDL "." ENDL, bound);
 	if (tmpfd > -1) {
-		unlink(fname);
+		if (soxstatus == 0) {
+			unlink(fname);
+		}
 		close(tmpfd);
 		unlink(newtmp);
 	}