Merge pull request #7 from frobnitzem/develop

Develop

cfilesys.go

@@ -131,8 +131,6 @@ func (fs *fsState) newEnt() cEnt {
 	}
 }
 
-func (_ cEnt) SetInfo(_ *SFid) {}
-
 // Note: This always returns returns a file with a nonzero IOUnit.
 func (ent cEnt) Open(ctx context.Context, mode Flag) (File, error) {
 	_, iounit, err := ent.fs.session.Open(ctx, ent.fid, mode)
@@ -279,6 +277,7 @@ func (ent cEnt) Walk(ctx context.Context,
 	// drop part of ent.path
 	//steps = steps[:len(qids)]
 	//remain := len(ent.path) - bsp
+	// Note: potentially dangerous use of append [may modify ent.path]
 	//next.path = append(ent.path[:remain], steps[bsp:]...)
 	if len(qids) > 0 {
 		next.qid = qids[len(qids)-1]

cmd/9pr/main.go

@@ -84,9 +84,10 @@ func main() {
 	}
 
 	completer := readline.NewPrefixCompleter(
-		readline.PcItem("ls"),
 		readline.PcItem("cat"),
 		readline.PcItem("cd"),
+		readline.PcItem("exit"),
+		readline.PcItem("ls"),
 		readline.PcItem("mkdir"),
 		readline.PcItem("pwd"),
 		readline.PcItem("rm"),
@@ -122,6 +123,9 @@ func main() {
 		var cmd func(ctx context.Context, args ...string) error
 
 		switch name {
+		case "exit":
+			csession.Stop(nil)
+			return
 		case "ls":
 			cmd = commander.cmdls
 		case "cd":

filesys.go

@@ -76,12 +76,6 @@ type Dirent interface {
 
 	Stat(ctx context.Context) (Dir, error)
 	WStat(ctx context.Context, stat Dir) error
-
-	// This is automatically called by the server
-	// on new Dirent-s (i.e. returned from Attach/Walk/Create).
-	// It informs the server of the internal data structure
-	// used to track this file's interfaces, Path, and Open mode (if opened).
-	SetInfo(info *SFid)
 }
 
 // Helper function to check Dirent.Qid().Type for QTDIR bit.

ramfs/dirent.go

@@ -51,11 +51,9 @@ func (h FileHandle) OpenDir(ctx context.Context) (p9p.ReadNext, error) {
 	return h.ent.OpenDir(ctx)
 }
 
-func (_ FileHandle) SetInfo(sfid *p9p.SFid) { }
-
 func (h FileHandle) Clunk(ctx context.Context) error {
 	h.ent.decref()
-	for i := range(h.parents) {
+	for i := range h.parents {
 		h.parents[len(h.parents)-i-1].decref()
 	}
 	return nil
@@ -165,12 +163,25 @@ func (h FileHandle) Walk(ctx context.Context, names ...string) ([]p9p.Qid, p9p.D
 		// ref = /
 		// rh.ent = /
 		// rh.parents = []
-		rh.parents = append(append(
+		rh.parents = make([]*FileEnt, len(h.parents)-ndel + 1 + len(ans)-ndel)
+
+		// would use append, but append mutates its input
+		/*rh.parents = append(append(
 							h.parents[:len(h.parents)-ndel],
 							ref),
-							ans[ndel:]...)
-		for _, p := range(rh.parents) {
+							ans[ndel:]...)*/
+		i0 := len(h.parents)-ndel + 1
+		for i := range rh.parents {
+			var p *FileEnt
+			if i < len(h.parents)-ndel {
+				p = h.parents[i]
+			} else if i >= i0 {
+				p = ans[ndel+i-i0]
+			} else {
+				p = ref
+			}
 			p.incref()
+			rh.parents[i] = p
 		}
 		rh.ent = rh.parents[len(rh.parents)-1]
 		rh.parents = rh.parents[:len(rh.parents)-1]
@@ -179,7 +190,7 @@ func (h FileHandle) Walk(ctx context.Context, names ...string) ([]p9p.Qid, p9p.D
 	}
 
 	qids = make([]p9p.Qid, len(ans))
-	for i, a := range(ans) {
+	for i, a := range ans {
 		qids[i] = a.Info.Qid
 	}
 

sfilesys.go

@@ -114,10 +114,9 @@ func (sess *session) getRef(fid Fid) (*SFid, error) {
 	return ref, nil
 }
 
-// Sets ref.Ent and informs the ent of ref.
+// Sets ref.Ent (could also informs the ent of ref.)
 func (ref *SFid) link(ent Dirent) {
 	ref.Ent = ent
-	ent.SetInfo(ref)
 }
 
 // Add a new reference to the refs table.

sleepfs/dirent.go

@@ -33,8 +33,6 @@ func (s sleepTime) OpenDir(ctx context.Context) (p9p.ReadNext, error) {
 	return (&dirList{s, 0, 1000}).Next, nil
 }
 
-func (s sleepTime) SetInfo(_ *p9p.SFid) { }
-
 func (s sleepTime) Clunk(ctx context.Context) error {
 	return nil
 }

ufs/dirent.go

@@ -52,10 +52,6 @@ func (ref *FileRef) OpenDir(ctx context.Context) (p9p.ReadNext, error) {
 	return (&dirList{dirs, false}).Next, nil
 }
 
-func (ref *FileRef) SetInfo(sfid *p9p.SFid) {
-	ref.SFid = sfid
-}
-
 func (ref *FileRef) Clunk(ctx context.Context) error {
 	if ref.file != nil {
 		return ref.file.Close()

ufs/filesys.go

@@ -23,7 +23,6 @@ type fServer struct {
 type FileRef struct {
 	fs   *fServer
 	file *os.File
-	SFid *p9p.SFid
 	Path string
 	Info p9p.Dir
 }