core utils updates

kernel/bin/mv

@@ -60,12 +60,61 @@ function barePosixBlocks(size) {
   return Math.ceil(Number(size) / 512) || 0
 }
 
-async function mvCopyPath(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 mvCopyPath(ctx, from, to, recursive, followSymlink) {
   const st = await ctx.vfs.lstat(from)
   if (!st) return false
   if (st.type === 'symlink') {
-    await ctx.vfs.symlink(await ctx.vfs.readlink(from), to)
-    return true
+    if (!followSymlink) {
+      await ctx.vfs.symlink(await ctx.vfs.readlink(from), to)
+      return true
+    }
+    const fst = await ctx.vfs.stat(from)
+    if (fst.type === 'file') {
+      const buf = await ctx.vfs.readFile(from)
+      if (!buf) return false
+      await ctx.vfs.writeFile(to, buf)
+      return true
+    }
+    if (fst.type === 'directory') {
+      if (!recursive) 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 mvCopyPath(ctx, f, t, true, followSymlink))) return false
+      }
+      return true
+    }
+    return false
   }
   if (st.type === 'file') {
     const buf = await ctx.vfs.readFile(from)
@@ -81,7 +130,7 @@ async function mvCopyPath(ctx, from, to, recursive) {
       if (n === '.bareos_empty') continue
       const f = from.replace(/\/+$/, '') + '/' + n
       const t = to.replace(/\/+$/, '') + '/' + n
-      if (!(await mvCopyPath(ctx, f, t, true))) return false
+      if (!(await mvCopyPath(ctx, f, t, true, followSymlink))) return false
     }
     return true
   }
@@ -89,9 +138,31 @@ async function mvCopyPath(ctx, from, to, recursive) {
 }
 
 async function run(ctx, argv) {
-  const paths = argv.slice(1).filter((a) => a && a !== '--')
+  let followSymlink = false
+  const paths = []
+  for (let i = 1; i < argv.length; i++) {
+    const a = argv[i]
+    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
+    }
+    if (a.startsWith('-')) {
+      ctx.console.error('mv: unsupported option ' + a)
+      ctx.exitCode = 1
+      return
+    }
+    paths.push(a)
+  }
   if (paths.length < 2) {
-    ctx.console.error('usage: mv SOURCE... DEST')
+    ctx.console.error('usage: mv [-L|-P] SOURCE... DEST')
     ctx.exitCode = 1
     return
   }
@@ -117,8 +188,12 @@ async function run(ctx, argv) {
         : dest
     try {
       const st = await ctx.vfs.lstat(src)
-      const singleFileToFile =
-        sources.length === 1 && !destIsDir && st && st.type === 'file'
+      let followReg = st && st.type === 'file'
+      if (!followReg && followSymlink && st && st.type === 'symlink') {
+        const fs = await ctx.vfs.stat(src).catch(() => null)
+        followReg = !!(fs && fs.type === 'file')
+      }
+      const singleFileToFile = sources.length === 1 && !destIsDir && followReg
       if (singleFileToFile) {
         const buf = await ctx.vfs.readFile(src)
         if (!buf) throw new Error('cannot read source')
@@ -126,7 +201,7 @@ async function run(ctx, argv) {
         await ctx.vfs.unlink(src)
         continue
       }
-      if (!(await mvCopyPath(ctx, src, target, true))) {
+      if (!(await mvCopyPath(ctx, src, target, true, followSymlink))) {
         throw new Error('cannot copy')
       }
       await ctx.vfs.rm(src, { recursive: true, force: true })