--- libaitio/src/Attic/tools.c	2011/12/14 09:26:58	1.7.2.2
+++ libaitio/src/Attic/tools.c	2012/03/27 21:37:56	1.9.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: tools.c,v 1.7.2.2 2011/12/14 09:26:58 misho Exp $
+* $Id: tools.c,v 1.9.2.1 2012/03/27 21:37:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@ SUCH DAMAGE.
 
 /*
  * io_LTrimStr() Remove left whitespaces from text string
+ *
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
@@ -70,6 +71,7 @@ io_LTrimStr(u_char * __restrict psLine)
 
 /*
  * io_RTrimStr() Remove right whitespaces from text string
+ *
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
@@ -90,6 +92,7 @@ io_RTrimStr(u_char * __restrict psLine)
 
 /*
  * io_TrimStr() Remove left and right whitespaces from text string
+ *
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
@@ -106,6 +109,7 @@ io_TrimStr(u_char * __restrict psLine)
 
 /*
  * io_UnquotStr() Remove quots from input text string 
+ *
  * @psLine = Text string
  * return: 0 nothing to do; 1 successful unquoted string
 */
@@ -139,6 +143,7 @@ io_UnquotStr(u_char * __restrict psLine)
 
 /*
  * io_Ch2Hex() Convert from Char string to Hex string
+ *
  * @psLine = Text string
  * @lineLen = Length of Text string
  * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free)
@@ -171,6 +176,7 @@ io_Ch2Hex(u_char *psLine, int lineLen)
 
 /*
  * io_Hex2Ch() Convert from Hex string to Char string
+ *
  * @psLine = Text string
  * @lineLen = Length of Text string
  * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free)
@@ -202,6 +208,7 @@ io_Hex2Ch(u_char *psLine, int lineLen)
 
 /*
  * io_CopyEnv() Copy environment to new environment array;
+ *
  * @oldenv = Environment array
  * return: NULL error; !=NULL Allocated new environment array(must be free)
 */
@@ -241,6 +248,7 @@ io_CopyEnv(const char **oldenv)
 
 /*
  * io_ExecArgs() Build exec arguments from other array
+ *
  * @psProg = Program name for execute
  * @oldarg = Arguments array
  * return: NULL error; !=NULL Allocated execution array(must be free)
@@ -279,6 +287,7 @@ io_ExecArgs(const char *psProg, const char **oldarg)
 
 /*
  * io_FreeNullTerm() Free dynamic allocated null terminated array with strings
+ *
  * @arr = Pointer to array for free
  * return: none
 */
@@ -297,7 +306,52 @@ io_FreeNullTerm(char *** __restrict arr)
 }
 
 /*
+ * io_Path2File() - Parse and make path/filename pair
+ *
+ * @csArgs = Input argument line
+ * @psPath = Output Path, if ==NULL path not returned
+ * @pathLen = Size of path array
+ * @psFile = Output File
+ * @fileLen = Size of file array
+ * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
+ */
+inline int
+io_Path2File(const char * __restrict csArgs, char * __restrict psPath, 
+		int pathLen, char * __restrict psFile, int fileLen)
+{
+	char *pos, *psBuf;
+
+	if (!csArgs || !psFile || !fileLen)
+		return -1;
+	if (psPath && !pathLen)
+		return -1;
+
+	psBuf = strdup(csArgs);
+	if (!psBuf) {
+		LOGERR;
+		return -1;
+	}
+
+	pos = strrchr(psBuf, '/');
+	if (!pos) {
+		strlcpy(psFile, psBuf, fileLen);
+
+		free(psBuf);
+		return 1;
+	} else
+		*pos++ = 0;
+
+	strlcpy(psFile, pos, fileLen);
+	if (psPath)
+		strlcpy(psPath, psBuf, pathLen);
+
+	free(psBuf);
+	return 2;
+}
+
+/*
  * io_ether_ntoa() Convert ethernet address to string
+ *
  * @n = ethernet address structure, like struct ether_addr
  * @a = string
  * @len = string length
@@ -321,6 +375,7 @@ io_ether_ntoa(const struct io_ether_addr *n, char * __
 
 /*
  * io_ether_aton() Convert string to ethernet address
+ *
  * @a = string
  * @e = ethernet address structure, like struct ether_addr
  * return: NULL error or !=NULL ethernet address structure
@@ -350,6 +405,7 @@ io_ether_aton(const char *a, struct io_ether_addr *e)
 
 /*
  * io_n2port() Extract port from network structure
+ *
  * @addr = Address
  * return: 0 not supported family type or port number
  */
@@ -377,6 +433,7 @@ io_n2port(io_sockaddr_t * __restrict addr)
 
 /*
  * io_n2addr() Extract address from network structure
+ *
  * @addr = Address
  * @val = Value for store string address
  * return: NULL error or !=NULL string address from val
@@ -414,11 +471,12 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t *
 	if (!AIT_ISEMPTY(val))
 		AIT_FREE_VAL(val);
 	AIT_SET_STR(val, ret);
-	return AIT_GET_STR(val);
+	return (const char*) AIT_GET_STR(val);
 }
 
 /*
  * io_gethostbyname() Get host and port and make network structure
+ *
  * @psHost = Hostname
  * @port = Port
  * @addr = Network address structure