X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsquirrel%2Fsqdbg%2Fsqrdbg.cpp;h=c5243faab917a368f3ceafc87439982e6c2c4a66;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=b58a41d015116d074ff6643f1a0f53a03d54ede0;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git

diff --git a/src/squirrel/sqdbg/sqrdbg.cpp b/src/squirrel/sqdbg/sqrdbg.cpp
index b58a41d01..c5243faab 100644
--- a/src/squirrel/sqdbg/sqrdbg.cpp
+++ b/src/squirrel/sqdbg/sqrdbg.cpp
@@ -1,166 +1,166 @@
-/*
-	see copyright notice in sqrdbg.h
-*/
-#include <squirrel.h>
-#include "sqrdbg.h"
-#include "sqdbgserver.h"
-int debug_hook(HSQUIRRELVM v);
-int error_handler(HSQUIRRELVM v);
-
-#include "serialize_state.inl"
-
-HSQREMOTEDBG sq_rdbg_init(HSQUIRRELVM v,unsigned short port,SQBool autoupdate)
-{
-	sockaddr_in bindaddr;
-#ifdef _WIN32
-	WSADATA wsadata;	
-	if (WSAStartup (MAKEWORD(1,1), &wsadata) != 0){
-		return NULL;
-	}	
-#endif 
-        
-	SQDbgServer *rdbg = new SQDbgServer(v);
-	rdbg->_autoupdate = autoupdate?true:false;
-	rdbg->_accept = socket(AF_INET,SOCK_STREAM,0);
-	bindaddr.sin_family = AF_INET;
-	bindaddr.sin_port = htons(port);
-	bindaddr.sin_addr.s_addr = htonl (INADDR_ANY);
-	if(bind(rdbg->_accept,(sockaddr*)&bindaddr,sizeof(bindaddr))==SOCKET_ERROR){
-		delete rdbg;
-		sq_throwerror(v,_SC("failed to bind the socket"));
-		return NULL;
-	}
-	if(!rdbg->Init()) {
-		delete rdbg;
-		sq_throwerror(v,_SC("failed to initialize the debugger"));
-		return NULL;
-	}
-	
-    return rdbg;
-}
-
-SQRESULT sq_rdbg_waitforconnections(HSQREMOTEDBG rdbg)
-{
-	if(SQ_FAILED(sq_compilebuffer(rdbg->_v,serialize_state_nut,(SQInteger)scstrlen(serialize_state_nut),_SC("SERIALIZE_STATE"),SQFalse))) {
-		sq_throwerror(rdbg->_v,_SC("error compiling the serialization function"));
-	}
-	sq_getstackobj(rdbg->_v,-1,&rdbg->_serializefunc);
-	sq_addref(rdbg->_v,&rdbg->_serializefunc);
-	sq_pop(rdbg->_v,1);
-
-	sockaddr_in cliaddr;
-	socklen_t addrlen=sizeof(cliaddr);
-	if(listen(rdbg->_accept,0)==SOCKET_ERROR)
-		return sq_throwerror(rdbg->_v,_SC("error on listen(socket)"));
-	rdbg->_endpoint = accept(rdbg->_accept,(sockaddr*)&cliaddr,&addrlen);
-	//do not accept any other connection
-	sqdbg_closesocket(rdbg->_accept);
-	rdbg->_accept = INVALID_SOCKET;
-	if(rdbg->_endpoint==INVALID_SOCKET){
-		return sq_throwerror(rdbg->_v,_SC("error accept(socket)"));
-	}
-	while(!rdbg->_ready){
-		sq_rdbg_update(rdbg);
-	}
-	return SQ_OK;
-}
-
-SQRESULT sq_rdbg_update(HSQREMOTEDBG rdbg)
-{
-	TIMEVAL time;
-	time.tv_sec=0;
-	time.tv_usec=0;
-	fd_set read_flags;
-    FD_ZERO(&read_flags);
-	FD_SET(rdbg->_endpoint, &read_flags);
-	select(FD_SETSIZE, &read_flags, NULL, NULL, &time);
-
-	if(FD_ISSET(rdbg->_endpoint,&read_flags)){
-		char temp[1024];
-		int size=0;
-		char c,prev=0;
-		memset(&temp,0,sizeof(temp));
-		int res;
-		FD_CLR(rdbg->_endpoint, &read_flags);
-		while((res = recv(rdbg->_endpoint,&c,1,0))>0){
-			
-			if(c=='\n')break;
-			if(c!='\r'){
-				temp[size]=c;
-				prev=c;
-				size++;
-			}
-		}
-		switch(res){
-		case 0:
-			return sq_throwerror(rdbg->_v,_SC("disconnected"));
-		case SOCKET_ERROR:
-			return sq_throwerror(rdbg->_v,_SC("socket error"));
-        }
-		
-		temp[size]=0;
-		temp[size+1]=0;
-		rdbg->ParseMsg(temp);
-	}
-	return SQ_OK;
-}
-
-int debug_hook(HSQUIRRELVM v)
-{
-	SQUserPointer up;
-	int event_type,line;
-	const SQChar *src,*func;
-	sq_getinteger(v,2,&event_type);
-	sq_getstring(v,3,&src);
-	sq_getinteger(v,4,&line);
-	sq_getstring(v,5,&func);
-	sq_getuserpointer(v,-1,&up);
-	HSQREMOTEDBG rdbg = (HSQREMOTEDBG)up;
-	rdbg->Hook(event_type,line,src,func);
-	if(rdbg->_autoupdate) {
-		if(SQ_FAILED(sq_rdbg_update(rdbg)))
-			return sq_throwerror(v,_SC("socket failed"));
-	}
-	return 0;
-}
-
-int error_handler(HSQUIRRELVM v)
-{
-	SQUserPointer up;
-	const SQChar *sErr=NULL;
-	const SQChar *fn=_SC("unknown");
-	const SQChar *src=_SC("unknown");
-	int line=-1;
-	SQStackInfos si;
-	sq_getuserpointer(v,-1,&up);
-	HSQREMOTEDBG rdbg=(HSQREMOTEDBG)up;
-	if(SQ_SUCCEEDED(sq_stackinfos(v,1,&si)))
-	{
-		if(si.funcname)fn=si.funcname;
-		if(si.source)src=si.source;
-		line=si.line;
-		scprintf(_SC("*FUNCTION [%s] %s line [%d]\n"),fn,src,si.line);
-	}
-	if(sq_gettop(v)>=1){
-		if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr)))	{
-			scprintf(_SC("\nAN ERROR HAS OCCURED [%s]\n"),sErr);
-			rdbg->Break(si.line,src,_SC("error"),sErr);
-		}
-		else{
-			scprintf(_SC("\nAN ERROR HAS OCCURED [unknown]\n"));
-			rdbg->Break(si.line,src,_SC("error"),_SC("unknown"));
-		}
-	}
-	rdbg->BreakExecution();
-	return 0;
-}
-
-
-SQRESULT sq_rdbg_shutdown(HSQREMOTEDBG rdbg)
-{
-	delete rdbg;
-#ifdef _WIN32
-	WSACleanup();
-#endif
-	return SQ_OK;
-}
+/*
+	see copyright notice in sqrdbg.h
+*/
+#include <squirrel.h>
+#include "sqrdbg.h"
+#include "sqdbgserver.h"
+int debug_hook(HSQUIRRELVM v);
+int error_handler(HSQUIRRELVM v);
+
+#include "serialize_state.inl"
+
+HSQREMOTEDBG sq_rdbg_init(HSQUIRRELVM v,unsigned short port,SQBool autoupdate)
+{
+	sockaddr_in bindaddr;
+#ifdef _WIN32
+	WSADATA wsadata;
+	if (WSAStartup (MAKEWORD(1,1), &wsadata) != 0){
+		return NULL;
+	}
+#endif
+
+	SQDbgServer *rdbg = new SQDbgServer(v);
+	rdbg->_autoupdate = autoupdate?true:false;
+	rdbg->_accept = socket(AF_INET,SOCK_STREAM,0);
+	bindaddr.sin_family = AF_INET;
+	bindaddr.sin_port = htons(port);
+	bindaddr.sin_addr.s_addr = htonl (INADDR_ANY);
+	if(bind(rdbg->_accept,(sockaddr*)&bindaddr,sizeof(bindaddr))==SOCKET_ERROR){
+		delete rdbg;
+		sq_throwerror(v,_SC("failed to bind the socket"));
+		return NULL;
+	}
+	if(!rdbg->Init()) {
+		delete rdbg;
+		sq_throwerror(v,_SC("failed to initialize the debugger"));
+		return NULL;
+	}
+
+    return rdbg;
+}
+
+SQRESULT sq_rdbg_waitforconnections(HSQREMOTEDBG rdbg)
+{
+	if(SQ_FAILED(sq_compilebuffer(rdbg->_v,serialize_state_nut,(SQInteger)scstrlen(serialize_state_nut),_SC("SERIALIZE_STATE"),SQFalse))) {
+		sq_throwerror(rdbg->_v,_SC("error compiling the serialization function"));
+	}
+	sq_getstackobj(rdbg->_v,-1,&rdbg->_serializefunc);
+	sq_addref(rdbg->_v,&rdbg->_serializefunc);
+	sq_pop(rdbg->_v,1);
+
+	sockaddr_in cliaddr;
+	socklen_t addrlen=sizeof(cliaddr);
+	if(listen(rdbg->_accept,0)==SOCKET_ERROR)
+		return sq_throwerror(rdbg->_v,_SC("error on listen(socket)"));
+	rdbg->_endpoint = accept(rdbg->_accept,(sockaddr*)&cliaddr,&addrlen);
+	//do not accept any other connection
+	sqdbg_closesocket(rdbg->_accept);
+	rdbg->_accept = INVALID_SOCKET;
+	if(rdbg->_endpoint==INVALID_SOCKET){
+		return sq_throwerror(rdbg->_v,_SC("error accept(socket)"));
+	}
+	while(!rdbg->_ready){
+		sq_rdbg_update(rdbg);
+	}
+	return SQ_OK;
+}
+
+SQRESULT sq_rdbg_update(HSQREMOTEDBG rdbg)
+{
+	TIMEVAL time;
+	time.tv_sec=0;
+	time.tv_usec=0;
+	fd_set read_flags;
+    FD_ZERO(&read_flags);
+	FD_SET(rdbg->_endpoint, &read_flags);
+	select(FD_SETSIZE, &read_flags, NULL, NULL, &time);
+
+	if(FD_ISSET(rdbg->_endpoint,&read_flags)){
+		char temp[1024];
+		int size=0;
+		char c,prev=0;
+		memset(&temp,0,sizeof(temp));
+		int res;
+		FD_CLR(rdbg->_endpoint, &read_flags);
+		while((res = recv(rdbg->_endpoint,&c,1,0))>0){
+
+			if(c=='\n')break;
+			if(c!='\r'){
+				temp[size]=c;
+				prev=c;
+				size++;
+			}
+		}
+		switch(res){
+		case 0:
+			return sq_throwerror(rdbg->_v,_SC("disconnected"));
+		case SOCKET_ERROR:
+			return sq_throwerror(rdbg->_v,_SC("socket error"));
+        }
+
+		temp[size]=0;
+		temp[size+1]=0;
+		rdbg->ParseMsg(temp);
+	}
+	return SQ_OK;
+}
+
+int debug_hook(HSQUIRRELVM v)
+{
+	SQUserPointer up;
+	int event_type,line;
+	const SQChar *src,*func;
+	sq_getinteger(v,2,&event_type);
+	sq_getstring(v,3,&src);
+	sq_getinteger(v,4,&line);
+	sq_getstring(v,5,&func);
+	sq_getuserpointer(v,-1,&up);
+	HSQREMOTEDBG rdbg = (HSQREMOTEDBG)up;
+	rdbg->Hook(event_type,line,src,func);
+	if(rdbg->_autoupdate) {
+		if(SQ_FAILED(sq_rdbg_update(rdbg)))
+			return sq_throwerror(v,_SC("socket failed"));
+	}
+	return 0;
+}
+
+int error_handler(HSQUIRRELVM v)
+{
+	SQUserPointer up;
+	const SQChar *sErr=NULL;
+	const SQChar *fn=_SC("unknown");
+	const SQChar *src=_SC("unknown");
+	int line=-1;
+	SQStackInfos si;
+	sq_getuserpointer(v,-1,&up);
+	HSQREMOTEDBG rdbg=(HSQREMOTEDBG)up;
+	if(SQ_SUCCEEDED(sq_stackinfos(v,1,&si)))
+	{
+		if(si.funcname)fn=si.funcname;
+		if(si.source)src=si.source;
+		line=si.line;
+		scprintf(_SC("*FUNCTION [%s] %s line [%d]\n"),fn,src,si.line);
+	}
+	if(sq_gettop(v)>=1){
+		if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr)))	{
+			scprintf(_SC("\nAN ERROR HAS OCCURED [%s]\n"),sErr);
+			rdbg->Break(si.line,src,_SC("error"),sErr);
+		}
+		else{
+			scprintf(_SC("\nAN ERROR HAS OCCURED [unknown]\n"));
+			rdbg->Break(si.line,src,_SC("error"),_SC("unknown"));
+		}
+	}
+	rdbg->BreakExecution();
+	return 0;
+}
+
+
+SQRESULT sq_rdbg_shutdown(HSQREMOTEDBG rdbg)
+{
+	delete rdbg;
+#ifdef _WIN32
+	WSACleanup();
+#endif
+	return SQ_OK;
+}