--- libaitio/inc/aitio.h 2011/04/20 08:09:13 1.7.2.4 +++ libaitio/inc/aitio.h 2011/08/26 12:24:44 1.10.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.7.2.4 2011/04/20 08:09:13 misho Exp $ +* $Id: aitio.h,v 1.10.2.3 2011/08/26 12:24:44 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -27,11 +27,11 @@ are met: must display the following acknowledgement: This product includes software developed by Michael Pounov ELWIX - Embedded LightWeight unIX and its contributors. -4. Neither the name of the University nor the names of its contributors +4. Neither the name of AITNET nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE @@ -55,6 +55,14 @@ SUCH DAMAGE. #define VACUUM_BETWEEN 2 +typedef void ** sarr_seg_t; +typedef struct _tagSplitArray { + int sarr_num; + int sarr_seg; + int sarr_siz; + sarr_seg_t *sarr_data; +} sarr_t; + typedef struct _tagArray { int arr_num; void **arr_data; @@ -211,25 +219,45 @@ inline char *io_Hex2Ch(unsigned char *psLine, int line */ inline array_t *io_arrayInit(int numItems); /* - * io_arrayDestroy() - Free all data in dynamic array and Destroy dynamic array + * io_arrayDestroy() - Free and destroy dynamic array * @parr = Array * return: none */ inline void io_arrayDestroy(array_t ** __restrict parr); /* - * io_arrayFree() - Free all data in dynamic array + * io_arrayFree() - Free all data in dynamic array items * (WARNING! If assign static array dont use this!!!) * @arr = Array * return: none */ inline void io_arrayFree(array_t * __restrict arr); /* + * io_arrayFrom() - Create and fill array from array with pointers + * @pargv = Array with pointers + * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item + * return: NULL error, != NULL allocated new array + */ +inline array_t *io_arrayFrom(const char *** __restrict pargv, int argc); +/* + * io_arrayTo() - Create and fill array with pointers from dynamic array + * @arr = Array + * return: NULL error, != NULL allocated memory for array, NULL terminated + */ +inline char **io_arrayTo(array_t * __restrict arr); +/* * io_arrayLen() - Get last used element in dynamic array (array Length) * @arr = Array * return: -1 error, 0 empty or >0 position of last used element */ inline int io_arrayLen(array_t * __restrict arr); /* + * io_arrayConcat() Concat source array to destination array + * @dest = Destination array + * @src = Source array + * return: -1 error; >0 new count of destination array + */ +int io_arrayConcat(array_t * __restrict dest, array_t * __restrict src); +/* * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!! * @arr = Array * @newNumItems = Number of Items @@ -244,14 +272,20 @@ int io_arrayGrow(array_t * __restrict arr, int newNumI */ int io_arrayVacuum(array_t * __restrict arr, int fromWhere); -#define io_arraySize(_arr) ((assert(_arr)), _arr->arr_num) +#define io_arraySize(_arr) (assert((_arr)), (_arr)->arr_num) -#define io_arrayGet(_arr, _d, _type) ((assert(_arr && _arr->arr_num > _d)), \ - ((_type) *(_arr->arr_data + _d))) +#define io_arrayGet(_arr, _d, _type) (assert((_arr) && (_arr)->arr_num > _d), \ + ((_type) *((_arr)->arr_data + _d))) #define io_arraySet(_arr, _d, _ptr) do { \ - assert(_arr && _arr->arr_num > _d); \ - *(_arr->arr_data + _d) = (void*) _ptr; \ + assert((_arr) && (_arr)->arr_num > _d); \ + *((_arr)->arr_data + _d) = (void*) _ptr; \ } while (0) +#define io_arrayDel(_arr, _d, _fri) do { \ + assert((_arr) && (_arr)->arr_num > _d); \ + if (_fri) \ + free(*((_arr)->arr_data + _d)); \ + *((_arr)->arr_data + _d) = NULL; \ + } while (0) /* * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position @@ -263,7 +297,7 @@ inline int io_arrayPush(array_t * __restrict arr, void /* * io_arrayPop() - Pop element from dynamic array like stack manner, last used position * @arr = Array - * @data = Element, if set NULL return only first empty position + * @data = Element, if set NULL return only last used position * @delAfter = Delete after Pop element, !=0 delete element from array after return data * return: -1 not found used position, array is empty!, >-1 return element position */ @@ -302,8 +336,94 @@ 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_sarrInit() - Create and initialize dynamic split-order array + * @numItems = Number of Items + * @segLen = Length of segment + * return: NULL error, != NULL allocated memory for array + */ +inline sarr_t *io_sarrInit(int numItems, int segLen); +/* + * io_sarrDestroy() - Free all data in dynamic split-order array and Destroy array + * @parr = Array + * return: none + */ +inline void io_sarrDestroy(sarr_t ** __restrict parr); +/* + * io_sarrGrow() - Grow/Shrink dynamic split-order array, Use with care when it shrink!!! + * @arr = Array + * @newNumItems = Number of Items + * return: -1 error, 0 ok + */ +int io_sarrGrow(sarr_t * __restrict arr, int newNumItems); +/* + * io_sarrVacuum() - Vacuum dynamic split-order array, empty segments will be freed + * @arr = Array + * return: -1 error, >-1 freed segments + */ +inline int io_sarrVacuum(sarr_t * __restrict arr); +#define io_sarrSize(_arr) (assert((_arr)), (_arr)->sarr_num) +/* + * io_sarrGet() - Get element from dynamic split-order array + * @arr = Array + * @idx = Index (warning 1st element is at position 1) + * return: NULL not found, !=NULL element + */ +inline void *io_sarrGet(sarr_t * __restrict arr, unsigned int idx); +/* + * io_sarrGet2() - Always get element from dynamic split-order array + * Function automatic grow array. Good use for Hash tables! + * @arr = Array + * @idx = Index (warning 1st element is at position 1) + * return: NULL not found, !=NULL element + */ +void *io_sarrGet2(sarr_t * __restrict arr, unsigned int idx); +/* + * io_sarrSet() - Set element to dynamic split-order array + * @arr = Array + * @idx = Index (warning 1st element is at position 1) + * @data = Value + * return: NULL error or empty, !=NULL old value in element + */ +inline void *io_sarrSet(sarr_t * __restrict arr, unsigned int idx, void *data); +#define io_sarrDel(_arr, _idx) io_sarrSet((_arr), _idx, NULL) +#define io_sarr(_arr, _idx, _type) (_type)io_sarrGet((_arr), _idx) +/* + * io_sarr2array() - Convert from split-order array to dynamic array + * @sa = split array + * @sarrFree = after convert split array !=0 will be destroyed sarray + * return: NULL error or != NULL new array + */ +array_t *io_sarr2array(sarr_t ** __restrict sa, int sarrFree); +/* + * io_array2sarr() - Convert from dynamic array to split-order array + * @a = array + * @arrFree = after convert array !=0 will be destroyed + * return: NULL error or != NULL new sarr + */ +sarr_t *io_array2sarr(array_t ** __restrict a, int arrFree); /* + * io_CopyEnv() Copy environment to new environment array; + * @oldenv = Environment array + * return: NULL error; !=NULL Allocated new environment array(must be free) +*/ +char **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) +*/ +char **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 +*/ +inline void io_FreeNullTerm(char *** __restrict arr); + +/* * ioURLGet() Parse and get data from input URL * @csURL = Input URL line * @url = Output parsed URL @@ -390,7 +510,7 @@ extern int io_Debug; #define ioDEBUG(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ - snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \ + snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ if ((x) <= io_Debug) \ syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \ (x), __func__, __LINE__, str); \ @@ -399,7 +519,7 @@ extern int io_Debug; #define ioERROR(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ - snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \ + snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \ __func__, __LINE__, (x), str); \ } while (0)