commit 78cab7f39e3b5a0a8afd0a2f90564dfd049423a2
from: David Scott <dave.scott@docker.com>
date: Wed Nov 11 20:52:20 2015 UTC

Make p9p examples build again

s/p9pnew/p9p/g

Signed-off-by: David Scott <dave.scott@docker.com>

commit - ceb907e462028ec71f0eff0bc477c39be2c7f440
commit + 78cab7f39e3b5a0a8afd0a2f90564dfd049423a2
blob - 584f8bb69b37fa81a0428f2156f4d698a32e42f2
blob + 8f2e0deaed185907e1805c611aba9efe3c93f476
--- cmd/9pr/main.go
+++ cmd/9pr/main.go
@@ -47,7 +47,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	csession, err := p9pnew.NewSession(ctx, conn)
+	csession, err := p9p.NewSession(ctx, conn)
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -86,7 +86,7 @@ func main() {
 
 	// attach root
 	commander.nextfid = 1
-	if _, err := commander.session.Attach(commander.ctx, commander.nextfid, p9pnew.NOFID, "anyone", "/"); err != nil {
+	if _, err := commander.session.Attach(commander.ctx, commander.nextfid, p9p.NOFID, "anyone", "/"); err != nil {
 		log.Fatalln(err)
 	}
 	commander.rootfid = commander.nextfid
@@ -135,7 +135,7 @@ func main() {
 
 		ctx, _ = context.WithTimeout(commander.ctx, 5*time.Second)
 		if err := cmd(ctx, args[1:]...); err != nil {
-			if err == p9pnew.ErrClosed {
+			if err == p9p.ErrClosed {
 				log.Println("connection closed, shutting down")
 				return
 			}
@@ -147,12 +147,12 @@ func main() {
 
 type fsCommander struct {
 	ctx     context.Context
-	session p9pnew.Session
+	session p9p.Session
 	pwd     string
-	pwdfid  p9pnew.Fid
-	rootfid p9pnew.Fid
+	pwdfid  p9p.Fid
+	rootfid p9p.Fid
 
-	nextfid p9pnew.Fid
+	nextfid p9p.Fid
 
 	readline *readline.Instance
 	stdout   io.Writer
@@ -185,7 +185,7 @@ func (c *fsCommander) cmdls(ctx context.Context, args 
 		}
 		defer c.session.Clunk(ctx, targetfid)
 
-		_, iounit, err := c.session.Open(ctx, targetfid, p9pnew.OREAD)
+		_, iounit, err := c.session.Open(ctx, targetfid, p9p.OREAD)
 		if err != nil {
 			return err
 		}
@@ -203,10 +203,10 @@ func (c *fsCommander) cmdls(ctx context.Context, args 
 		}
 
 		rd := bytes.NewReader(p[:n])
-		codec := p9pnew.NewCodec() // TODO(stevvooe): Need way to resolve codec based on session.
+		codec := p9p.NewCodec() // TODO(stevvooe): Need way to resolve codec based on session.
 		for {
-			var d p9pnew.Dir
-			if err := p9pnew.DecodeDir(codec, rd, &d); err != nil {
+			var d p9p.Dir
+			if err := p9p.DecodeDir(codec, rd, &d); err != nil {
 				if err == io.EOF {
 					break
 				}
@@ -316,7 +316,7 @@ func (c *fsCommander) cmdcat(ctx context.Context, args
 	}
 	defer c.session.Clunk(ctx, c.pwdfid)
 
-	_, iounit, err := c.session.Open(ctx, targetfid, p9pnew.OREAD)
+	_, iounit, err := c.session.Open(ctx, targetfid, p9p.OREAD)
 	if err != nil {
 		return err
 	}
blob - bdba1522adb5247a7d23fb7651bce8770735f4c2
blob + 432b3265bbeade0eef0f877bda4e9ef8d03d30b0
--- cmd/9ps/main.go
+++ cmd/9ps/main.go
@@ -55,14 +55,14 @@ func main() {
 				return
 			}
 
-			p9pnew.Serve(ctx, conn, p9pnew.Dispatch(session))
+			p9p.Serve(ctx, conn, p9p.Dispatch(session))
 		}(c)
 	}
 }
 
 // newLocalSession returns a session to serve the local filesystem, restricted
 // to the provided root.
-func newLocalSession(ctx context.Context, root string) (p9pnew.Session, error) {
+func newLocalSession(ctx context.Context, root string) (p9p.Session, error) {
 	// silly, just connect to ufs for now! replace this with real code later!
 	log.Println("dialing", ":5640", "for", ctx.Value("conn"))
 	conn, err := net.Dial("tcp", ":5640")
@@ -70,7 +70,7 @@ func newLocalSession(ctx context.Context, root string)
 		return nil, err
 	}
 
-	session, err := p9pnew.NewSession(ctx, conn)
+	session, err := p9p.NewSession(ctx, conn)
 	if err != nil {
 		return nil, err
 	}