[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r307189 - in /team/may/ooh323_ipv6_dir...

[SVN commits to the Asterisk project]

Author: may
Date: Wed Feb  9 08:12:28 2011
New Revision: 307189

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307189
Log:
Merged revisions 307062-307063,307106 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/may/ooh323_ipv6

................
  r307062 | may | 2011-02-09 00:01:35 +0300 (Wed, 09 Feb 2011) | 2 lines
  
  up to trunk
................
  r307063 | may | 2011-02-09 00:03:15 +0300 (Wed, 09 Feb 2011) | 29 lines
  
  Blocked revisions 306968 via svnmerge
  
  ................
    r306968 | jpeeler | 2011-02-08 22:42:03 +0300 (Tue, 08 Feb 2011) | 23 lines
    
    Merged revisions 306967 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ................
      r306967 | jpeeler | 2011-02-08 13:41:42 -0600 (Tue, 08 Feb 2011) | 16 lines
      
      Merged revisions 306966 via svnmerge from 
      https://origsvn.digium.com/svn/asterisk/branches/1.6.2
      
      ................
        r306966 | jpeeler | 2011-02-08 13:41:21 -0600 (Tue, 08 Feb 2011) | 9 lines
        
        Merged revisions 306965 via svnmerge from 
        https://origsvn.digium.com/svn/asterisk/branches/1.4
        
        ........
          r306965 | jpeeler | 2011-02-08 13:40:58 -0600 (Tue, 08 Feb 2011) | 1 line
          
          fix this line again
        ........
      ................
    ................
  ................
................
  r307106 | may | 2011-02-09 00:48:09 +0300 (Wed, 09 Feb 2011) | 2 lines
  
  ...
................

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/apps/app_voicemail.c

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb  9 08:12:28 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-306970,306997
+/team/may/ooh323_ipv6:1-306970,306997,307062-307106

Modified: team/may/ooh323_ipv6_direct_rtp/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_voicemail.c?view=diff&rev=307189&r1=307188&r2=307189
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_voicemail.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_voicemail.c Wed Feb  9 08:12:28 2011
@@ -3916,7 +3916,7 @@
 	DIR *msgdir;
 	struct dirent *msgdirent;
 	int msgdirint;
-	char extension[3];
+	char extension[4];
 	int stopcount = 0;
 
 	/* Reading the entire directory into a file map scales better than
@@ -3928,7 +3928,7 @@
 	}
 
 	while ((msgdirent = readdir(msgdir))) {
-		if (sscanf(msgdirent->d_name, "msg%30d.%3s", &msgdirint, extension) == 2 && msgdirint < MAXMSGLIMIT && !strcmp(extension, "txt")) {
+		if (sscanf(msgdirent->d_name, "msg%30d.%3s", &msgdirint, extension) == 2 && !strcmp(extension, "txt") && msgdirint < MAXMSGLIMIT) {
 			map[msgdirint] = 1;
 			stopcount++;
 			ast_debug(4, "%s map[%d] = %d, count = %d\n", dir, msgdirint, map[msgdirint], stopcount);
@@ -6767,14 +6767,16 @@
 			}
 			
 			/* Back up the original file, so we can retry the prepend and restore it after forward. */
+#ifndef IMAP_STORAGE
 			if (already_recorded) {
 				ast_filecopy(backup, msgfile, NULL);
 				copy(backup_textfile, textfile);
 			}
 			else {
 				ast_filecopy(msgfile, backup, NULL);
-				copy(textfile,backup_textfile);
-			}
+				copy(textfile, backup_textfile);
+			}
+#endif
 			already_recorded = 1;
 
 			if (record_gain)