github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 21:13:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2018-08-25 11:37:20 +02:00
commit 6eb3352f8b
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
session/session.go
View file

@ -28,9 +28,9 @@ const (
var ( var (
I = (*Session)(nil) I = (*Session)(nil)
ErrAlreadyStarted = errors.New("Module is already running.") ErrAlreadyStarted = errors.New("module is already running")
ErrAlreadyStopped = errors.New("Module is not running.") ErrAlreadyStopped = errors.New("module is not running")
ErrNotSupported = errors.New("This component is not supported on this OS.") ErrNotSupported = errors.New("this component is not supported on this OS")
reCmdSpaceCleaner = regexp.MustCompile(`^([^\s]+)\s+(.+)$`) reCmdSpaceCleaner = regexp.MustCompile(`^([^\s]+)\s+(.+)$`)
reEnvVarCapture = regexp.MustCompile(`{env\.([^}]+)}`) reEnvVarCapture = regexp.MustCompile(`{env\.([^}]+)}`)
@ -112,7 +112,7 @@ func (s *Session) Module(name string) (err error, mod Module) {
return nil, m return nil, m
} }
} }
return fmt.Errorf("Module %s not found", name), mod return fmt.Errorf("module %s not found", name), mod
} }
func (s *Session) Close() { func (s *Session) Close() {
@ -132,7 +132,7 @@ func (s *Session) Close() {
if *s.Options.EnvFile != "" { if *s.Options.EnvFile != "" {
envFile, _ := core.ExpandPath(*s.Options.EnvFile) envFile, _ := core.ExpandPath(*s.Options.EnvFile)
if err := s.Env.Save(envFile); err != nil { if err := s.Env.Save(envFile); err != nil {
fmt.Printf("Error while storing the environment to %s: %s", envFile, err) fmt.Printf("error while storing the environment to %s: %s", envFile, err)
} }
} }
@ -143,13 +143,13 @@ func (s *Session) Close() {
if *s.Options.MemProfile != "" { if *s.Options.MemProfile != "" {
f, err := os.Create(*s.Options.MemProfile) f, err := os.Create(*s.Options.MemProfile)
if err != nil { if err != nil {
fmt.Printf("Could not create memory profile: %s\n", err) fmt.Printf("could not create memory profile: %s\n", err)
return return
} }
defer f.Close() defer f.Close()
runtime.GC() // get up-to-date statistics runtime.GC() // get up-to-date statistics
if err := pprof.WriteHeapProfile(f); err != nil { if err := pprof.WriteHeapProfile(f); err != nil {
fmt.Printf("Could not write memory profile: %s\n", err) fmt.Printf("could not write memory profile: %s\n", err)
} }
} }
} }

12
session/session_setup.go
View file

@ -22,15 +22,13 @@ func containsCapitals(s string) bool {
return true return true
} }
func (s *Session) setupReadline() error { func (s *Session) setupReadline() (err error) {
var err error prefixCompleters := make([]readline.PrefixCompleterInterface, 0)
pcompleters := make([]readline.PrefixCompleterInterface, 0)
for _, h := range s.CoreHandlers { for _, h := range s.CoreHandlers {
if h.Completer == nil { if h.Completer == nil {
pcompleters = append(pcompleters, readline.PcItem(h.Name)) prefixCompleters = append(prefixCompleters, readline.PcItem(h.Name))
} else { } else {
pcompleters = append(pcompleters, h.Completer) prefixCompleters = append(prefixCompleters, h.Completer)
} }
} }
@ -61,7 +59,7 @@ func (s *Session) setupReadline() error {
HistoryFile: history, HistoryFile: history,
InterruptPrompt: "^C", InterruptPrompt: "^C",
EOFPrompt: "exit", EOFPrompt: "exit",
AutoComplete: readline.NewPrefixCompleter(pcompleters...), AutoComplete: readline.NewPrefixCompleter(prefixCompleters...),
} }
s.Input, err = readline.NewEx(&cfg) s.Input, err = readline.NewEx(&cfg)