Browse Source

* updated the openbsd tstatfs structure to be compatible with the currently
supported openbsd versions (6.3 and 6.4)

git-svn-id: trunk@41878 -

nickysn 6 years ago
parent
commit
e2a139ee19
1 changed files with 32 additions and 25 deletions
  1. 32 25
      rtl/openbsd/ptypes.inc

+ 32 - 25
rtl/openbsd/ptypes.inc

@@ -149,11 +149,11 @@ type
   );
 
 Const
-     MNAMLEN   = 90;		// length of buffer for returned name
-     MFSNamLen = 16;		// length of fs type name, including nul
+     MFSNAMELEN = 16;   // length of fs type name, including nul
+     MNAMELEN   = 90;   // length of buffer for returned name
 
 type
-  fsid_t  = array[0..1] of cint;
+  fsid_t  = array[0..1] of cint32;
 
   ufs_args_rec		= record end;
   mfs_args_rec		= record end;
@@ -176,29 +176,36 @@ type
     end;
 
 // kernel statfs from mount.h
+  { new statfs structure with mount options and statvfs fields }
   TStatfs = record
-    flags,			  { copy of mount flags }
-    bsize,			  { filesystem block size}
-    iosize		: cint;   { optimal transfr block size }
-    blocks,			  { total data block in file system }
-    bfree		: cuint64;  { blocks free in fs }
-    bavail		: cint64; { block available for non-superuser }
-    files,			  { total file nodes in file system }
-    ffree		: cuint64;  { free files nodes in fs }
-    favail		: cint64; { free file nodes avail to non-root }
-    fsyncwrites,		  { count of sync writes since mount }
-    fasyncwrites,		  { count of async writes since mount }
-    fsyncreads,			  { count of sync reads since mount }
-    fasyncreads		: cuint64;  { count of async reads since mount }
-    fsid		: fsid_t; { file system id }
-    namemax		: cint;   { maximum fileystem length }
-    fowner		: tuid;   { user that mounted the fileystem }
-    ctime		: cint;   { last mount [-u] time }
-    fspare3		: array[0..2] of cint; { spare for later }
-    fstypename		: array[0..MFSNamLen-1] of char; { fs type name }
-    mountpoint		: array[0..MNAMLEN-1] of char; { directory on which mounted}
-    mnfromname		: array[0..MNAMLEN-1] of char; { mounted file system }
-    mount_info		: mountinfo; { per-filesystem mount options }
+    flags,                        { copy of mount flags }
+    bsize,                        { filesystem block size }
+    iosize            : cuint32;  { optimal transfer block size }
+
+                                    { unit is f_bsize }
+    blocks,                       { total data block in file system }
+    bfree             : cuint64;  { free blocks in fs }
+    bavail            : cint64;   { free blocks avail to non-superuser }
+
+    files,                        { total file nodes in file system }
+    ffree             : cuint64;  { free files nodes in fs }
+    favail            : cint64;   { free file nodes avail to non-root }
+
+    fsyncwrites,                  { count of sync writes since mount }
+    fsyncreads,                   { count of sync reads since mount }
+    fasyncwrites,                 { count of async writes since mount }
+    fasyncreads       : cuint64;  { count of async reads since mount }
+
+    fsid              : fsid_t;   { file system id }
+    namemax           : cuint32;  { maximum filename length }
+    owner             : tuid;     { user that mounted the fileystem }
+    ctime             : cuint64;  { last mount [-u] time }
+
+    fstypename : array[0..MFSNAMELEN-1] of char;      { fs type name }
+    mntonname  : array[0..MNAMELEN-1] of char;        { directory on which mounted }
+    mntfromname: array[0..MNAMELEN-1] of char;        { mounted file system }
+    mntfromspec: array[0..MNAMELEN-1] of char;        { special for mount request }
+    mount_info: mountinfo;                            { per-filesystem mount options }
   end;
   PStatFS=^TStatFS;