Emerg patch .2

fix bugs in mkret, getret than cause segfault.

Author: myzhang1029

Makefile

@@ -38,10 +38,12 @@ win:libsbl.dll
 libsbl.so:$(FILES)
 	$(CC) $(CFLAGS-UNIX) $(FILES) -o libsbl.so
 
-libsbl.dll:$(OBJ-WIN)
+libsbl.dll:$(FILES)
 	$(CC) $(CFLAGS-WIN) $(FILES) -o libsbl.dll
 
-
+install:
+	if [ -f libsbl.so ] ; then cp libsbl.so /usr/lib; elif [ -f libsbl.dll ] ; then cp libsbl.dll /usr/lib; fi
+ 
 .PHONY:clean err
 clean:
 	$(RM) *.o *.a -r

include/slib.h

@@ -28,7 +28,7 @@
 
 
 #ifndef SBLLIB_VERSION
-#define SBLLIB_VERSION 2.3.1
+#define SBLLIB_VERSION 2.3.2
 
 #include <string.h>
 #include <stdio.h>
@@ -155,8 +155,8 @@ typedef struct Stack
 
 typedef struct mtrt
 {
-	void **val;
 	size_t lenth;
+	int **val;
 }mtret;
 
 
@@ -281,10 +281,10 @@ OPT char* ultoaS(unsigned long value, char* string, int radix);
 D_TESTING OPT int colorprintf(enum cpfcolors fcolor,ccp format,...);
 
 
-OPT void *getret(mtret *ret);
+OPT int *getret(mtret ret);
 
 
-OPT mtret *mkret(size_t lenth,...);
+OPT mtret mkret(size_t lenth,...);
 
 #if ! PLAT
 OPT int getch(void);

main/mret.c

@@ -25,32 +25,34 @@
 #include "slib.h"
 int retind=0;
 
-mtret *mkret(size_t lenth,...)
+mtret mkret(size_t lenth,...)
 {
-	mtret *ret;
-	void **elems=malloc(sizeof(int*)*lenth);
+	mtret ret,mnull={0,NULL};
+	int **elems=malloc(sizeof(int*)*lenth);
 	int count=0;
 	va_list args;
 	if(elems==NULL)
 	{
 		serr=1;
-		return NULL;
+		return mnull;
 	}
 	va_start(args,lenth);
 
-	ret->lenth=lenth;
+	ret.lenth=lenth;
 	for(;count<lenth;++count)
 	{
 		elems[count]=va_arg(args,int*);
 	}
-	ret->val=elems;
+	//memmove(elems,ret.val,sizeof(int*)*lenth);
+	ret.val=elems;
 	va_end(args);
-	free(elems);
+	//free(elems);
+	elems=NULL;
 	return ret;
 }
 
 
-void *getret(mtret *ret)
+int *getret(mtret ret)
 {
-	return retind<ret->lenth?ret->val[retind++]:NULL;
+	return ((retind<ret.lenth)?(ret.val[retind++]):(free(ret.val),NULL));
 }