@@ -1,3 +1,7 @@

+Wed Oct 13 22:20:17 CEST 2004 (tk)

+----------------------------------

+  * libclamav/str.c: include cli_strtokbuf() from Nigel

+

 Wed Oct 13 20:21:26 CEST 2004 (tk)

 ----------------------------------

   * libclamav/mspack/cabd.c: fix possible description leak

@@ -6,7 +10,7 @@ Wed Oct 13 11:19:03 BST 2004 (njh)

 ----------------------------------

   * libclamav/untar.c:	Added handling of some extra file types within the

 				archive. Thanks to

-				djgardner@users.sourceforge.net

+				djgardner*users.sourceforge.net

 Wed Oct 13 09:57:54 BST 2004 (trog)

 -----------------------------------

@@ -231,3 +231,41 @@ char *cli_strtok(const char *line, int fieldno, const char *delim)

     return buffer;

 }

+

+/*

+ * Like cli_strtok, but this puts the output into a given argument, rather

+ * than allocating fresh memory

+ * Returns NULL for error, or a pointer to output

+ * njh@bandsman.co.uk

+ */

+char *cli_strtokbuf(const char *input, int fieldno, const char *delim, char *output)

+{

+    int counter = 0, i, j;

+

+    /* step to arg # <fieldno> */

+    for (i=0; input[i] && counter != fieldno; i++) {

+	if (strchr(delim, input[i])) {

+	    counter++;

+	    while(input[i+1] && strchr(delim, input[i+1])) {

+		i++;

+	    }

+	}

+    }

+    if (input[i] == '\0') {

+	/* end of buffer before field reached */

+	return NULL;

+    }

+

+    for (j=i; input[j]; j++) {

+	if (strchr(delim, input[j])) {

+	    break;

+	}

+    }

+    if (i == j) {

+	return NULL;

+    }

+    strncpy(output, input+i, j-i);

+    output[j-i] = '\0';

+

+    return output;

+}

@@ -25,5 +25,6 @@ char *cli_strtok(const char *line, int field, const char *delim);

 short int *cli_hex2si(const char *hex);

 char *cli_hex2str(const char *hex);

 char *cli_str2hex(const char *string, unsigned int len);

+char *cli_strtokbuf(const char *input, int fieldno, const char *delim, char *output);

 #endif