From 4893f475758f033d08635e303049d80c48851c6b Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Wed, 6 Nov 2013 19:50:11 +0400 Subject: [PATCH] ulmSysStat for 32 bit platforms now works Former-commit-id: 2d0c36b73c30cca37f3b2798dd70dba73564a462 --- src/lib/ulm/armv6j/ulmSysStat.Mod | 9 +++++---- src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod | 9 +++++---- src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod | 9 +++++---- src/lib/ulm/x86/ulmSysStat.Mod | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/lib/ulm/armv6j/ulmSysStat.Mod b/src/lib/ulm/armv6j/ulmSysStat.Mod index 9154ba6d..c7f00f04 100644 --- a/src/lib/ulm/armv6j/ulmSysStat.Mod +++ b/src/lib/ulm/armv6j/ulmSysStat.Mod @@ -98,9 +98,9 @@ MODULE ulmSysStat; a directory entry for this file *) inode*: SysTypes.Inode; (* inode number *) mode*: SET; (* file mode; see mknod(2) *) - nlinks*: INTEGER; (* number of links *) - uid*: INTEGER; (* user id of the file's owner *) - gid*: INTEGER; (* group id of the file's group *) + nlinks*: LONGINT; (* number of links *) + uid*: LONGINT; (* user id of the file's owner *) + gid*: LONGINT; (* group id of the file's group *) rdev*: SysTypes.Device; (* ID of device this entry is defined only for character special or block @@ -146,7 +146,8 @@ MODULE ulmSysStat; CONST statbufconv = (*"is=dev/-s=pad1/ll=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/ll=size/2*ll=blksize,blocks/il=atime/-l/il=mtime/-l/il=ctime/3*-l";*) - "ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; + (*"ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l";*) + "ll=dev/-l=devx/-s=pad1/ll=ino/Sl=mode/ll=nlink/ll=uid/ll=gid/ll=rdev/-l=rdevx/-s=pad2/ll=size/2*ll=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; VAR statbuffmt: SysConversions.Format; diff --git a/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod b/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod index 9154ba6d..c7f00f04 100644 --- a/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod +++ b/src/lib/ulm/armv6j_hardfp/ulmSysStat.Mod @@ -98,9 +98,9 @@ MODULE ulmSysStat; a directory entry for this file *) inode*: SysTypes.Inode; (* inode number *) mode*: SET; (* file mode; see mknod(2) *) - nlinks*: INTEGER; (* number of links *) - uid*: INTEGER; (* user id of the file's owner *) - gid*: INTEGER; (* group id of the file's group *) + nlinks*: LONGINT; (* number of links *) + uid*: LONGINT; (* user id of the file's owner *) + gid*: LONGINT; (* group id of the file's group *) rdev*: SysTypes.Device; (* ID of device this entry is defined only for character special or block @@ -146,7 +146,8 @@ MODULE ulmSysStat; CONST statbufconv = (*"is=dev/-s=pad1/ll=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/ll=size/2*ll=blksize,blocks/il=atime/-l/il=mtime/-l/il=ctime/3*-l";*) - "ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; + (*"ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l";*) + "ll=dev/-l=devx/-s=pad1/ll=ino/Sl=mode/ll=nlink/ll=uid/ll=gid/ll=rdev/-l=rdevx/-s=pad2/ll=size/2*ll=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; VAR statbuffmt: SysConversions.Format; diff --git a/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod b/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod index 9154ba6d..c7f00f04 100644 --- a/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod +++ b/src/lib/ulm/armv7a_hardfp/ulmSysStat.Mod @@ -98,9 +98,9 @@ MODULE ulmSysStat; a directory entry for this file *) inode*: SysTypes.Inode; (* inode number *) mode*: SET; (* file mode; see mknod(2) *) - nlinks*: INTEGER; (* number of links *) - uid*: INTEGER; (* user id of the file's owner *) - gid*: INTEGER; (* group id of the file's group *) + nlinks*: LONGINT; (* number of links *) + uid*: LONGINT; (* user id of the file's owner *) + gid*: LONGINT; (* group id of the file's group *) rdev*: SysTypes.Device; (* ID of device this entry is defined only for character special or block @@ -146,7 +146,8 @@ MODULE ulmSysStat; CONST statbufconv = (*"is=dev/-s=pad1/ll=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/ll=size/2*ll=blksize,blocks/il=atime/-l/il=mtime/-l/il=ctime/3*-l";*) - "ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; + (*"ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l";*) + "ll=dev/-l=devx/-s=pad1/ll=ino/Sl=mode/ll=nlink/ll=uid/ll=gid/ll=rdev/-l=rdevx/-s=pad2/ll=size/2*ll=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; VAR statbuffmt: SysConversions.Format; diff --git a/src/lib/ulm/x86/ulmSysStat.Mod b/src/lib/ulm/x86/ulmSysStat.Mod index 9154ba6d..c7f00f04 100644 --- a/src/lib/ulm/x86/ulmSysStat.Mod +++ b/src/lib/ulm/x86/ulmSysStat.Mod @@ -98,9 +98,9 @@ MODULE ulmSysStat; a directory entry for this file *) inode*: SysTypes.Inode; (* inode number *) mode*: SET; (* file mode; see mknod(2) *) - nlinks*: INTEGER; (* number of links *) - uid*: INTEGER; (* user id of the file's owner *) - gid*: INTEGER; (* group id of the file's group *) + nlinks*: LONGINT; (* number of links *) + uid*: LONGINT; (* user id of the file's owner *) + gid*: LONGINT; (* group id of the file's group *) rdev*: SysTypes.Device; (* ID of device this entry is defined only for character special or block @@ -146,7 +146,8 @@ MODULE ulmSysStat; CONST statbufconv = (*"is=dev/-s=pad1/ll=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/ll=size/2*ll=blksize,blocks/il=atime/-l/il=mtime/-l/il=ctime/3*-l";*) - "ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; + (*"ls=dev/-s=pad1/lL=ino/Ss=mode/4*is=nlink+uid+gid+rdev/-s=pad2/lL=size/2*lL=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l";*) + "ll=dev/-l=devx/-s=pad1/ll=ino/Sl=mode/ll=nlink/ll=uid/ll=gid/ll=rdev/-l=rdevx/-s=pad2/ll=size/2*ll=blksize,blocks/lL=atime/-l/lL=mtime/-l/lL=ctime/3*-l"; VAR statbuffmt: SysConversions.Format;