X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.c;h=0a3472eb259ad2f78544f94d6f35c770b0eb65fb;hp=2f7541aff23fa864096b4d0a8d300cd4ba73534d;hb=f5104d99254281ab1a4dc221fe45e805cdee306d;hpb=6c0096c7c956185f97f49da3a5504a67227b855a

diff --git a/SimpleServer.c b/SimpleServer.c
index 2f7541a..0a3472e 100644
--- a/SimpleServer.c
+++ b/SimpleServer.c
@@ -34,7 +34,13 @@
  */
 
 /*$Log: SimpleServer.c,v $
-/*Revision 1.12  2001-08-29 11:48:35  sondberg
+/*Revision 1.14  2001-08-30 14:02:10  sondberg
+/*Small changes.
+/*
+/*Revision 1.11  2001/08/30 13:15:11  sondberg
+/*Corrected a memory leak, one more to go.
+/*
+/*Revision 1.10  2001/08/29 11:48:36  sondberg
 /*Added routines
 /*
 /*	Net::Z3950::SimpleServer::ScanSuccess
@@ -806,7 +812,6 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	int i;
 	char **basenames;
 	SV **temp;
-	SV *list_ref = sv_newmortal();
 	SV *err_code = sv_newmortal();
 	SV *err_str = sv_newmortal();
 	SV *point = sv_newmortal();
@@ -815,6 +820,9 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	char *ptr;
 	char *ODR_errstr;
 	STRLEN len;
+	int term_len;
+	SV *term_tmp;
+	SV *entries_ref;
 	
 	Zfront_handle *zhandle = (Zfront_handle *)handle;
 
@@ -825,7 +833,8 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	list = newAV();
 	if (rr->term->term->which == Z_Term_general)
 	{
-		hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, 0), 0);
+		term_len = rr->term->term->u.general->len;
+		hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, term_len), 0);
 	} else {
 		rr->errcode = 229;	/* Unsupported term type */
 		return 0;
@@ -872,8 +881,7 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	number = newSVsv(*temp);
 
 	temp = hv_fetch(href, "ENTRIES", 7, 1);
-	list_ref = newSVsv(*temp);
-	entries = (AV *)SvRV(list_ref);
+	entries_ref = newSVsv(*temp);
 
 	PUTBACK;
 	FREETMPS;
@@ -888,6 +896,7 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	rr->status = SvIV(status);
         scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list));
 	buffer = scan_list;
+	entries = (AV *)SvRV(entries_ref);
 	for (i = 0; i < rr->num_entries; i++)
 	{
 		scan_item = (HV *)SvRV(sv_2mortal(av_shift(entries)));
@@ -903,16 +912,19 @@ int bend_scan(void *handle, bend_scan_rr *rr)
 	rr->entries = scan_list;
 	zhandle->handle = point;
 	handle = zhandle;
-	/*sv_free(list_ref);*/
 	sv_free(err_code);
 	sv_free(err_str);
 	sv_free(status);
 	sv_free(number);
-	/*sv_free(point);*/
 	hv_undef(href);
+	sv_free((SV *)href);
 	av_undef(aref);
+	sv_free((SV *)aref);
 	av_undef(list);
+	sv_free((SV *)list);
 	av_undef(entries);
+	/*sv_free((SV *)entries);*/
+	sv_free(entries_ref);
 
         return 0;
 }
@@ -1048,7 +1060,7 @@ void bend_close(void *handle)
 }
 
 
-#line 1044 "SimpleServer.c"
+#line 1061 "SimpleServer.c"
 XS(XS_Net__Z3950__SimpleServer_set_init_handler)
 {
     dXSARGS;
@@ -1056,9 +1068,9 @@ XS(XS_Net__Z3950__SimpleServer_set_init_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_init_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1040 "SimpleServer.xs"
+#line 1057 "SimpleServer.xs"
 		init_ref = newSVsv(arg);
-#line 1054 "SimpleServer.c"
+#line 1071 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1070,9 +1082,9 @@ XS(XS_Net__Z3950__SimpleServer_set_close_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_close_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1047 "SimpleServer.xs"
+#line 1064 "SimpleServer.xs"
 		close_ref = newSVsv(arg);
-#line 1068 "SimpleServer.c"
+#line 1085 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1084,9 +1096,9 @@ XS(XS_Net__Z3950__SimpleServer_set_sort_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_sort_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1054 "SimpleServer.xs"
+#line 1071 "SimpleServer.xs"
 		sort_ref = newSVsv(arg);
-#line 1082 "SimpleServer.c"
+#line 1099 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1098,9 +1110,9 @@ XS(XS_Net__Z3950__SimpleServer_set_search_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_search_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1060 "SimpleServer.xs"
+#line 1077 "SimpleServer.xs"
 		search_ref = newSVsv(arg);
-#line 1096 "SimpleServer.c"
+#line 1113 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1112,9 +1124,9 @@ XS(XS_Net__Z3950__SimpleServer_set_fetch_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_fetch_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1067 "SimpleServer.xs"
+#line 1084 "SimpleServer.xs"
 		fetch_ref = newSVsv(arg);
-#line 1110 "SimpleServer.c"
+#line 1127 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1126,9 +1138,9 @@ XS(XS_Net__Z3950__SimpleServer_set_present_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_present_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1074 "SimpleServer.xs"
+#line 1091 "SimpleServer.xs"
 		present_ref = newSVsv(arg);
-#line 1124 "SimpleServer.c"
+#line 1141 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1140,9 +1152,9 @@ XS(XS_Net__Z3950__SimpleServer_set_esrequest_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_esrequest_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1081 "SimpleServer.xs"
+#line 1098 "SimpleServer.xs"
 		esrequest_ref = newSVsv(arg);
-#line 1138 "SimpleServer.c"
+#line 1155 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1154,9 +1166,9 @@ XS(XS_Net__Z3950__SimpleServer_set_delete_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_delete_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1088 "SimpleServer.xs"
+#line 1105 "SimpleServer.xs"
 		delete_ref = newSVsv(arg);
-#line 1152 "SimpleServer.c"
+#line 1169 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1168,9 +1180,9 @@ XS(XS_Net__Z3950__SimpleServer_set_scan_handler)
 	croak("Usage: Net::Z3950::SimpleServer::set_scan_handler(arg)");
     {
 	SV *	arg = ST(0);
-#line 1095 "SimpleServer.xs"
+#line 1112 "SimpleServer.xs"
 		scan_ref = newSVsv(arg);
-#line 1166 "SimpleServer.c"
+#line 1183 "SimpleServer.c"
     }
     XSRETURN_EMPTY;
 }
@@ -1179,15 +1191,15 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
 {
     dXSARGS;
     {
-#line 1101 "SimpleServer.xs"
+#line 1118 "SimpleServer.xs"
 		char **argv;
 		char **argv_buf;
 		char *ptr;
 		int i;
 		STRLEN len;
-#line 1181 "SimpleServer.c"
+#line 1198 "SimpleServer.c"
 	int	RETVAL;
-#line 1107 "SimpleServer.xs"
+#line 1124 "SimpleServer.xs"
 		argv_buf = (char **)xmalloc((items + 1) * sizeof(char *));
 		argv = argv_buf;
 		for (i = 0; i < items; i++)
@@ -1199,7 +1211,7 @@ XS(XS_Net__Z3950__SimpleServer_start_server)
 		*argv_buf = NULL;
 
 		RETVAL = statserv_main(items, argv, bend_init, bend_close);
-#line 1195 "SimpleServer.c"
+#line 1212 "SimpleServer.c"
 	ST(0) = sv_newmortal();
 	sv_setiv(ST(0), (IV)RETVAL);
     }
@@ -1213,9 +1225,9 @@ XS(XS_Net__Z3950__SimpleServer_ScanSuccess)
 	croak("Usage: Net::Z3950::SimpleServer::ScanSuccess()");
     {
 	int	RETVAL;
-#line 1125 "SimpleServer.xs"
+#line 1142 "SimpleServer.xs"
 		RETVAL = BEND_SCAN_SUCCESS;
-#line 1211 "SimpleServer.c"
+#line 1228 "SimpleServer.c"
 	ST(0) = sv_newmortal();
 	sv_setiv(ST(0), (IV)RETVAL);
     }
@@ -1229,9 +1241,9 @@ XS(XS_Net__Z3950__SimpleServer_ScanPartial)
 	croak("Usage: Net::Z3950::SimpleServer::ScanPartial()");
     {
 	int	RETVAL;
-#line 1132 "SimpleServer.xs"
+#line 1149 "SimpleServer.xs"
 		RETVAL = BEND_SCAN_PARTIAL;
-#line 1227 "SimpleServer.c"
+#line 1244 "SimpleServer.c"
 	ST(0) = sv_newmortal();
 	sv_setiv(ST(0), (IV)RETVAL);
     }