diff --git a/session/manager.go b/session/manager.go index 5d35942..b0a4df4 100644 --- a/session/manager.go +++ b/session/manager.go @@ -16,7 +16,7 @@ import ( "sync/atomic" ) -var sessionStoreOrder = []string{"new", "idx", "ls", "kill", "sh", "b", "bfg", "bbg", "cleanup"} +var sessionFileOrder = []string{"new", "idx", "ls", "kill", "sh", "b", "bfg", "bbg", "cleanup"} // FileMode returns the mode for a fixed session file, // or 0 and false if the name is not a fixed file. @@ -119,8 +119,8 @@ func (s *Manager) List() ([]os.DirEntry, error) { } func (s *Manager) list() ([]os.DirEntry, error) { - entries := make([]os.DirEntry, 0, len(sessionStoreOrder)) - for _, name := range sessionStoreOrder { + entries := make([]os.DirEntry, 0, len(sessionFileOrder)) + for _, name := range sessionFileOrder { entries = append(entries, fs.FileEntry(name, fs.Perms[fs.PathSessions].Files[name])) } s.mu.RLock() @@ -161,7 +161,7 @@ func (s *Manager) Readdir(name string) ([]os.DirEntry, error) { } // {id}/agent/{aid} — list agent files + proc/ if len(parts) == 3 { - afs, err := s.openAgentStore(sess) + afs, err := s.openAgentTree(sess) if err != nil { return nil, err } @@ -319,7 +319,7 @@ func (s *Manager) stat(name string) (os.FileInfo, error) { if parts[3] == "proc" { return &fs.SyntheticFileInfo{Name_: "proc", Mode_: 0755, IsDir_: true}, nil } - afs, err := s.openAgentStore(sess) + afs, err := s.openAgentTree(sess) if err != nil { return nil, err } @@ -341,7 +341,7 @@ func (s *Manager) stat(name string) (os.FileInfo, error) { return &fs.SyntheticFileInfo{Name_: peerID, Mode_: 0666}, nil } // Session file: {id}/{file} (plan, env) - sfs, err := s.openStore(sess) + sfs, err := s.openSessionTree(sess) if err != nil { return nil, err } @@ -461,7 +461,7 @@ func (s *Manager) openEntry(name string) (fs.File, error) { return nil, fmt.Errorf("%s: is a directory", name) } // parts[2] = aid, parts[3] = file - afs, err := s.openAgentStore(sess) + afs, err := s.openAgentTree(sess) if err != nil { return nil, err } @@ -469,7 +469,7 @@ func (s *Manager) openEntry(name string) (fs.File, error) { } // Session file: {id}/{file} - sfs, err := s.openStore(sess) + sfs, err := s.openSessionTree(sess) if err != nil { return nil, err } @@ -541,15 +541,15 @@ func (s *Manager) SessionByUname(uname string) *Session { return nil } -// OpenStore returns a Tree for the given session ID. -func (s *Manager) OpenStore(id string) (*fs.Tree, error) { +// OpenSessionTree returns a Tree for the given session ID. +func (s *Manager) OpenSessionTree(id string) (*fs.Tree, error) { if sess := s.Session(id); sess != nil { - return s.openStore(sess) + return s.openSessionTree(sess) } return nil, fmt.Errorf("session not found: %s", id) } -func (s *Manager) openStore(sess *Session) (*fs.Tree, error) { +func (s *Manager) openSessionTree(sess *Session) (*fs.Tree, error) { var resetElev func() if s.cfg.ResetElevation != nil { id := sess.id @@ -567,7 +567,7 @@ func (s *Manager) openStore(sess *Session) (*fs.Tree, error) { ), nil } -func (s *Manager) openAgentStore(sess *Session) (*fs.Tree, error) { +func (s *Manager) openAgentTree(sess *Session) (*fs.Tree, error) { var resetElev func() if s.cfg.ResetElevation != nil { id := sess.id