plan9port

commit c2ab969ecafadef496845a525c7f19fa0ce7f42f
parent 91fb6aaa3da7d010faf8f45efec0cef5c8779b54
Author: rsc <devnull@localhost>
Date:   Mon, 29 Jan 2007 15:12:42 +0000

Make ls -lF work.

Diffstat:
M
src/cmd/ls.C
 | 
11
+++++------

1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/cmd/ls.C b/src/cmd/ls.C
@@ -227,17 +227,16 @@ format(Dir *db, char *name)
 			db->qid.type);
 	if(lflag)
 		Bprint(&bin,
-			Qflag? "%M %C %*ud %*s %s %*llud %s %s\n" : "%M %C %*ud %*s %s %*llud %s %q\n",
+			"%M %C %*ud %*s %s %*llud %s ",
 			db->mode, db->type,
 			vwidth, db->dev,
 			-uwidth, db->uid,
 			db->gid,
 			(int)(glwidth-strlen(db->gid)), db->length,
-			asciitime(uflag? db->atime : db->mtime), name);
-	else
-		Bprint(&bin,
-			Qflag? "%s%s\n" : "%q%s\n",
-			name, fileflag(db));
+			asciitime(uflag? db->atime : db->mtime));
+	Bprint(&bin,
+		Qflag? "%s%s\n" : "%q%s\n",
+		name, fileflag(db));
 }
 
 void