From 0c2b46643d7baf2f546d3d81c8313861bd3f320f Mon Sep 17 00:00:00 2001
From: Leonard den Ottolander <leonard@den.ottolander.nl>
Date: Wed, 19 Oct 2005 11:34:56 +0000
Subject: [PATCH] * fish.c (fish_dir_load, fish_linear_start): Get numerical
 gid/uids from ls to avoid wrong parsing of user/group names containging white
 space.

---
 vfs/ChangeLog |  6 ++++++
 vfs/fish.c    | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 7c4cea45d..e00fdf3b8 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-19  Leonard den Ottolander  <leonard den ottolander nl>
+
+	* fish.c (fish_dir_load, fish_linear_start): Get numerical gid/uids
+	from ls to avoid wrong parsing of user/group names containing white
+	space.
+
 2005-10-09  Boris Belitsky <?>
 
 	* ftpfs.c (ftpfs_command): Fix "Nowhere to fallback to" warning
diff --git a/vfs/fish.c b/vfs/fish.c
index 7b933eaa0..62bd13114 100644
--- a/vfs/fish.c
+++ b/vfs/fish.c
@@ -387,13 +387,13 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
     quoted_path = name_quote (remote_path, 0);
     fish_command (me, super, NONE,
 	    "#LIST /%s\n"
-	    "ls -lLa /%s 2>/dev/null | grep '^[^cbt]' | (\n"
-	      "while read p x u g s m d y n; do\n"
+	    "ls -lLan /%s 2>/dev/null | grep '^[^cbt]' | (\n"
+	      "while read p l u g s m d y n; do\n"
 	        "echo \"P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\"\n"
 	      "done\n"
 	    ")\n"
-	    "ls -lLa /%s 2>/dev/null | grep '^[cb]' | (\n"
-	      "while read p x u g a i m d y n; do\n"
+	    "ls -lan /%s 2>/dev/null | grep '^[cb]' | (\n"
+	      "while read p l u g a i m d y n; do\n"
 	        "echo \"P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\"\n"
 	      "done\n"
 	    ")\n"
@@ -599,9 +599,9 @@ fish_linear_start (struct vfs_class *me, struct vfs_s_fh *fh, off_t offset)
     fh->u.fish.append = 0;
     offset = fish_command (me, FH_SUPER, WANT_STRING,
 		"#RETR /%s\n"
-		"ls -l /%s 2>/dev/null | (\n"
-		  "read var1 var2 var3 var4 var5 var6\n"
-		  "echo \"$var5\"\n"
+		"ls -ln /%s 2>/dev/null | (\n"
+		  "read p l u g s r\n"
+		  "echo \"$s\"\n"
 		")\n"
 		"echo '### 100'\n"
 		"cat /%s\n"