X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fliburi.so_src%2Fmain.c;h=e8f8dea0f98f67205c7cbcc8155b4d3dcc2d0b97;hb=d69e48450c7ea4be4a82c351b2d5dd0de3fc6241;hp=57de6f6ad2a4293e7b9bf53308a66136f1b19a5d;hpb=c3a2920bab79e0a41b45c74b883367437ab1dd6d;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/liburi.so_src/main.c b/Usermode/Libraries/liburi.so_src/main.c
index 57de6f6a..e8f8dea0 100644
--- a/Usermode/Libraries/liburi.so_src/main.c
+++ b/Usermode/Libraries/liburi.so_src/main.c
@@ -32,7 +32,7 @@ void	URI_Close(tURIFile *File);
 size_t	URI_file_Read(int Handle, size_t Bytes, void *Buffer);
 size_t	URI_file_Write(int Handle, size_t Bytes, void *Buffer);
 void	URI_file_Close(int Handle);
-size_t	URI_file_GetSize(int Handle);
+off_t	URI_file_GetSize(int Handle);
 
 // === CONSTANTS ===
 // Builtin URI protocol handlers
@@ -120,6 +120,7 @@ tURI *URI_Parse(const char *String)
 		else {
 			ret->PortStr = NULL;
 			ret->PortNum = -1;
+			portlen = 0;
 		}
 		
 		if(*tmp == '\0')
@@ -249,7 +250,7 @@ size_t URI_Read(tURIFile *File, size_t Bytes, void *Buffer)
 	size_t	tmp;
 	
 	printf("URI_Read(File=%p, Bytes=%u, Buffer=%p)\n",
-		File, Bytes, Buffer);
+		File, (unsigned int)Bytes, Buffer);
 	
 	if(!File || !Buffer)	return -1;
 	if(Bytes == 0)	return 0;
@@ -315,33 +316,33 @@ int URI_file_Open(char *Host, int Port, char *Path, int Mode)
 	if(Mode & URI_MODE_READ)	smode |= OPENFLAG_READ;
 	if(Mode & URI_MODE_WRITE)	smode |= OPENFLAG_WRITE;
 	
-	printf("URI_file_Open: open('%s', 0x%x)\n", Path, smode);
+//	printf("URI_file_Open: open('%s', 0x%x)\n", Path, smode);
 	{
 		 int	ret;
-		ret = open(Path, smode);
+		ret = _SysOpen(Path, smode);
 		return ret;
 	}
 }
 size_t URI_file_Read(int Handle, size_t Bytes, void *Buffer)
 {
-	printf("URI_file_Read: (Handle=%i, Bytes=%i, Buffer=%p)\n",
-		Handle, Bytes, Buffer);
-	return read(Handle, Bytes, Buffer);
+//	printf("URI_file_Read: (Handle=%i, Buffer=%p, Bytes=%i)\n",
+//		Handle, Buffer, (int)Bytes);
+	return _SysRead(Handle, Buffer, Bytes);
 }
 size_t URI_file_Write(int Handle, size_t Bytes, void *Buffer)
 {
-	return write(Handle, Bytes, Buffer);
+	return _SysWrite(Handle, Buffer, Bytes);
 }
 void URI_file_Close(int Handle)
 {
-	close(Handle);
+	_SysClose(Handle);
 }
-size_t URI_file_GetSize(int Handle)
+off_t URI_file_GetSize(int Handle)
 {
-	uint64_t curpos = tell(Handle);
-	size_t ret;
-	seek(Handle, 0, SEEK_END);
-	ret = tell(Handle);
-	seek(Handle, curpos, SEEK_SET);
+	uint64_t curpos = _SysTell(Handle);
+	off_t ret;
+	_SysSeek(Handle, 0, SEEK_END);
+	ret = _SysTell(Handle);
+	_SysSeek(Handle, curpos, SEEK_SET);
 	return ret;
 }