MODFORM-23

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12051 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/formats/mod_sndfile/mod_sndfile.c

@@ -67,11 +67,10 @@ static switch_status_t sndfile_file_open(switch_file_handle_t *handle, const cha
 	int rates[4] = {8000, 16000, 32000, 48000};
 	int i;
 #ifdef WIN32
-	char ps[2] = {'\\', '/'};
+	char ps = '\\';
 #else
-	char ps[2] = {'/', '\\'};
+	char ps = '/';
 #endif
-	int x;
 
 	if ((ext = strrchr(path, '.')) == 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n");
@@ -158,9 +157,18 @@ static switch_status_t sndfile_file_open(switch_file_handle_t *handle, const cha
 
 	switch_copy_string(alt_path, path, alt_len);
 
-	for (x = 0; x < 2; x++) {
-		if ((last = strrchr(alt_path, ps[x]))) {
+	/* This block attempts to add the sample rate to the path
+	   if the sample rate is already present in the path it does nothing
+	   and reverts to the original file name.
+	*/
+	if ((last = strrchr(alt_path, ps))) {
+		last++;
+#ifdef WIN32
+		if (strrchr(last, '/')) {
+			last = strrchr(alt_path, '/'); /* do not swallow a forward slash if they are intermixed under windows*/
 			last++;
+		}
+#endif
 		ldup = strdup(last);
 		switch_assert(ldup);
 		switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup);
@@ -179,7 +187,6 @@ static switch_status_t sndfile_file_open(switch_file_handle_t *handle, const cha
 			}
 		}
 	}
-	}
 
 	if (!context->handle) {
 		if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) {