update df

kernel/bin/df

@@ -109,8 +109,69 @@ async function run(ctx, argv) {
     }
     paths.push(a)
   }
+  function fmtK(n) {
+    if (!human) return String(n)
+    if (n < 1024) return n + 'K'
+    if (n < 1024 * 1024) return (n / 1024).toFixed(1) + 'M'
+    return (n / 1024 / 1024).toFixed(1) + 'G'
+  }
+  function parseMounts(text) {
+    const out = []
+    const lines = String(text || '')
+      .split('\n')
+      .map((s) => s.trim())
+      .filter(Boolean)
+    for (const line of lines) {
+      const cols = line.split(/\s+/)
+      if (cols.length < 4) continue
+      out.push({
+        filesystem: cols[0],
+        mountpoint: cols[1],
+        fstype: cols[2],
+        options: cols[3]
+      })
+    }
+    return out
+  }
+  function normalizePath(p) {
+    const s = String(p || '').trim()
+    if (!s) return '/'
+    if (s === '/') return '/'
+    return s.replace(/\/+$/, '') || '/'
+  }
+  function mountForPath(p, mounts) {
+    const path = normalizePath(p)
+    let best = null
+    for (const m of mounts) {
+      const mp = normalizePath(m.mountpoint)
+      if (mp === '/') {
+        if (!best) best = m
+        continue
+      }
+      if (path === mp || path.startsWith(mp + '/')) {
+        if (!best || mp.length > normalizePath(best.mountpoint).length) best = m
+      }
+    }
+    return best
+  }
+  function statsFromSv(sv, fallbackTotalK, fallbackUsedK) {
+    if (sv && typeof sv.f_blocks === 'number' && typeof sv.f_bfree === 'number') {
+      const bsize = typeof sv.f_bsize === 'number' ? sv.f_bsize : 4096
+      const totalK = Math.max(1024, Math.ceil((sv.f_blocks * bsize) / 1024))
+      const freeB = sv.f_bavail ?? sv.f_bfree
+      const freeK = Math.max(0, Math.ceil((freeB * bsize) / 1024))
+      const usedK = Math.max(0, totalK - freeK)
+      return { totalK, usedK, freeK }
+    }
+    const totalK = Math.max(1024, Number(fallbackTotalK) || 1024)
+    const usedK = Math.max(0, Number(fallbackUsedK) || 0)
+    return { totalK, usedK, freeK: Math.max(0, totalK - usedK) }
+  }
+
   let totalK = 1024 * 1024
   let usedK = 4096
+  /** @type {Record<string, unknown> | null} */
+  let resources = null
   try {
     const buf = await ctx.vfs.readFile('/proc/bare_os_quotas')
     if (buf) {
@@ -125,41 +186,72 @@ async function run(ctx, argv) {
     const rbuf = await ctx.vfs.readFile('/proc/bare_os_resources')
     if (rbuf) {
       const j = JSON.parse(ctx.b4a.toString(rbuf))
+      resources = j && typeof j === 'object' ? j : null
       const sv = j && j.statvfs
-      if (sv && typeof sv.f_blocks === 'number' && typeof sv.f_bfree === 'number') {
-        const bsize = typeof sv.f_bsize === 'number' ? sv.f_bsize : 4096
-        totalK = Math.max(1024, Math.ceil((sv.f_blocks * bsize) / 1024))
-        const freeB = sv.f_bavail ?? sv.f_bfree
-        const freeKFromStat = Math.max(0, Math.ceil((freeB * bsize) / 1024))
-        usedK = Math.max(0, totalK - freeKFromStat)
-      }
+      const st = statsFromSv(sv, totalK, usedK)
+      totalK = st.totalK
+      usedK = st.usedK
     }
   } catch {
     /* ignore */
   }
-  const freeK = Math.max(0, totalK - usedK)
-  const pct =
-    totalK > 0 ? Math.min(100, Math.round((usedK / totalK) * 100)) : 0
-  function fmt(n) {
-    if (!human) return String(n)
-    if (n < 1024) return n + 'K'
-    if (n < 1024 * 1024) return (n / 1024).toFixed(1) + 'M'
-    return (n / 1024 / 1024).toFixed(1) + 'G'
+  /** @type {{ filesystem: string, mountpoint: string, fstype: string, options: string }[]} */
+  let mounts = []
+  try {
+    const mbuf = await ctx.vfs.readFile('/proc/mounts')
+    if (mbuf) mounts = parseMounts(ctx.b4a.toString(mbuf))
+  } catch {
+    /* ignore */
+  }
+  if (!mounts.length) {
+    mounts = [
+      { filesystem: 'bare-hyperdrive', mountpoint: '/', fstype: 'hyperdrive', options: 'ro' }
+    ]
+  }
+  /** @type {typeof mounts} */
+  let selected = mounts
+  if (paths.length) {
+    const byMount = new Map()
+    for (const p of paths) {
+      const m = mountForPath(p, mounts)
+      if (m) byMount.set(normalizePath(m.mountpoint), m)
+    }
+    selected = [...byMount.values()]
+  }
+  if (!selected.length) {
+    ctx.console.error('df: no matching filesystems')
+    ctx.exitCode = 1
+    return
+  }
+  const sv =
+    resources &&
+    typeof resources === 'object' &&
+    resources.statvfs &&
+    typeof resources.statvfs === 'object'
+      ? resources.statvfs
+      : null
+  const sysSv =
+    sv && typeof sv.systemDrive === 'object' && sv.systemDrive
+      ? sv.systemDrive
+      : sv
+  const base = statsFromSv(sysSv, totalK, usedK)
+
+  ctx.console.log('Filesystem      1K-blocks     Used Available Use% Mounted on')
+  for (const m of selected) {
+    const st = base
+    const pct = st.totalK > 0 ? Math.min(100, Math.round((st.usedK / st.totalK) * 100)) : 0
+    ctx.console.log(
+      String(m.filesystem || 'bare-hyperdrive').padEnd(15) +
+        ' ' +
+        fmtK(st.totalK).padStart(12) +
+        ' ' +
+        fmtK(st.usedK).padStart(8) +
+        ' ' +
+        fmtK(st.freeK).padStart(10) +
+        ' ' +
+        String(pct).padStart(3) +
+        '% ' +
+        String(m.mountpoint || '/')
+    )
   }
-  const mount = paths.length ? paths[0] : '/'
-  ctx.console.log(
-    'Filesystem      1K-blocks     Used Available Use% Mounted on'
-  )
-  ctx.console.log(
-    'bare-hyperdrive ' +
-      String(totalK).padStart(12) +
-      ' ' +
-      String(usedK).padStart(8) +
-      ' ' +
-      String(freeK).padStart(10) +
-      ' ' +
-      String(pct).padStart(3) +
-      '% ' +
-      mount
-  )
 }