X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Fdrv%2Fproc.c;h=b4483b048036400f3b026f1ba4899a3b1ce03bed;hb=e02f66c7125bf18f77c6c53587238cbd49da2c89;hp=73f4535437fe725f8ab92d2e0081ea7583395233;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/drv/proc.c b/KernelLand/Kernel/drv/proc.c index 73f45354..b4483b04 100644 --- a/KernelLand/Kernel/drv/proc.c +++ b/KernelLand/Kernel/drv/proc.c @@ -33,7 +33,7 @@ typedef struct sSysFS_Ent char *SysFS_Comm_ReadDir(tVFS_Node *Node, int Id); tVFS_Node *SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename); -Uint64 SysFS_Comm_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer); +size_t SysFS_Comm_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer); void SysFS_Comm_CloseFile(tVFS_Node *Node); // === GLOBALS === @@ -109,12 +109,8 @@ tSysFS_Ent *gSysFS_FileList; */ int SysFS_Install(char **Options) { - { - const char *fmt = "Acess2 "EXPAND_STR(KERNEL_VERSION)" "EXPAND_STR(ARCHDIR)" build %i, hash %s"; - gSysFS_Version_Kernel.Node.Size = sprintf(NULL, fmt, BUILD_NUM, gsGitHash); - gSysFS_Version_Kernel.Node.ImplPtr = malloc( gSysFS_Version_Kernel.Node.Size + 1 ); - sprintf(gSysFS_Version_Kernel.Node.ImplPtr, fmt, BUILD_NUM, gsGitHash); - } + gSysFS_Version_Kernel.Node.Size = strlen(gsBuildInfo); + gSysFS_Version_Kernel.Node.ImplPtr = (void*)gsBuildInfo; DevFS_AddDevice( &gSysFS_DriverInfo ); return MODULE_ERR_OK; @@ -357,10 +353,9 @@ tVFS_Node *SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename) } /** - * \fn Uint64 SysFS_Comm_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) * \brief Read from an exposed buffer */ -Uint64 SysFS_Comm_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) +size_t SysFS_Comm_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer) { if( Offset > Node->Size ) return -1; if( Length > Node->Size ) Length = Node->Size;