core utils updates

kernel/bin/nl

@@ -60,9 +60,71 @@ function barePosixBlocks(size) {
   return Math.ceil(Number(size) / 512) || 0
 }
 
+/**
+ * Raw stdout for NUL/binary when **`process.stdout.write`** is missing.
+ * If **`ctx.bareOsBinWrite(Uint8Array|string)`** is set (tests / host), use it.
+ * @param {Record<string, unknown>} ctx
+ * @param {string | Uint8Array} chunk
+ * @returns {boolean}
+ */
+function bareOsEmitRaw(ctx, chunk) {
+  if (typeof ctx.bareOsBinWrite === 'function') {
+    const b4 = ctx.b4a
+    const u8 =
+      typeof chunk === 'string'
+        ? b4 && typeof b4.from === 'function'
+          ? b4.from(chunk)
+          : new TextEncoder().encode(chunk)
+        : chunk
+    ctx.bareOsBinWrite(u8 instanceof Uint8Array ? u8 : new Uint8Array(u8))
+    return true
+  }
+  const w = globalThis.process?.stdout?.write
+  if (typeof w === 'function') {
+    w.call(globalThis.process.stdout, chunk)
+    return true
+  }
+  return false
+}
+
 async function run(ctx, argv) {
   const vfs = ctx.vfs
-  const files = argv.slice(1).filter((a) => !a.startsWith('-'))
+  let bodyType = 'a'
+  let width = 6
+  let sep = '\t'
+  let start = 1
+  const files = []
+  for (let i = 1; i < argv.length; i++) {
+    const a = argv[i]
+    if (a === '-b' && argv[i + 1]) {
+      const b = argv[++i]
+      bodyType = b === 't' ? 't' : 'a'
+      continue
+    }
+    if (a === '-w' && argv[i + 1]) {
+      width = Number.parseInt(argv[++i], 10) || 6
+      continue
+    }
+    if (a === '-s' && argv[i + 1]) {
+      const s = argv[++i]
+      sep = s === '\\t' ? '\t' : s
+      continue
+    }
+    if (a === '-v' && argv[i + 1]) {
+      start = Number.parseInt(argv[++i], 10) || 1
+      continue
+    }
+    if (a === '--') {
+      files.push(...argv.slice(i + 1))
+      break
+    }
+    if (a.startsWith('-')) {
+      ctx.console.error('nl: unsupported option ' + a)
+      ctx.exitCode = 1
+      return
+    }
+    files.push(a)
+  }
   let body = ''
   if (!files.length) {
     body = bareStdin(ctx)
@@ -80,11 +142,16 @@ async function run(ctx, argv) {
   }
   const lines = body.split('\n')
   if (lines.length && lines[lines.length - 1] === '') lines.pop()
-  let n = 1
+  let n = start
   for (const line of lines) {
+    const blank = line.trim() === ''
+    if (bodyType === 't' && blank) {
+      ctx.console.log(line)
+      continue
+    }
     const num = String(n)
-    const pad = ' '.repeat(Math.max(0, 6 - num.length)) + num
-    ctx.console.log(pad + '\t' + line)
+    const pad = ' '.repeat(Math.max(0, width - num.length)) + num
+    ctx.console.log(pad + sep + line)
     n++
   }
 }