Path translation and normalisation fixes.

brett-smith · brett-smith · commit 365cc659ea39 · 2025-11-03T13:40:00.000Z
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/InteractiveConsole.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/InteractiveConsole.java
@@ -132,12 +132,12 @@ public void startIfNotStarted() throws Exception {
 	}
 
 	@Override
-	public String translatePath(String path) {
-		return cntr.translatePath(path);
+	public String nativeToLocalPath(String path) {
+		return cntr.nativeToLocalPath(path);
 	}
 
 	@Override
-	public String untranslatePath(String path) {
-		return cntr.untranslatePath(path);
+	public String localToNativePath(String path) {
+		return cntr.localToNativePath(path);
 	}
 }
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/TNFSContainer.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/TNFSContainer.java
@@ -125,20 +125,20 @@ public interface TNFSContainer {
 	void startIfNotStarted() throws  Exception;
 
 	/**
-	 * Translate the path separators from the native forward slashes to whatever
+	 * Translate the path separators from the TNFS forward slashes to whatever
 	 * is automatically detected for the platform (or chosen through configuration).
 	 * 
 	 * @param path
 	 * @return translated path
 	 */
-	String translatePath(String path);
+	String nativeToLocalPath(String path);
 
 	/**
-	 * Translate the path separators from the native forward slashes to whatever
-	 * is automatically detected for the platform (or chosen through configuration).
+	 * Translate the path separators from those automatically detected for the platform 
+	 * (or chosen through configuration) to TNFS forward slashes.
 	 * 
 	 * @param path
 	 * @return translated path
 	 */
-	String untranslatePath(String path);
+	String localToNativePath(String path);
 }
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/TNFSFUSE.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/TNFSFUSE.java
@@ -22,6 +22,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeoutException;
 
@@ -31,8 +32,8 @@
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
 import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 import picocli.CommandLine.Spec;
 import uk.co.bithatch.tnfs.fuse.TNFSFUSEFileSystem;
@@ -59,6 +60,9 @@ public static void main(String[] args) throws Exception {
 	@Option(names = { "-c", "--create" }, description = "Create the mount point folder if it does not exist.")
 	private boolean create;
 
+	@Option(names = {"--libpath" }, description = "The location of the libfuse library.", hidden = true)
+	protected Optional<Path> libpath;
+
 	@Parameters(arity = "1", index = "0", description = "URI of TNFS resource to mount.")
 	protected String remotePath;
 
@@ -84,6 +88,7 @@ protected void onStart() throws Exception {
 		var uri = TNFSURI.parse(remotePath);
 		var mount = doMount(uri, doConnect(uri));
 		var builder = Fuse.builder();
+		libpath.ifPresent(p -> builder.setLibraryPath(p.toString()));
 		var fuseOps = new TNFSFUSEFileSystem(mount, builder.errno());
 		try (var fuse = builder.build(fuseOps)) {
 			Runtime.getRuntime().addShutdownHook(new Thread(() -> {
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/TNFSTP.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/TNFSTP.java
@@ -269,7 +269,7 @@ public void startIfNotStarted() throws Exception {
 	}
 
 	@Override
-	public String translatePath(String cwd) {
+	public String nativeToLocalPath(String cwd) {
 		/* TODO what if path has escaped forward slash? */
 		var sep = getSeparator();
 		if(!sep.equals("/"))
@@ -278,7 +278,7 @@ public String translatePath(String cwd) {
 			return cwd.replace("\\", sep);
 	}
 	@Override
-	public String untranslatePath(String cwd) {
+	public String localToNativePath(String cwd) {
 		/* TODO what if path has escaped forward slash? */
 		var sep = getSeparator();
 		if(sep.equals("/"))
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Cd.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Cd.java
@@ -48,7 +48,7 @@ protected Integer onCall() throws Exception {
 
 		if (directory != null && directory.length() > 0) {
 			directory = Util.relativizePath(container.getCwd(), directory, container.getSeparator());
-			var file = mount.stat(directory);
+			var file = mount.stat(container.localToNativePath(directory));
 			if (file.isDirectory()) {
 				container.setCwd(directory);
 			} else {
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Lcd.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Lcd.java
@@ -47,13 +47,26 @@ public Lcd() {
 	@Override
 	protected Integer onCall() throws Exception {
 		var container = getContainer();
-		var resolved = directory.orElseGet(() -> Paths.get(System.getProperty("user.home")));
+		var userhome = Paths.get(System.getProperty("user.home"));
+		var resolved = directory.map(d -> {
+			if(d.getName(0).getFileName().toString().equals("~")) {
+				if(d.getNameCount() == 1) {
+					return userhome;
+				}
+				else {
+					return userhome.resolve(d.subpath(1, d.getNameCount()));	
+				}
+			}
+			else {
+				return d;
+			}
+		}).orElse(userhome);
 		
 		if (!resolved.isAbsolute())	
 			resolved = container.getLcwd().resolve(resolved);
 		
 		if (Files.isDirectory(resolved))
-			container.setLcwd(resolved);
+			container.setLcwd(resolved.normalize());
 		else
 			throw new NotDirectoryException(resolved.toString());
 		return 0;
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Ls.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Ls.java
@@ -91,7 +91,7 @@ protected Integer onCall() throws Exception {
 
 		var dirOptions = new ArrayList<DirOptionFlag>();
 		var dirSort = new ArrayList<DirSortFlag>();
-		var apath = container.untranslatePath(path.orElseGet(container::getCwd));
+		var apath = container.localToNativePath(path.orElseGet(container::getCwd));
 		var base = Util.basename(apath);
 		var wildcard = "";
         var resolver = Styles.lsStyle();
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Put.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Put.java
@@ -39,6 +39,8 @@
 @Command(name = "put", aliases = { "upload"}, mixinStandardHelpOptions = true, description = "Upload local file.")
 public class Put extends TNFSTPCommand implements Callable<Integer> {
 
+	private static final int LOCAL_READ_BUFFER_SIZE = 65536;
+
 	@Parameters(index = "0", arity = "1", description = "File to store.")
 	private String file;
 
@@ -65,14 +67,14 @@ protected Integer onCall() throws Exception {
 //			transfers.startedTransfer(path.toString(), target, Files.size(path));
     		
 				try(var o = mnt.open(target, OpenFlag.WRITE, OpenFlag.TRUNCATE, OpenFlag.CREATE)) {
-					var buf = ByteBuffer.allocate(mnt.client().messageSize());
-					var rd = 0;
-					while( ( rd = f.read(buf) ) != -1) {
+					var buf = ByteBuffer.allocate(LOCAL_READ_BUFFER_SIZE);
+					while( ( f.read(buf) ) != -1) {
 						buf.flip();
-						o.write(buf);
+						while(buf.hasRemaining()) {
+							var wrt = o.write(buf);
+							pb.stepBy(wrt);
+						}
 						buf.clear();
-						
-						pb.stepBy(rd);
 	
 //						transfers.transferProgress(path.toString(), target, rd);
 					}
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Pwd.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Pwd.java
@@ -37,7 +37,7 @@ public Pwd() {
 
 	@Override
 	protected Integer onCall() throws Exception {
-		getContainer().getTerminal().writer().println(getContainer().translatePath(getContainer().getCwd()));
+		getContainer().getTerminal().writer().println(getContainer().nativeToLocalPath(getContainer().getCwd()));
 		return 0;
 	}
 }
diff --git a/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Stat.java b/cli/src/main/java/uk/co/bithatch/tnfs/cli/commands/Stat.java
@@ -26,6 +26,7 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Parameters;
 import uk.co.bithatch.tnfs.cli.TNFSTP.FilenameCompletionMode;
+import uk.co.bithatch.tnfs.lib.Util;
 
 /**
  * Stat file.
@@ -44,6 +45,7 @@ public Stat() {
 	protected Integer onCall() throws Exception {
 		var container = getContainer();
 		var mount = container.getMount();
+		file = Util.relativizePath(container.getCwd(), file, container.getSeparator());
 		var stat = mount.stat(file);
 		var wtr = getContainer().getTerminal().writer();
 		wtr.println(String.format("%s %7d %7d %10d %10d %10d \"%s\" \"%s\"", stat.isDirectory() ? "d" : "-", stat.uid(), stat.gid(), stat.atime().to(TimeUnit.SECONDS), stat.ctime().to(TimeUnit.SECONDS), stat.mtime().to(TimeUnit.SECONDS), stat.uidString(), stat.gidString()));
diff --git a/client/src/main/java/uk/co/bithatch/tnfs/client/AbstractTNFSMount.java b/client/src/main/java/uk/co/bithatch/tnfs/client/AbstractTNFSMount.java
@@ -410,27 +410,21 @@ public void close() throws IOException {
 			@Override
 			public int write(ByteBuffer src) throws IOException {
 				var max = client.payloadSize - 3;
-				var wrtn = 0;
+				var waslimit = -1;
+				if(src.remaining() > max) {
+					waslimit = src.limit();
+					src.limit(src.position() + max);
+				}
 				
-				while(src.hasRemaining()) {
-					var waslimit = -1;
-					if(src.remaining() > max) {
-						waslimit = src.limit();
-						src.limit(src.position() + max);
-	//					throw new IllegalArgumentException("Source buffer must provider fewer than " + max + " bytes");
-					}
-					
-					
-					var w = client.sendMessage(Command.WRITE,
-							Message.of(sessionId(), Command.WRITE, 
-									new Command.Write(fh.handle(), src)), path).written();
-					wrtn += w;
-					if(waslimit > -1) {
-						src.limit(waslimit);
-					}
+				
+				var w = client.sendMessage(Command.WRITE,
+						Message.of(sessionId(), Command.WRITE, 
+								new Command.Write(fh.handle(), src)), path).written();
+				position += w;
+				if(waslimit > -1) {
+					src.limit(waslimit);
 				}
-				position += wrtn;
-				return wrtn;
+				return w;
 			}
 
 			@Override
diff --git a/daemon/README.md b/daemon/README.md
@@ -46,7 +46,12 @@ mvn exec:run -P tnfsjd -Dargs="--help"
 
 #### From Hub
 
-**TODO**
+```
+docker pull bithatch/tnfsjd:latest
+```
+
+The image exposes the single port `16384` on both `TCP` and `UDP`.  It contains two volumes,
+`/public-files` and `/configuration`.  The former is the default writable file system that is shared over TNFS, the latter is where you can place configuration files that override  the defaults.
 
 #### From Source
 
diff --git a/lib/src/main/java/uk/co/bithatch/tnfs/lib/Util.java b/lib/src/main/java/uk/co/bithatch/tnfs/lib/Util.java

Original file line number	Diff line number	Diff line change
`@@ -132,12 +132,12 @@ public void startIfNotStarted() throws Exception {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`@Override`
`135`		`- public String translatePath(String path) {`
`136`		`- return cntr.translatePath(path);`
	`135`	`+ public String nativeToLocalPath(String path) {`
	`136`	`+ return cntr.nativeToLocalPath(path);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`@Override`
`140`		`- public String untranslatePath(String path) {`
`141`		`- return cntr.untranslatePath(path);`
	`140`	`+ public String localToNativePath(String path) {`
	`141`	`+ return cntr.localToNativePath(path);`
`142`	`142`	`}`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public Pwd() {`
`37`	`37`
`38`	`38`	`@Override`
`39`	`39`	`protected Integer onCall() throws Exception {`
`40`		`- getContainer().getTerminal().writer().println(getContainer().translatePath(getContainer().getCwd()));`
	`40`	`+ getContainer().getTerminal().writer().println(getContainer().nativeToLocalPath(getContainer().getCwd()));`
`41`	`41`	`return 0;`
`42`	`42`	`}`
`43`	`43`	`}`