[Asterisk-cvs] asterisk/apps app_substring.c,1.3,1.4

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv19414/apps

Modified Files:
	app_substring.c 
Log Message:
Add relative substring (bug #229)


Index: app_substring.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_substring.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- app_substring.c	28 Apr 2003 03:49:04 -0000	1.3
+++ app_substring.c	27 Sep 2003 02:39:04 -0000	1.4
@@ -33,13 +33,16 @@
 "of string_of_digits to a given variable. Parameter count1 may be positive\n"
 "or negative. If it's positive then we skip the first count1 digits from the\n"
 "left. If it's negative, we move count1 digits counting from the end of\n"
-"the string to the left. Parameter count2 may be only positive and implies\n"
-"how many digits we're taking from the point that count1 placed us.\n"
+"the string to the left. Parameter count2 implies how many digits we are\n"
+"taking from the point that count1 placed us. If count2 is negative, then\n"
+"that many digits are omitted from the end.\n"
 "For example:\n"
 "exten => _NXXXXXX,1,SubString,test=2564286161|0|3\n"
 "assigns the area code (3 first digits) to variable test.\n"
 "exten => _NXXXXXX,1,SubString,test=2564286161|-7|7\n"
 "assigns the last 7 digits to variable test.\n"
+"exten => _NXXXXXX,1,SubString,test=2564286161|0|-4\n" 
+"assigns all but the last 4 digits to variable test.\n" 
 "If there are no parameters it'll return with -1.\n"
 "If there wrong parameters it go on and return with 0\n";
 
@@ -71,9 +74,8 @@
     }
     icount1=atoi(count1);
     icount2=atoi(count2);
-    if (icount2<=0) {
-      ast_log(LOG_DEBUG, "Exiting, wrong parameter count2\n");
-      return -1;
+	if (icount2<0) {
+	  icount2 = icount2 + strlen(second);
     }
     if (abs(icount1)>strlen(second)) {
       ast_log(LOG_WARNING, "Limiting count1 parameter because it exceeds the length of the string\n");