core utils updates

kernel/bin/cp

@@ -60,16 +60,72 @@ function barePosixBlocks(size) {
   return Math.ceil(Number(size) / 512) || 0
 }
 
-async function copyPath(ctx, from, to, recursive) {
+/**
+ * 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 copyPath(ctx, from, to, recursive, followSymlink) {
   const st = await ctx.vfs.lstat(from)
   if (!st) {
     ctx.console.error('cp: ' + from + ': No such file')
     return false
   }
   if (st.type === 'symlink') {
-    const t = await ctx.vfs.readlink(from)
-    await ctx.vfs.symlink(t, to)
-    return true
+    if (!followSymlink) {
+      const t = await ctx.vfs.readlink(from)
+      await ctx.vfs.symlink(t, to)
+      return true
+    }
+    const fst = await ctx.vfs.stat(from)
+    if (fst.type === 'file') {
+      const buf = await ctx.vfs.readFile(from)
+      if (!buf) {
+        ctx.console.error('cp: cannot read ' + from)
+        return false
+      }
+      await ctx.vfs.writeFile(to, buf)
+      return true
+    }
+    if (fst.type === 'directory') {
+      if (!recursive) {
+        ctx.console.error('cp: ' + from + ': Is a directory')
+        return false
+      }
+      await ctx.vfs.mkdir(to, { recursive: true })
+      const names = await ctx.vfs.readdir(from)
+      for (const n of names) {
+        if (n === '.bareos_empty') continue
+        const f = from.replace(/\/+$/, '') + '/' + n
+        const t = to.replace(/\/+$/, '') + '/' + n
+        if (!(await copyPath(ctx, f, t, true, followSymlink))) return false
+      }
+      return true
+    }
+    ctx.console.error('cp: cannot copy special file ' + from)
+    return false
   }
   if (st.type === 'file') {
     const buf = await ctx.vfs.readFile(from)
@@ -91,7 +147,7 @@ async function copyPath(ctx, from, to, recursive) {
       if (n === '.bareos_empty') continue
       const f = from.replace(/\/+$/, '') + '/' + n
       const t = to.replace(/\/+$/, '') + '/' + n
-      if (!(await copyPath(ctx, f, t, true))) return false
+      if (!(await copyPath(ctx, f, t, true, followSymlink))) return false
     }
     return true
   }
@@ -100,6 +156,7 @@ async function copyPath(ctx, from, to, recursive) {
 
 async function run(ctx, argv) {
   let recursive = false
+  let followSymlink = false
   const paths = []
   for (let i = 1; i < argv.length; i++) {
     const a = argv[i]
@@ -107,6 +164,14 @@ async function run(ctx, argv) {
       recursive = true
       continue
     }
+    if (a === '-L' || a === '--dereference') {
+      followSymlink = true
+      continue
+    }
+    if (a === '-P' || a === '--no-dereference') {
+      followSymlink = false
+      continue
+    }
     if (a === '--') {
       paths.push(...argv.slice(i + 1))
       break
@@ -119,7 +184,7 @@ async function run(ctx, argv) {
     paths.push(a)
   }
   if (paths.length < 2) {
-    ctx.console.error('usage: cp [-R] SOURCE... DEST')
+    ctx.console.error('usage: cp [-R] [-L|-P] SOURCE... DEST')
     ctx.exitCode = 1
     return
   }
@@ -143,6 +208,7 @@ async function run(ctx, argv) {
       destIsDir || sources.length > 1
         ? dest.replace(/\/+$/, '') + '/' + base
         : dest
-    if (!(await copyPath(ctx, src, target, recursive))) ctx.exitCode = 1
+    if (!(await copyPath(ctx, src, target, recursive, followSymlink)))
+      ctx.exitCode = 1
   }
 }