[Husky-cvs]htick/src areafix.c,1.129,1.130

[<d_s...@us...>]

Update of /cvsroot/husky/htick/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21907/src

Modified Files:
	areafix.c 
Log Message:
skip 'passthrough' in autoFileCreateDefaults (backport from stable)


Index: areafix.c
===================================================================
RCS file: /cvsroot/husky/htick/src/areafix.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- areafix.c	29 Oct 2004 13:02:13 -0000	1.129
+++ areafix.c	3 Apr 2005 15:22:51 -0000	1.130
@@ -1120,8 +1120,23 @@
     else scan();
 }
 
-/* file echo autocreation */
+/* remove token from string */
+void del_tok(char **ac, char *tok) {
+    char *p, *q;
 
+    q = fc_stristr(*ac,tok);
+    if (q) {
+	p = q+strlen(tok);
+	while (*p && !isspace(*p)) p++;
+	if (*p) memmove(q, p+1, strlen(p+1)+1); /*  begin or middle */
+	else {
+	    if (q > *ac) *(q-1)='\0'; /*  end */
+	    else *q='\0'; /*  "-token" defaults */
+	}
+    }
+}
+
+/* file echo autocreation */
 int   autoCreate(char *c_area, char *descr, ps_addr pktOrigAddr, ps_addr dwLink)
 {
     FILE *f;
@@ -1212,6 +1227,10 @@
 
     if (creatingLink->autoFileCreateDefaults) {
         NewAutoCreate = sstrdup(creatingLink->autoFileCreateDefaults);
+
+        /* remove "passthrough" from area line. use LinkFileBaseDir for this purposes. */
+        del_tok(&NewAutoCreate, "passthrough");
+
         if ((fileName=strstr(NewAutoCreate,"-d ")) !=NULL ) {
             if (descr) {
                 *fileName = '\0';