packages: asterisk/app_rxfax.c, asterisk/app_txfax.c, asterisk/asterisk.spe...

caleb caleb at pld-linux.org
Sat Oct 23 13:38:38 CEST 2010


Author: caleb                        Date: Sat Oct 23 11:38:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Updated app_{tx,rx}fax.c sources to latest version from svn, no longer available from source URLs
- https://agx-ast-addons.svn.sourceforge.net/svnroot/agx-ast-addons/trunk/attic/

---- Files affected:
packages/asterisk:
   app_rxfax.c (1.3 -> 1.4) , app_txfax.c (1.3 -> 1.4) , asterisk.spec (1.179 -> 1.180) 

---- Diffs:

================================================================
Index: packages/asterisk/app_rxfax.c
diff -u packages/asterisk/app_rxfax.c:1.3 packages/asterisk/app_rxfax.c:1.4
--- packages/asterisk/app_rxfax.c:1.3	Mon Jul  6 12:37:30 2009
+++ packages/asterisk/app_rxfax.c	Sat Oct 23 13:38:32 2010
@@ -1,17 +1,25 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Application to receive a TIFF FAX file
+ * based on app_rxfax.c from: Copyright (C) 2003, Steve Underwood <steveu at coppice.org>
+ * based on app_rxfax.c from www.callweaver.org
+ * PATCHED BY (C) 20007 by Antonio Gallo <agx at linux.it>
+ * - added ECM support
+ * - added more env variables
  *
- * Trivial application to receive a TIFF FAX file
- * 
- * Copyright (C) 2003, Steve Underwood
- *
- * Steve Underwood <steveu at coppice.org>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
  */
- 
+
+/*** MODULEINFO
+Depends: libspandsp
+Desciption: Receive a FAX to a file
+DisplayName: RxFAX
+ ***/
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <string.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <inttypes.h>
@@ -20,10 +28,7 @@
 #include <tiffio.h>
 
 #include <spandsp.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include <spandsp/version.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
@@ -31,356 +36,558 @@
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/dsp.h"
 #include "asterisk/manager.h"
 
-static char *tdesc = "Trivial FAX Receive Application";
+#ifndef AST_MODULE
+#define AST_MODULE "app_rxfax"
+#endif
 
 static char *app = "RxFAX";
 
 static char *synopsis = "Receive a FAX to a file";
 
 static char *descrip = 
-"  RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n"
-"given filename. If the file exists it will be overwritten. The file\n"
-"should be in TIFF/F format.\n"
-"The \"caller\" option makes the application behave as a calling machine,\n"
-"rather than the answering machine. The default behaviour is to behave as\n"
-"an answering machine.\n"
-"Uses LOCALSTATIONID to identify itself to the remote end.\n"
-"     LOCALHEADERINFO to generate a header line on each page.\n"
-"Sets REMOTESTATIONID to the sender CSID.\n"
-"     FAXPAGES to the number of pages received.\n"
-"     FAXBITRATE to the transmition rate.\n"
-"     FAXRESOLUTION to the resolution.\n"
-"Returns -1 when the user hangs up.\n"
-"Returns 0 otherwise.\n";
+	"  RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n"
+	"given filename. If the file exists it will be overwritten. The file\n"
+	"should be in TIFF/F format.\n"
+	"The \"caller\" option makes the application behave as a calling machine,\n"
+	"rather than the answering machine. The default behaviour is to behave as\n"
+	"an answering machine.\n"
+	"The \"ecm\" option enables ECM.\n"
+	"Uses LOCALSTATIONID to identify itself to the remote end.\n"
+	"     LOCALSUBADDRESS to specify a sub-address to the remote end.\n"
+	"     LOCALHEADERINFO to generate a header line on each page.\n"
+
+	"     FAX_FORCE_V17 to force V.17 only\n"
+	"     FAX_FORCE_V27 to force V.27 only\n"
+	"     FAX_FORCE_V29 to force V.29 only\n"
+	"     FAX_FORCE_V34 to force V.34 only\n"
+
+	"Sets REMOTESTATIONID to the sender CSID.\n"
+	"     FAXPAGES to the number of pages received.\n"
+	"     FAXBITRATE to the transmition rate.\n"
+	"     FAXRESOLUTION to the resolution.\n"
+	"     PHASEESTATUS to the phase E result status.\n"
+	"     PHASEESTRING to the phase E result string.\n"
+	"Note that PHASEESTATUS=0 means that the fax was handled correctly. But that doesn't\n"
+	"imply that any pages were sent. Actually you should also check FAXPAGES to be\n"
+	"greater than zero.\n"
+	"Returns -1 when the user hangs up.\n"
+	"Returns 0 otherwise.\n";
 
-STANDARD_LOCAL_USER;
+#define MAX_BLOCK_SIZE 240
 
-LOCAL_USER_DECL;
+static FILE *rxfax_logfile = NULL;
 
-#define MAX_BLOCK_SIZE 240
+static void file_log(const char *msg)
+{
+	if (msg==NULL) 
+		return;
+	if (rxfax_logfile==NULL)
+		return;
+	fprintf(rxfax_logfile, msg);
+}
 
 static void span_message(int level, const char *msg)
 {
-    int ast_level;
-    
-    if (level == SPAN_LOG_WARNING)
-        ast_level = __LOG_WARNING;
-    else if (level == SPAN_LOG_WARNING)
-        ast_level = __LOG_WARNING;
-    else
-        ast_level = __LOG_DEBUG;
-    ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg);
+	if (msg==NULL) return;
+	int ast_level;
+	if (level == SPAN_LOG_ERROR)
+		ast_level = __LOG_ERROR;
+	else if (level == SPAN_LOG_WARNING)
+		ast_level = __LOG_WARNING;
+	else
+		ast_level = __LOG_DEBUG;
+	ast_log(ast_level, _A_, "%s", msg);
+	file_log(msg);
 }
+
 /*- End of function --------------------------------------------------------*/
 
-static void t30_flush(t30_state_t *s, int which)
+static int phase_b_handler(t30_state_t *s, void *user_data, int result)
 {
-    //TODO:
+	if (rxfax_logfile!=NULL) {
+		fprintf( rxfax_logfile, "[phase_b_handler] mark\n" );
+		fflush(rxfax_logfile);
+	}
+	return T30_ERR_OK;
 }
-/*- End of function --------------------------------------------------------*/
 
+/*- End of function --------------------------------------------------------*/
 static void phase_e_handler(t30_state_t *s, void *user_data, int result)
 {
-    struct ast_channel *chan;
-    t30_stats_t t;
-    char local_ident[21];
-    char far_ident[21];
-    char buf[11];
-    
-    chan = (struct ast_channel *) user_data;
-    if (result == T30_ERR_OK)
-    {
-        t30_get_transfer_statistics(s, &t);
-        t30_get_far_ident(s, far_ident);
-        t30_get_local_ident(s, local_ident);
-        ast_log(LOG_DEBUG, "==============================================================================\n");
-        ast_log(LOG_DEBUG, "Fax successfully received.\n");
-        ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident);
-        ast_log(LOG_DEBUG, "Local station id:  %s\n", local_ident);
-        ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
-        ast_log(LOG_DEBUG, "Image resolution:  %i x %i\n", t.column_resolution, t.row_resolution);
-        ast_log(LOG_DEBUG, "Transfer Rate:     %i\n", t.bit_rate);
-        ast_log(LOG_DEBUG, "==============================================================================\n");
-        manager_event(EVENT_FLAG_CALL,
-                      "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
-                      chan->name,
-                      chan->exten,
-                      (chan->cid.cid_num)  ?  chan->cid.cid_num  :  "",
-                      far_ident,
-                      local_ident,
-                      t.pages_transferred,
-                      t.row_resolution,
-                      t.bit_rate,
-                      s->rx_file);
-        pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident);
-        snprintf(buf, sizeof(buf), "%i", t.pages_transferred);
-        pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
-        snprintf(buf, sizeof(buf), "%i", t.row_resolution);
-        pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf);
-        snprintf(buf, sizeof(buf), "%i", t.bit_rate);
-        pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf);
-    }
-    else
-    {
-        ast_log(LOG_DEBUG, "==============================================================================\n");
-        ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result));
-        ast_log(LOG_DEBUG, "==============================================================================\n");
-    }
+	struct ast_channel *chan;
+	const char *tx_ident;
+	const char *rx_ident;
+	char buf[128];
+	t30_stats_t t;
+
+	chan = (struct ast_channel *) user_data;
+	t30_get_transfer_statistics(s, &t);
+
+	tx_ident = t30_get_tx_ident(s);
+	if (tx_ident == NULL)
+		tx_ident = "";
+	rx_ident = t30_get_rx_ident(s);
+	if (rx_ident == NULL)
+		rx_ident = "";
+	pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", rx_ident);
+	snprintf(buf, sizeof(buf), "%d", t.pages_transferred);
+	pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
+	snprintf(buf, sizeof(buf), "%d", t.y_resolution);
+	pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf);
+	snprintf(buf, sizeof(buf), "%d", t.bit_rate);
+	pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf);
+	snprintf(buf, sizeof(buf), "%d", result);
+	pbx_builtin_setvar_helper(chan, "PHASEESTATUS", buf);
+	snprintf(buf, sizeof(buf), "%s", t30_completion_code_to_str(result));
+	pbx_builtin_setvar_helper(chan, "PHASEESTRING", buf);
+
+	ast_log(LOG_DEBUG, "==============================================================================\n");
+	if (result == T30_ERR_OK)
+	{
+		ast_log(LOG_DEBUG, "Fax successfully received.\n");
+		ast_log(LOG_DEBUG, "Remote station id: %s\n", rx_ident);
+		ast_log(LOG_DEBUG, "Local station id:  %s\n", tx_ident);
+		ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
+		ast_log(LOG_DEBUG, "Image resolution:  %i x %i\n", t.x_resolution, t.y_resolution);
+		ast_log(LOG_DEBUG, "Transfer Rate:     %i\n", t.bit_rate);
+		manager_event(EVENT_FLAG_CALL,
+				"FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
+				chan->name,
+				chan->exten,
+				(chan->cid.cid_num)  ?  chan->cid.cid_num  :  "",
+				rx_ident,
+				tx_ident,
+				t.pages_transferred,
+				t.y_resolution,
+				t.bit_rate,
+				s->rx_file);
+		if (rxfax_logfile!=NULL) {
+			fprintf( rxfax_logfile, "\n[FAX OK] Remote: %s Local: %s Pages: %i Speed: %i\n\n", 
+				rx_ident, tx_ident, t.pages_transferred, t.bit_rate
+			);
+			fflush(rxfax_logfile);
+		}
+	}
+	else
+	{
+		ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result));
+		if (rxfax_logfile!=NULL) {
+			fprintf( rxfax_logfile, "\n[FAX ERROR] code: %d %s\n\n", result, t30_completion_code_to_str(result) );
+			fflush(rxfax_logfile);
+		}
+	}
+	ast_log(LOG_DEBUG, "==============================================================================\n");
 }
 /*- End of function --------------------------------------------------------*/
 
-static void phase_d_handler(t30_state_t *s, void *user_data, int result)
+static int phase_d_handler(t30_state_t *s, void *user_data, int result)
 {
-    struct ast_channel *chan;
-    t30_stats_t t;
-    
-    chan = (struct ast_channel *) user_data;
-    if (result)
-    {
-        t30_get_transfer_statistics(s, &t);
-        ast_log(LOG_DEBUG, "==============================================================================\n");
-        ast_log(LOG_DEBUG, "Pages transferred:  %i\n", t.pages_transferred);
-        ast_log(LOG_DEBUG, "Image size:         %i x %i\n", t.columns, t.rows);
-        ast_log(LOG_DEBUG, "Image resolution    %i x %i\n", t.column_resolution, t.row_resolution);
-        ast_log(LOG_DEBUG, "Transfer Rate:      %i\n", t.bit_rate);
-        ast_log(LOG_DEBUG, "Bad rows            %i\n", t.bad_rows);
-        ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run);
-        ast_log(LOG_DEBUG, "Compression type    %i\n", t.encoding);
-        ast_log(LOG_DEBUG, "Image size (bytes)  %i\n", t.image_size);
-        ast_log(LOG_DEBUG, "==============================================================================\n");
-    }
+	struct ast_channel *chan;
+	t30_stats_t t;
+
+	chan = (struct ast_channel *) user_data;
+	if (result)
+	{
+		t30_get_transfer_statistics(s, &t);
+		ast_log(LOG_DEBUG, "==============================================================================\n");
+		ast_log(LOG_DEBUG, "Pages transferred:  %i\n", t.pages_transferred);
+		ast_log(LOG_DEBUG, "Image size:         %i x %i\n", t.width, t.length);
+		ast_log(LOG_DEBUG, "Image resolution    %i x %i\n", t.x_resolution, t.y_resolution);
+		ast_log(LOG_DEBUG, "Transfer Rate:      %i\n", t.bit_rate);
+		ast_log(LOG_DEBUG, "Bad rows            %i\n", t.bad_rows);
+		ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run);
+		ast_log(LOG_DEBUG, "Compression type    %s\n", t4_encoding_to_str(t.encoding));
+		ast_log(LOG_DEBUG, "Image size (bytes)  %i\n", t.image_size);
+		ast_log(LOG_DEBUG, "==============================================================================\n");
+		if (rxfax_logfile!=NULL) {
+			fprintf( rxfax_logfile, "\n[phase_d_handler] Page: %i at %i\n\n",  t.pages_transferred, t.bit_rate );
+			fflush(rxfax_logfile);
+		}
+	}
+    return T30_ERR_OK;
 }
 /*- End of function --------------------------------------------------------*/
 
 static int rxfax_exec(struct ast_channel *chan, void *data)
 {
-    int res = 0;
-    char template_file[256];
-    char target_file[256];
-    char *s;
-    char *t;
-    char *v;
-    char *x;
-    int option;
-    int len;
-    int i;
-    t30_state_t fax;
-    int calling_party;
-    int verbose;
-    int samples;
-
-    struct localuser *u;
-    struct ast_frame *inf = NULL;
-    struct ast_frame outf;
-
-    int original_read_fmt;
-    int original_write_fmt;
-    
-    uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET];
-    uint8_t *buf = __buf + AST_FRIENDLY_OFFSET;
-
-    if (chan == NULL)
-    {
-        ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n");
-        return -1;
-    }
-
-    span_set_message_handler(span_message);
-
-    /* The next few lines of code parse out the filename and header from the input string */
-    if (data == NULL)
-    {
-        /* No data implies no filename or anything is present */
-        ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n");
-        return -1;
-    }
-    
-    calling_party = FALSE;
-    verbose = FALSE;
-    target_file[0] = '\0';
-
-    for (option = 0, v = s = data;  v;  option++, s++)
-    {
-        t = s;
-        v = strchr(s, '|');
-        s = (v)  ?  v  :  s + strlen(s);
-        strncpy((char *) buf, t, s - t);
-        buf[s - t] = '\0';
-        if (option == 0)
-        {
-            /* The first option is always the file name */
-            len = s - t;
-            if (len > 255)
-                len = 255;
-            strncpy(target_file, t, len);
-            target_file[len] = '\0';
-            /* Allow the use of %d in the file name for a wild card of sorts, to
-               create a new file with the specified name scheme */
-            if ((x = strchr(target_file, '%'))  &&  x[1] == 'd')
-            {
-                strcpy(template_file, target_file);
-                i = 0;
-                do
-                {
-                    snprintf(target_file, 256, template_file, 1);
-                    i++;
-                }
-                while (ast_fileexists(target_file, "", chan->language) != -1);
-            }
-        }
-        else if (strncmp("caller", t, s - t) == 0)
-        {
-            calling_party = TRUE;
-        }
-        else if (strncmp("debug", t, s - t) == 0)
-        {
-            verbose = TRUE;
-        }
-    }
-
-    /* Done parsing */
-
-    LOCAL_USER_ADD(u);
-
-    if (chan->_state != AST_STATE_UP)
-    {
-        /* Shouldn't need this, but checking to see if channel is already answered
-         * Theoretically asterisk should already have answered before running the app */
-        res = ast_answer(chan);
-    }
-    
-    if (!res)
-    {
-        original_read_fmt = chan->readformat;
-        if (original_read_fmt != AST_FORMAT_SLINEAR)
-        {
-            res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
-            if (res < 0)
-            {
-                ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n");
-                return -1;
-            }
-        }
-        original_write_fmt = chan->writeformat;
-        if (original_write_fmt != AST_FORMAT_SLINEAR)
-        {
-            res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
-            if (res < 0)
-            {
-                ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n");
-                res = ast_set_read_format(chan, original_read_fmt);
-                if (res)
-                    ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name);
-                return -1;
-            }
-        }
-        fax_init(&fax, calling_party, NULL);
-        if (verbose)
-            fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW;
-        x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
-        if (x  &&  x[0])
-            t30_set_local_ident(&fax, x);
-        x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO");
-        if (x  &&  x[0])
-            t30_set_header_info(&fax, x);
-        t30_set_rx_file(&fax, target_file, -1);
-        //t30_set_phase_b_handler(&fax, phase_b_handler, chan);
-        t30_set_phase_d_handler(&fax, phase_d_handler, chan);
-        t30_set_phase_e_handler(&fax, phase_e_handler, chan);
-        while (ast_waitfor(chan, -1) > -1)
-        {
-            inf = ast_read(chan);
-            if (inf == NULL)
-            {
-                res = -1;
-                break;
-            }
-            if (inf->frametype == AST_FRAME_VOICE)
-            {
-                if (fax_rx(&fax, inf->data, inf->samples))
-                    break;
-                samples = (inf->samples <= MAX_BLOCK_SIZE)  ?  inf->samples  :  MAX_BLOCK_SIZE;
-                len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
-                if (len)
-                {
-                    memset(&outf, 0, sizeof(outf));
-                    outf.frametype = AST_FRAME_VOICE;
-                    outf.subclass = AST_FORMAT_SLINEAR;
-                    outf.datalen = len*sizeof(int16_t);
-                    outf.samples = len;
-                    outf.data = &buf[AST_FRIENDLY_OFFSET];
-                    outf.offset = AST_FRIENDLY_OFFSET;
-                    outf.src = "RxFAX";
-                    if (ast_write(chan, &outf) < 0)
-                    {
-                        ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno));
-                        break;
-                    }
-                }
-            }
-            ast_frfree(inf);
-        }
-        if (inf == NULL)
-        {
-            ast_log(LOG_DEBUG, "Got hangup\n");
-            res = -1;
-        }
-        if (original_read_fmt != AST_FORMAT_SLINEAR)
-        {
-            res = ast_set_read_format(chan, original_read_fmt);
-            if (res)
-                ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name);
-        }
-        if (original_write_fmt != AST_FORMAT_SLINEAR)
-        {
-            res = ast_set_write_format(chan, original_write_fmt);
-            if (res)
-                ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name);
-        }
-        fax_release(&fax);
-    }
-    else
-    {
-        ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name);
-    }
-    LOCAL_USER_REMOVE(u);
-    return res;
+	int res = 0;
+	char target_file[256];
+	char template_file[256];
+	int samples;
+	char *s;
+	char *t;
+	char *v;
+	const char *x;
+	int option;
+	int len;
+	int i;
+	fax_state_t fax;
+	struct ast_frame *inf = NULL;
+	struct ast_frame outf;
+	int calling_party;
+	int verbose;
+	int ecm = FALSE;
+
+	struct ast_module_user *u;
+
+	int original_read_fmt;
+	int original_write_fmt;
+
+
+	/* Basic initial checkings */
+
+	if (chan == NULL) {
+		ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n");
+		file_log("FATAL ERROR: Fax receive channel is NULL. Giving up.\n");
+		return -1;
+	}
+
+	//span_set_message_handler(span_message);
+	/* make sure they are initialized to zero */
+	memset( &fax, 0, sizeof(fax));
+
+	/* Resetting channel variables related to T38 */
+	pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", "");
+	pbx_builtin_setvar_helper(chan, "FAXPAGES", "");
+	pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", "");
+	pbx_builtin_setvar_helper(chan, "FAXBITRATE", "");
+	pbx_builtin_setvar_helper(chan, "PHASEESTATUS", "");
+	pbx_builtin_setvar_helper(chan, "PHASEESTRING", "");
+
+	/* Parsig parameters */
+
+	/* The next few lines of code parse out the filename and header from the input string */
+	if (data == NULL)
+	{
+		/* No data implies no filename or anything is present */
+		ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n");
+		file_log("ERROR: Rxfax requires an argument (filename)\n");
+		return -1;
+	}
+
+	calling_party = FALSE;
+	verbose = FALSE;
+	target_file[0] = '\0';
+
+	char tbuf[256];
+	for (option = 0, v = s = data;  v;  option++, s++) {
+		t = s;
+		v = strchr(s, '|');
+		s = (v)  ?  v  :  s + strlen(s);
+		strncpy((char *) tbuf, t, s - t);
+		tbuf[s - t] = '\0';
+		if (option == 0) {
+			/* The first option is always the file name */
+			len = s - t;
+			if (len > 255)
+				len = 255;
+			strncpy(target_file, t, len);
+			target_file[len] = '\0';
+			/* Allow the use of %d in the file name for a wild card of sorts, to
+			   create a new file with the specified name scheme */
+			if ((x = strchr(target_file, '%'))  &&  x[1] == 'd') {
+				strcpy(template_file, target_file);
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/app_rxfax.c?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/app_txfax.c?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.179&r2=1.180&f=u



More information about the pld-cvs-commit mailing list