--- libaitio/src/Attic/array.c	2011/05/19 03:01:20	1.2.4.2
+++ libaitio/src/Attic/array.c	2011/08/29 12:00:57	1.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: array.c,v 1.2.4.2 2011/05/19 03:01:20 misho Exp $
+* $Id: array.c,v 1.4 2011/08/29 12:00:57 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -76,25 +76,25 @@ io_arrayInit(int numItems)
 
 /*
  * io_arrayFrom() - Create and fill array from array with pointers
- * @argv = 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 memory for array
+ * return: NULL error, != NULL allocated new array
  */
 inline array_t *
-io_arrayFrom(const char **argv, int argc)
+io_arrayFrom(const char *** __restrict pargv, int argc)
 {
 	array_t *arr = NULL;
 	const char **a = NULL;
 	register int num = 0;
 
-	assert(argv);
-	if (!argv || !*argv || argc < 0)
+	assert(pargv);
+	if (!pargv || !*pargv || argc < 0)
 		return NULL;
 
 	if (argc)
 		num = argc;
 	else
-		for (a = argv; *a; a++, num++);
+		for (a = *pargv; *a; a++, num++);
 
 	arr = malloc(sizeof(array_t));
 	if (!arr) {
@@ -109,7 +109,7 @@ io_arrayFrom(const char **argv, int argc)
 		free(arr);
 		return NULL;
 	} else
-		memcpy(arr->arr_data, argv, io_arraySize(arr) * sizeof(void*));
+		memcpy(arr->arr_data, *pargv, io_arraySize(arr) * sizeof(void*));
 
 	return arr;
 }
@@ -117,7 +117,7 @@ io_arrayFrom(const char **argv, int argc)
 /*
  * io_arrayTo() - Create and fill array with pointers from dynamic array
  * @arr = Array
- * return: NULL error, != NULL allocated memory for array
+ * return: NULL error, != NULL allocated memory for array, NULL terminated
  */
 inline char **
 io_arrayTo(array_t * __restrict arr)
@@ -128,12 +128,13 @@ io_arrayTo(array_t * __restrict arr)
 	if (!arr || !io_arraySize(arr))
 		return NULL;
 
-	args = (char **) calloc(io_arraySize(arr), sizeof(char*));
+	args = (char **) calloc(io_arraySize(arr) + 1, sizeof(char*));
 	if (!args) {
 		LOGERR;
 		return NULL;
 	} else
 		memcpy(args, arr->arr_data, io_arraySize(arr) * sizeof(char*));
+	args[io_arraySize(arr)] = NULL;
 
 	return args;
 }
@@ -168,8 +169,8 @@ io_arrayFree(array_t * __restrict arr)
 inline void
 io_arrayDestroy(array_t ** __restrict parr)
 {
-	assert(parr);
-	if (!parr)
+	assert(parr && *parr);
+	if (!parr || !*parr)
 		return;
 
 	if ((*parr)->arr_data)
@@ -225,14 +226,21 @@ io_arrayGrow(array_t * __restrict arr, int newNumItems
 				*/
 
 	arr->arr_num = newNumItems;
-	data = realloc(arr->arr_data, io_arraySize(arr) * sizeof(void*));
-	if (!data) {
-		LOGERR;
-		return -1;
-	} else
-		arr->arr_data = data;
-	memset(arr->arr_data + (io_arraySize(arr) - n), 0, n * sizeof(void*));
+	if (io_arraySize(arr)) {
+		data = realloc(arr->arr_data, io_arraySize(arr) * sizeof(void*));
+		if (!data) {
+			LOGERR;
+			return -1;
+		} else
+			arr->arr_data = data;
 
+		memset(arr->arr_data + (io_arraySize(arr) - n), 0, n * sizeof(void*));
+	} else {
+		if (arr->arr_data)
+			free(arr->arr_data);
+		arr->arr_data = NULL;
+	}
+
 	return 0;
 }
 
@@ -263,12 +271,13 @@ io_arrayVacuum(array_t * __restrict arr, int fromWhere
 	*/
 	if (fromWhere & VACUUM_LEFT) {
 		for (i = 0; i < num && !arr->arr_data[i]; i++);
+		if (i) {
+			memmove(arr->arr_data, arr->arr_data + i, (num - i) * sizeof(void*));
+			memset(arr->arr_data + (num - i), 0, i * sizeof(void*));
 
-		memmove(arr->arr_data, arr->arr_data + i, (num - i) * sizeof(void*));
-		memset(arr->arr_data + (num - i), 0, i * sizeof(void*));
-
-		num -= i;
-		cx += i;
+			num -= i;
+			cx += i;
+		}
 	}
 	if (fromWhere & VACUUM_BETWEEN) {
 		for (i = 0; i < num; i++) {
@@ -316,7 +325,7 @@ io_arrayPush(array_t * __restrict arr, void **data)
 /*
  * 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
  */