--- libaitio/inc/aitio.h	2012/07/25 15:21:59	1.22
+++ libaitio/inc/aitio.h	2012/07/31 16:04:52	1.22.2.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22 2012/07/25 15:21:59 misho Exp $
+* $Id: aitio.h,v 1.22.2.15 2012/07/31 16:04:52 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -180,14 +180,14 @@ typedef struct {
 #define AIT_GET_F32(_vl)		(assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)
 #define AIT_GET_F64(_vl)		(assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)
 
-#define AIT_SET_DATA(_vl, _p, _len)	do { ait_val_t *__val = (_vl); \
-						__val = io_realloc(__val, sizeof(ait_val_t) + _len); \
+#define AIT_SET_DATA(_vl, _p, _len)	do { ait_val_t *__val = io_realloc((_vl), (sizeof(ait_val_t) + _len)); \
 						if (__val) { \
 							__val->val_type = data; AIT_LEN(__val) = _len; \
-							if ((_p)) \
+							if ((_p)) { \
 								memcpy(__val->val_data, (_p), _len); \
+							} \
+							(_vl) = __val; \
 						} \
-						(_vl) = __val; \
 					} while (0);
 #define AIT_SET_PTR(_vl, _p, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = ptr; __val->val.ptr = _p; \
@@ -213,26 +213,64 @@ typedef struct {
 								memset(__val->val.buffer, 0, _len); \
 						} } while (0)
 #define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
-						__val->val.string = (int8_t*) io_strdup((_v)); \
+						__val->val_type = string; \
+						if ((_v) && *(_v)) { \
+							__val->val.string = (int8_t*) io_strdup((_v)); \
+							AIT_LEN(__val) = strlen((const char*) \
+									__val->val.string) + 1; \
+						} else { \
+							__val->val.string = NULL; \
+							AIT_LEN(__val) = 0; \
+						} \
+					} while (0)
+#define AIT_SET_STRSIZ(_vl, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+						__val->val.string = (int8_t*) io_malloc(_len); \
 						if (__val->val.string) { \
-							__val->val_type = string; \
-							AIT_LEN(__val) = strlen((_v)) + 1; \
-						} } while (0)
+							__val->val_type = string; AIT_LEN(__val) = _len; \
+							memset(__val->val.string, 0, _len); \
+						} \
+					} while (0)
 #define AIT_SET_STRCAT(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						assert(AIT_TYPE(__val) == string); \
+						if (!__val->val.string) \
+							AIT_LEN(__val) = 1; \
 						void *__p = io_realloc(__val->val.string, \
 								AIT_LEN(__val) + strlen((_v))); \
 						if (__p) { \
-							__val->val.string = __p; \
 							AIT_LEN(__val) += strlen((_v)); \
+							if (!__val->val.string) \
+								memset(__p, 0, AIT_LEN(__val)); \
+							__val->val.string = __p; \
 							strlcat((char*) __val->val.string, (_v), \
 									AIT_LEN(__val)); \
+						} else \
+							if (!__val->val.string) \
+								AIT_LEN(__val) = 0; \
+					} while (0)
+#define AIT_SET_STRCPY(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
+						assert(AIT_TYPE(__val) == string); \
+						void *__p = io_realloc(__val->val.string, \
+								strlen((_v)) + 1); \
+						if (__p) { \
+							__val->val.string = __p; \
+							AIT_LEN(__val) = strlen((_v)) + 1; \
+							strlcpy((char*) __val->val.string, (_v), \
+									AIT_LEN(__val)); \
 						} } while (0)
+#define AIT_SET_STRLCPY(_vl, _v, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+						assert(AIT_TYPE(__val) == string); \
+						void *__p = io_realloc(__val->val.string, _len); \
+						if (__p) { \
+							__val->val.string = __p; AIT_LEN(__val) = _len; \
+							strlcpy((char*) __val->val.string, (_v), \
+									AIT_LEN(__val)); \
+						} } while (0)
 #define AIT_SET_BLOB(_vl, _n, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = blob; __val->val.blob = _n; \
 						AIT_LEN(__val) = _len; } while (0)
 #define AIT_SET_BLOB2(_vl, _bv)		do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
-						__val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \
+						__val->val_type = blob; AIT_LEN(__val) = \
+							(_bv)->blob_len; \
 						__val->val.blob = (_bv)->blob_var; } while (0)
 #define AIT_NEW_BLOB(_vl, _len)		AIT_SET_BLOB((_vl), 0, _len)
 
@@ -270,10 +308,13 @@ typedef struct {
 #define AIT_COPY_VAL(_vl, _v)		do { memcpy((_vl), (_v), sizeof(ait_val_t)); \
 						switch (AIT_TYPE((_vl))) { \
 							case buffer: \
-								AIT_SET_BUF((_vl), AIT_GET_BUF((_v)), AIT_LEN((_v))); \
+								AIT_SET_BUF((_vl), \
+										AIT_GET_BUF((_v)), \
+										AIT_LEN((_v))); \
 								break; \
 							case string: \
-								AIT_SET_STR((_vl), AIT_GET_STR((_v))); \
+								AIT_SET_STR((_vl), \
+										AIT_GET_STR((_v))); \
 								break; \
 							default: \
 								break; \
@@ -281,10 +322,15 @@ typedef struct {
 					} while (0)
 #define AIT_COPY_VAL2(_vl, _v)		do { AIT_COPY_VAL((_vl), (_v)); \
 						if (AIT_TYPE((_vl)) == data) \
-							AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), AIT_LEN((_v))); \
+							AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), \
+									AIT_LEN((_v))); \
 					} while (0)
 
 #define AIT_INIT_VAL(_vl)		(memset((_vl), 0, sizeof(ait_val_t)))
+#define AIT_INIT_VAL2(_vl, _t)		do { \
+						AIT_INIT_VAL((_vl)); \
+						(_vl)->val_type = _t; \
+					} while (0)
 					/* if attribute zeroCopy is set not execute io_free() */
 #define AIT_FREE_VAL(_vl)		do { ait_val_t *__val = (_vl); assert(__val); \
 						switch (AIT_TYPE(__val)) { \
@@ -312,19 +358,20 @@ typedef struct {
 						switch (AIT_TYPE(__val)) { \
 							case buffer: \
 							case string: \
-								memset(__val->val.buffer, 0, \
+								if (__val->val.buffer) \
+									memset(__val->val.buffer, 0, \
 										AIT_LEN(__val)); \
 								break; \
-							case data: \
-								memset(__val->val_data, 0, \
-										AIT_LEN(__val)); \
-								break; \
 							default: \
 								__val->val.net = 0LL; \
 								break; \
 						} \
 						AIT_KEY(__val) = 0; \
 					} while (0)
+#define AIT_ZERO_VAL2(_vl)		do { assert((_vl)); \
+						if (AIT_TYPE((_vl)) == data) \
+							memset((_vl)->val_data, 0, AIT_LEN((_vl))); \
+					} while (0)
 
 struct io_ether_addr {
 	u_int8_t ether_addr_octet[6];
@@ -477,6 +524,15 @@ inline ait_val_t *io_allocVar(void);
  */
 inline void io_freeVar(ait_val_t ** __restrict val);
 /*
+ * io_makeVar() - Allocate memory and fill variable
+ *
+ * @type = type of variable
+ * @... = arg1 is value of variable
+ * @... = arg2 is length of variabla. Not required for numbers and strings!
+ * return: NULL error or new variable, after use free variable with io_freeVar()
+ */
+ait_val_t *io_makeVar(ait_type_t type, ...);
+/*
  * io_allocVars() - Allocate ait_val_t array
  *
  * @varnum = Number of variables
@@ -815,6 +871,17 @@ int io_arrayMake(char * __restrict psArgs, int nargs, 
 */
 int io_MakeAV(const char * __restrict csArgs, const char *csDelim, 
 		char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);
+/*
+ * io_MakeAV2() Parse and make attribute/value pair over input string
+ *
+ * @csArgs = Input argument line, will be modified!
+ * @csDelim = Delimiter for separate
+ * @psAttr = Output Attribute
+ * @psValue = Output Value, if ==NULL this element not present value or not wanted for return
+ * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
+*/
+int io_MakeAV2(char * __restrict psArgs, const char *csDelim, 
+		char ** __restrict psAttr, char ** __restrict psValue);
 
 /*
  * io_sarrInit() - Create and initialize dynamic split-order array