From 7ccb871a4594432f04a5adf6c1fc15c258ab7786 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 6 Aug 2023 12:01:08 +0200 Subject: [PATCH] Bump gocui ... and import stefanhaller's tcell fork for real rather than just replacing it This solves the problem that people trying to "go install github.com/jesseduffield/lazygit@latest" would get the error go: github.com/jesseduffield/lazygit@latest (in github.com/jesseduffield/lazygit@v0.40.0): The go.mod file for the module providing named packages contains one or more replace directives. It must not contain directives that would cause it to be interpreted differently than if it were the main module. --- go.mod | 12 ++- go.sum | 20 ++--- pkg/gui/gui_driver.go | 2 +- .../tcell/v2/terminfo/extended/extended.go | 58 ------------ .../jesseduffield/gocui/attribute.go | 2 +- vendor/github.com/jesseduffield/gocui/gui.go | 2 +- .../jesseduffield/gocui/keybinding.go | 2 +- .../jesseduffield/gocui/tcell_driver.go | 2 +- vendor/github.com/jesseduffield/gocui/view.go | 2 +- .../tcell/v2/.gitignore | 0 .../tcell/v2/AUTHORS | 0 .../tcell/v2/CHANGESv2.md | 0 .../tcell/v2/LICENSE | 0 .../tcell/v2/README-wasm.md | 0 .../tcell/v2/README.md | 0 .../tcell/v2/TUTORIAL.md | 2 +- .../tcell/v2/UKRAINE.md | 0 .../tcell/v2/attr.go | 0 .../tcell/v2/cell.go | 0 .../tcell/v2/charset_stub.go | 0 .../tcell/v2/charset_unix.go | 0 .../tcell/v2/charset_windows.go | 0 .../tcell/v2/color.go | 0 .../tcell/v2/colorfit.go | 0 .../tcell/v2/console_stub.go | 0 .../tcell/v2/console_win.go | 0 .../{gdamore => stefanhaller}/tcell/v2/doc.go | 0 .../tcell/v2/encoding.go | 0 .../tcell/v2/errors.go | 2 +- .../tcell/v2/event.go | 0 .../tcell/v2/focus.go | 0 .../tcell/v2/interrupt.go | 0 .../{gdamore => stefanhaller}/tcell/v2/key.go | 0 .../tcell/v2/mouse.go | 0 .../tcell/v2/nonblock_bsd.go | 0 .../tcell/v2/nonblock_unix.go | 0 .../tcell/v2/paste.go | 0 .../tcell/v2/resize.go | 0 .../tcell/v2/runes.go | 0 .../tcell/v2/screen.go | 0 .../tcell/v2/simulation.go | 0 .../tcell/v2/stdin_unix.go | 0 .../tcell/v2/style.go | 0 .../tcell/v2/terminfo/.gitignore | 0 .../tcell/v2/terminfo/README.md | 0 .../tcell/v2/terminfo/TERMINALS.md | 0 .../tcell/v2/terminfo/a/aixterm/term.go | 2 +- .../tcell/v2/terminfo/a/alacritty/direct.go | 2 +- .../tcell/v2/terminfo/a/alacritty/term.go | 2 +- .../tcell/v2/terminfo/a/ansi/term.go | 2 +- .../tcell/v2/terminfo/b/beterm/term.go | 2 +- .../tcell/v2/terminfo/base/base.go | 10 +-- .../tcell/v2/terminfo/c/cygwin/term.go | 2 +- .../tcell/v2/terminfo/d/dtterm/term.go | 2 +- .../tcell/v2/terminfo/dynamic/dynamic.go | 2 +- .../tcell/v2/terminfo/e/emacs/term.go | 2 +- .../tcell/v2/terminfo/extended/extended.go | 58 ++++++++++++ .../tcell/v2/terminfo/f/foot/foot.go | 2 +- .../tcell/v2/terminfo/g/gnome/term.go | 2 +- .../tcell/v2/terminfo/gen.sh | 0 .../tcell/v2/terminfo/h/hpterm/term.go | 2 +- .../tcell/v2/terminfo/k/konsole/term.go | 2 +- .../tcell/v2/terminfo/k/kterm/term.go | 2 +- .../tcell/v2/terminfo/l/linux/term.go | 2 +- .../tcell/v2/terminfo/models.txt | 0 .../tcell/v2/terminfo/p/pcansi/term.go | 2 +- .../tcell/v2/terminfo/r/rxvt/term.go | 2 +- .../tcell/v2/terminfo/s/screen/term.go | 2 +- .../tcell/v2/terminfo/s/simpleterm/term.go | 2 +- .../tcell/v2/terminfo/s/sun/term.go | 2 +- .../tcell/v2/terminfo/t/termite/term.go | 2 +- .../tcell/v2/terminfo/t/tmux/term.go | 2 +- .../tcell/v2/terminfo/terminfo.go | 0 .../tcell/v2/terminfo/v/vt100/term.go | 2 +- .../tcell/v2/terminfo/v/vt102/term.go | 2 +- .../tcell/v2/terminfo/v/vt220/term.go | 2 +- .../tcell/v2/terminfo/v/vt320/term.go | 2 +- .../tcell/v2/terminfo/v/vt400/term.go | 2 +- .../tcell/v2/terminfo/v/vt420/term.go | 2 +- .../tcell/v2/terminfo/v/vt52/term.go | 2 +- .../tcell/v2/terminfo/w/wy50/term.go | 2 +- .../tcell/v2/terminfo/w/wy60/term.go | 2 +- .../tcell/v2/terminfo/w/wy99_ansi/term.go | 2 +- .../tcell/v2/terminfo/x/xfce/term.go | 2 +- .../tcell/v2/terminfo/x/xterm/direct.go | 2 +- .../tcell/v2/terminfo/x/xterm/term.go | 2 +- .../tcell/v2/terminfo/x/xterm_kitty/term.go | 2 +- .../tcell/v2/terminfo/x/xterm_termite/term.go | 2 +- .../tcell/v2/terms_default.go | 2 +- .../tcell/v2/terms_dynamic.go | 4 +- .../tcell/v2/terms_static.go | 2 +- .../tcell/v2/tscreen.go | 4 +- .../tcell/v2/tscreen_stub.go | 0 .../tcell/v2/tscreen_unix.go | 0 .../{gdamore => stefanhaller}/tcell/v2/tty.go | 0 .../tcell/v2/tty_unix.go | 0 .../tcell/v2/wscreen.go | 0 vendor/golang.org/x/sys/unix/mkerrors.sh | 2 +- vendor/golang.org/x/sys/unix/mmap_nomremap.go | 14 +++ vendor/golang.org/x/sys/unix/mremap.go | 21 ++++- vendor/golang.org/x/sys/unix/syscall_aix.go | 15 ---- vendor/golang.org/x/sys/unix/syscall_bsd.go | 14 --- .../golang.org/x/sys/unix/syscall_darwin.go | 50 ++++++----- vendor/golang.org/x/sys/unix/syscall_linux.go | 63 ++++++++----- .../x/sys/unix/syscall_linux_amd64.go | 2 +- .../x/sys/unix/syscall_linux_arm64.go | 2 +- .../x/sys/unix/syscall_linux_loong64.go | 2 +- .../x/sys/unix/syscall_linux_mips64x.go | 2 +- .../x/sys/unix/syscall_linux_riscv64.go | 13 ++- .../golang.org/x/sys/unix/syscall_netbsd.go | 13 ++- .../golang.org/x/sys/unix/syscall_solaris.go | 14 --- vendor/golang.org/x/sys/unix/syscall_unix.go | 8 ++ .../x/sys/unix/syscall_zos_s390x.go | 14 --- .../x/sys/unix/zerrors_linux_386.go | 9 ++ .../x/sys/unix/zerrors_linux_amd64.go | 9 ++ .../x/sys/unix/zerrors_linux_arm.go | 9 ++ .../x/sys/unix/zerrors_linux_arm64.go | 9 ++ .../x/sys/unix/zerrors_linux_loong64.go | 9 ++ .../x/sys/unix/zerrors_linux_mips.go | 9 ++ .../x/sys/unix/zerrors_linux_mips64.go | 9 ++ .../x/sys/unix/zerrors_linux_mips64le.go | 9 ++ .../x/sys/unix/zerrors_linux_mipsle.go | 9 ++ .../x/sys/unix/zerrors_linux_ppc.go | 9 ++ .../x/sys/unix/zerrors_linux_ppc64.go | 9 ++ .../x/sys/unix/zerrors_linux_ppc64le.go | 9 ++ .../x/sys/unix/zerrors_linux_riscv64.go | 9 ++ .../x/sys/unix/zerrors_linux_s390x.go | 9 ++ .../x/sys/unix/zerrors_linux_sparc64.go | 9 ++ .../golang.org/x/sys/unix/zsyscall_linux.go | 2 +- .../x/sys/unix/zsyscall_linux_riscv64.go | 16 ++++ .../x/sys/unix/zsyscall_netbsd_386.go | 11 +++ .../x/sys/unix/zsyscall_netbsd_amd64.go | 11 +++ .../x/sys/unix/zsyscall_netbsd_arm.go | 11 +++ .../x/sys/unix/zsyscall_netbsd_arm64.go | 11 +++ .../x/sys/unix/zsysnum_linux_riscv64.go | 2 + vendor/golang.org/x/sys/unix/ztypes_linux.go | 5 ++ .../x/sys/unix/ztypes_linux_riscv64.go | 23 +++++ .../x/sys/windows/syscall_windows.go | 4 +- vendor/modules.txt | 90 +++++++++---------- 139 files changed, 538 insertions(+), 292 deletions(-) delete mode 100644 vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/.gitignore (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/AUTHORS (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/CHANGESv2.md (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/LICENSE (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/README-wasm.md (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/README.md (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/TUTORIAL.md (99%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/UKRAINE.md (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/attr.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/cell.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/charset_stub.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/charset_unix.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/charset_windows.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/color.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/colorfit.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/console_stub.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/console_win.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/doc.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/encoding.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/errors.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/event.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/focus.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/interrupt.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/key.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/mouse.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/nonblock_bsd.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/nonblock_unix.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/paste.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/resize.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/runes.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/screen.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/simulation.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/stdin_unix.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/style.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/.gitignore (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/README.md (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/TERMINALS.md (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/a/aixterm/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/a/alacritty/direct.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/a/alacritty/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/a/ansi/term.go (95%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/b/beterm/term.go (96%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/base/base.go (80%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/c/cygwin/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/d/dtterm/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/dynamic/dynamic.go (99%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/e/emacs/term.go (96%) create mode 100644 vendor/github.com/stefanhaller/tcell/v2/terminfo/extended/extended.go rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/f/foot/foot.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/g/gnome/term.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/gen.sh (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/h/hpterm/term.go (95%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/k/konsole/term.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/k/kterm/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/l/linux/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/models.txt (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/p/pcansi/term.go (95%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/r/rxvt/term.go (99%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/s/screen/term.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/s/simpleterm/term.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/s/sun/term.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/t/termite/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/t/tmux/term.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/terminfo.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/v/vt100/term.go (95%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/v/vt102/term.go (95%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/v/vt220/term.go (96%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/v/vt320/term.go (96%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/v/vt400/term.go (95%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/v/vt420/term.go (96%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/v/vt52/term.go (92%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/w/wy50/term.go (96%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/w/wy60/term.go (96%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/w/wy99_ansi/term.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/x/xfce/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/x/xterm/direct.go (98%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/x/xterm/term.go (99%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/x/xterm_kitty/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terminfo/x/xterm_termite/term.go (97%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terms_default.go (93%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terms_dynamic.go (93%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/terms_static.go (95%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/tscreen.go (99%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/tscreen_stub.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/tscreen_unix.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/tty.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/tty_unix.go (100%) rename vendor/github.com/{gdamore => stefanhaller}/tcell/v2/wscreen.go (100%) create mode 100644 vendor/golang.org/x/sys/unix/mmap_nomremap.go diff --git a/go.mod b/go.mod index 7487a158e..54228814b 100644 --- a/go.mod +++ b/go.mod @@ -9,14 +9,13 @@ require ( github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/creack/pty v1.1.11 github.com/fsmiamoto/git-todo-parser v0.0.5 - github.com/gdamore/tcell/v2 v2.6.0 github.com/go-errors/errors v1.4.2 github.com/gookit/color v1.4.2 github.com/imdario/mergo v0.3.11 github.com/integrii/flaggy v1.4.0 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d - github.com/jesseduffield/gocui v0.3.1-0.20230802092815-ae0a5c181634 + github.com/jesseduffield/gocui v0.3.1-0.20230806095321-ac7b03108825 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e @@ -34,6 +33,7 @@ require ( github.com/sirupsen/logrus v1.4.2 github.com/spf13/afero v1.9.5 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad + github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68 github.com/stretchr/testify v1.8.0 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 @@ -67,10 +67,8 @@ require ( github.com/xanzy/ssh-agent v0.2.1 // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/term v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/term v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) - -replace github.com/gdamore/tcell/v2 v2.6.0 => github.com/stefanhaller/tcell/v2 v2.6.1 diff --git a/go.sum b/go.sum index df071f954..8a7409da5 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk= github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE= github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o= -github.com/jesseduffield/gocui v0.3.1-0.20230802092815-ae0a5c181634 h1:tL9DS59Po4kw1fR+wFn0zUYQhrgxMskTatLcYQl7MMU= -github.com/jesseduffield/gocui v0.3.1-0.20230802092815-ae0a5c181634/go.mod h1:pArPLsN1+S6jDrBDukTkpnH89rdhw44wzKdXFICGH3Q= +github.com/jesseduffield/gocui v0.3.1-0.20230806095321-ac7b03108825 h1:4Ea8qV/BbZAGcXd8MAufDsbwwfz2pbRZdqIodC/XHZs= +github.com/jesseduffield/gocui v0.3.1-0.20230806095321-ac7b03108825/go.mod h1:trXE7RRGL2hTsv+Ntk+SHLtRobg9JE138n3Ug/X2Cf4= github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0= github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo= github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY= @@ -268,8 +268,8 @@ github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= -github.com/stefanhaller/tcell/v2 v2.6.1 h1:Qo4k5SOUc09q9xyA8juH4jFJy+neM9aQwJHgVO2/zBM= -github.com/stefanhaller/tcell/v2 v2.6.1/go.mod h1:PuJ7T6QKbsU7iVOHlhRoV3D/ipIAJsyiV4dbwcVaYj8= +github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68 h1:NSTj9xAKUu85d6pAdNFyblL84BfiOB1rVnzxQO/cYUk= +github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68/go.mod h1:PuJ7T6QKbsU7iVOHlhRoV3D/ipIAJsyiV4dbwcVaYj8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= @@ -451,13 +451,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -467,8 +467,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/pkg/gui/gui_driver.go b/pkg/gui/gui_driver.go index 8bab6218d..6d859eddb 100644 --- a/pkg/gui/gui_driver.go +++ b/pkg/gui/gui_driver.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "github.com/gdamore/tcell/v2" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types" + "github.com/stefanhaller/tcell/v2" ) // this gives our integration test a way of interacting with the gui for sending keypresses diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go b/vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go deleted file mode 100644 index c69bef13d..000000000 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2020 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package extended contains an extended set of terminal descriptions. -// Applications desiring to have a better chance of Just Working by -// default should include this package. This will significantly increase -// the size of the program. -package extended - -import ( - // The following imports just register themselves -- - // these are the terminal types we aggregate in this package. - _ "github.com/gdamore/tcell/v2/terminfo/a/aixterm" - _ "github.com/gdamore/tcell/v2/terminfo/a/alacritty" - _ "github.com/gdamore/tcell/v2/terminfo/a/ansi" - _ "github.com/gdamore/tcell/v2/terminfo/b/beterm" - _ "github.com/gdamore/tcell/v2/terminfo/c/cygwin" - _ "github.com/gdamore/tcell/v2/terminfo/d/dtterm" - _ "github.com/gdamore/tcell/v2/terminfo/e/emacs" - _ "github.com/gdamore/tcell/v2/terminfo/f/foot" - _ "github.com/gdamore/tcell/v2/terminfo/g/gnome" - _ "github.com/gdamore/tcell/v2/terminfo/h/hpterm" - _ "github.com/gdamore/tcell/v2/terminfo/k/konsole" - _ "github.com/gdamore/tcell/v2/terminfo/k/kterm" - _ "github.com/gdamore/tcell/v2/terminfo/l/linux" - _ "github.com/gdamore/tcell/v2/terminfo/p/pcansi" - _ "github.com/gdamore/tcell/v2/terminfo/r/rxvt" - _ "github.com/gdamore/tcell/v2/terminfo/s/screen" - _ "github.com/gdamore/tcell/v2/terminfo/s/simpleterm" - _ "github.com/gdamore/tcell/v2/terminfo/s/sun" - _ "github.com/gdamore/tcell/v2/terminfo/t/termite" - _ "github.com/gdamore/tcell/v2/terminfo/t/tmux" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt100" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt102" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt220" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt320" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt400" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt420" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt52" - _ "github.com/gdamore/tcell/v2/terminfo/w/wy50" - _ "github.com/gdamore/tcell/v2/terminfo/w/wy60" - _ "github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi" - _ "github.com/gdamore/tcell/v2/terminfo/x/xfce" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm_termite" -) diff --git a/vendor/github.com/jesseduffield/gocui/attribute.go b/vendor/github.com/jesseduffield/gocui/attribute.go index b6cbf39d0..c413bd365 100644 --- a/vendor/github.com/jesseduffield/gocui/attribute.go +++ b/vendor/github.com/jesseduffield/gocui/attribute.go @@ -4,7 +4,7 @@ package gocui -import "github.com/gdamore/tcell/v2" +import "github.com/stefanhaller/tcell/v2" // Attribute affects the presentation of characters, such as color, boldness, etc. type Attribute uint64 diff --git a/vendor/github.com/jesseduffield/gocui/gui.go b/vendor/github.com/jesseduffield/gocui/gui.go index 7a42fb7c3..fa2019a28 100644 --- a/vendor/github.com/jesseduffield/gocui/gui.go +++ b/vendor/github.com/jesseduffield/gocui/gui.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "github.com/gdamore/tcell/v2" "github.com/go-errors/errors" "github.com/mattn/go-runewidth" + "github.com/stefanhaller/tcell/v2" ) // OutputMode represents an output mode, which determines how colors diff --git a/vendor/github.com/jesseduffield/gocui/keybinding.go b/vendor/github.com/jesseduffield/gocui/keybinding.go index bee180aea..52cfb8a27 100644 --- a/vendor/github.com/jesseduffield/gocui/keybinding.go +++ b/vendor/github.com/jesseduffield/gocui/keybinding.go @@ -7,7 +7,7 @@ package gocui import ( "strings" - "github.com/gdamore/tcell/v2" + "github.com/stefanhaller/tcell/v2" ) // Key represents special keys or keys combinations. diff --git a/vendor/github.com/jesseduffield/gocui/tcell_driver.go b/vendor/github.com/jesseduffield/gocui/tcell_driver.go index 1899c60a5..ab3f610f6 100644 --- a/vendor/github.com/jesseduffield/gocui/tcell_driver.go +++ b/vendor/github.com/jesseduffield/gocui/tcell_driver.go @@ -5,8 +5,8 @@ package gocui import ( - "github.com/gdamore/tcell/v2" "github.com/mattn/go-runewidth" + "github.com/stefanhaller/tcell/v2" ) // We probably don't want this being a global variable for YOLO for now diff --git a/vendor/github.com/jesseduffield/gocui/view.go b/vendor/github.com/jesseduffield/gocui/view.go index d4a27f736..939ceaa29 100644 --- a/vendor/github.com/jesseduffield/gocui/view.go +++ b/vendor/github.com/jesseduffield/gocui/view.go @@ -13,9 +13,9 @@ import ( "unicode" "unicode/utf8" - "github.com/gdamore/tcell/v2" "github.com/go-errors/errors" "github.com/mattn/go-runewidth" + "github.com/stefanhaller/tcell/v2" ) // Constants for overlapping edges diff --git a/vendor/github.com/gdamore/tcell/v2/.gitignore b/vendor/github.com/stefanhaller/tcell/v2/.gitignore similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/.gitignore rename to vendor/github.com/stefanhaller/tcell/v2/.gitignore diff --git a/vendor/github.com/gdamore/tcell/v2/AUTHORS b/vendor/github.com/stefanhaller/tcell/v2/AUTHORS similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/AUTHORS rename to vendor/github.com/stefanhaller/tcell/v2/AUTHORS diff --git a/vendor/github.com/gdamore/tcell/v2/CHANGESv2.md b/vendor/github.com/stefanhaller/tcell/v2/CHANGESv2.md similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/CHANGESv2.md rename to vendor/github.com/stefanhaller/tcell/v2/CHANGESv2.md diff --git a/vendor/github.com/gdamore/tcell/v2/LICENSE b/vendor/github.com/stefanhaller/tcell/v2/LICENSE similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/LICENSE rename to vendor/github.com/stefanhaller/tcell/v2/LICENSE diff --git a/vendor/github.com/gdamore/tcell/v2/README-wasm.md b/vendor/github.com/stefanhaller/tcell/v2/README-wasm.md similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/README-wasm.md rename to vendor/github.com/stefanhaller/tcell/v2/README-wasm.md diff --git a/vendor/github.com/gdamore/tcell/v2/README.md b/vendor/github.com/stefanhaller/tcell/v2/README.md similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/README.md rename to vendor/github.com/stefanhaller/tcell/v2/README.md diff --git a/vendor/github.com/gdamore/tcell/v2/TUTORIAL.md b/vendor/github.com/stefanhaller/tcell/v2/TUTORIAL.md similarity index 99% rename from vendor/github.com/gdamore/tcell/v2/TUTORIAL.md rename to vendor/github.com/stefanhaller/tcell/v2/TUTORIAL.md index f52fcff0d..2e6f9bc27 100644 --- a/vendor/github.com/gdamore/tcell/v2/TUTORIAL.md +++ b/vendor/github.com/stefanhaller/tcell/v2/TUTORIAL.md @@ -172,7 +172,7 @@ import ( "fmt" "log" - "github.com/gdamore/tcell/v2" + "github.com/stefanhaller/tcell/v2" ) func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string) { diff --git a/vendor/github.com/gdamore/tcell/v2/UKRAINE.md b/vendor/github.com/stefanhaller/tcell/v2/UKRAINE.md similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/UKRAINE.md rename to vendor/github.com/stefanhaller/tcell/v2/UKRAINE.md diff --git a/vendor/github.com/gdamore/tcell/v2/attr.go b/vendor/github.com/stefanhaller/tcell/v2/attr.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/attr.go rename to vendor/github.com/stefanhaller/tcell/v2/attr.go diff --git a/vendor/github.com/gdamore/tcell/v2/cell.go b/vendor/github.com/stefanhaller/tcell/v2/cell.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/cell.go rename to vendor/github.com/stefanhaller/tcell/v2/cell.go diff --git a/vendor/github.com/gdamore/tcell/v2/charset_stub.go b/vendor/github.com/stefanhaller/tcell/v2/charset_stub.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/charset_stub.go rename to vendor/github.com/stefanhaller/tcell/v2/charset_stub.go diff --git a/vendor/github.com/gdamore/tcell/v2/charset_unix.go b/vendor/github.com/stefanhaller/tcell/v2/charset_unix.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/charset_unix.go rename to vendor/github.com/stefanhaller/tcell/v2/charset_unix.go diff --git a/vendor/github.com/gdamore/tcell/v2/charset_windows.go b/vendor/github.com/stefanhaller/tcell/v2/charset_windows.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/charset_windows.go rename to vendor/github.com/stefanhaller/tcell/v2/charset_windows.go diff --git a/vendor/github.com/gdamore/tcell/v2/color.go b/vendor/github.com/stefanhaller/tcell/v2/color.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/color.go rename to vendor/github.com/stefanhaller/tcell/v2/color.go diff --git a/vendor/github.com/gdamore/tcell/v2/colorfit.go b/vendor/github.com/stefanhaller/tcell/v2/colorfit.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/colorfit.go rename to vendor/github.com/stefanhaller/tcell/v2/colorfit.go diff --git a/vendor/github.com/gdamore/tcell/v2/console_stub.go b/vendor/github.com/stefanhaller/tcell/v2/console_stub.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/console_stub.go rename to vendor/github.com/stefanhaller/tcell/v2/console_stub.go diff --git a/vendor/github.com/gdamore/tcell/v2/console_win.go b/vendor/github.com/stefanhaller/tcell/v2/console_win.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/console_win.go rename to vendor/github.com/stefanhaller/tcell/v2/console_win.go diff --git a/vendor/github.com/gdamore/tcell/v2/doc.go b/vendor/github.com/stefanhaller/tcell/v2/doc.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/doc.go rename to vendor/github.com/stefanhaller/tcell/v2/doc.go diff --git a/vendor/github.com/gdamore/tcell/v2/encoding.go b/vendor/github.com/stefanhaller/tcell/v2/encoding.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/encoding.go rename to vendor/github.com/stefanhaller/tcell/v2/encoding.go diff --git a/vendor/github.com/gdamore/tcell/v2/errors.go b/vendor/github.com/stefanhaller/tcell/v2/errors.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/errors.go rename to vendor/github.com/stefanhaller/tcell/v2/errors.go index 201dff9f8..b76a72556 100644 --- a/vendor/github.com/gdamore/tcell/v2/errors.go +++ b/vendor/github.com/stefanhaller/tcell/v2/errors.go @@ -18,7 +18,7 @@ import ( "errors" "time" - "github.com/gdamore/tcell/v2/terminfo" + "github.com/stefanhaller/tcell/v2/terminfo" ) var ( diff --git a/vendor/github.com/gdamore/tcell/v2/event.go b/vendor/github.com/stefanhaller/tcell/v2/event.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/event.go rename to vendor/github.com/stefanhaller/tcell/v2/event.go diff --git a/vendor/github.com/gdamore/tcell/v2/focus.go b/vendor/github.com/stefanhaller/tcell/v2/focus.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/focus.go rename to vendor/github.com/stefanhaller/tcell/v2/focus.go diff --git a/vendor/github.com/gdamore/tcell/v2/interrupt.go b/vendor/github.com/stefanhaller/tcell/v2/interrupt.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/interrupt.go rename to vendor/github.com/stefanhaller/tcell/v2/interrupt.go diff --git a/vendor/github.com/gdamore/tcell/v2/key.go b/vendor/github.com/stefanhaller/tcell/v2/key.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/key.go rename to vendor/github.com/stefanhaller/tcell/v2/key.go diff --git a/vendor/github.com/gdamore/tcell/v2/mouse.go b/vendor/github.com/stefanhaller/tcell/v2/mouse.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/mouse.go rename to vendor/github.com/stefanhaller/tcell/v2/mouse.go diff --git a/vendor/github.com/gdamore/tcell/v2/nonblock_bsd.go b/vendor/github.com/stefanhaller/tcell/v2/nonblock_bsd.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/nonblock_bsd.go rename to vendor/github.com/stefanhaller/tcell/v2/nonblock_bsd.go diff --git a/vendor/github.com/gdamore/tcell/v2/nonblock_unix.go b/vendor/github.com/stefanhaller/tcell/v2/nonblock_unix.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/nonblock_unix.go rename to vendor/github.com/stefanhaller/tcell/v2/nonblock_unix.go diff --git a/vendor/github.com/gdamore/tcell/v2/paste.go b/vendor/github.com/stefanhaller/tcell/v2/paste.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/paste.go rename to vendor/github.com/stefanhaller/tcell/v2/paste.go diff --git a/vendor/github.com/gdamore/tcell/v2/resize.go b/vendor/github.com/stefanhaller/tcell/v2/resize.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/resize.go rename to vendor/github.com/stefanhaller/tcell/v2/resize.go diff --git a/vendor/github.com/gdamore/tcell/v2/runes.go b/vendor/github.com/stefanhaller/tcell/v2/runes.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/runes.go rename to vendor/github.com/stefanhaller/tcell/v2/runes.go diff --git a/vendor/github.com/gdamore/tcell/v2/screen.go b/vendor/github.com/stefanhaller/tcell/v2/screen.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/screen.go rename to vendor/github.com/stefanhaller/tcell/v2/screen.go diff --git a/vendor/github.com/gdamore/tcell/v2/simulation.go b/vendor/github.com/stefanhaller/tcell/v2/simulation.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/simulation.go rename to vendor/github.com/stefanhaller/tcell/v2/simulation.go diff --git a/vendor/github.com/gdamore/tcell/v2/stdin_unix.go b/vendor/github.com/stefanhaller/tcell/v2/stdin_unix.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/stdin_unix.go rename to vendor/github.com/stefanhaller/tcell/v2/stdin_unix.go diff --git a/vendor/github.com/gdamore/tcell/v2/style.go b/vendor/github.com/stefanhaller/tcell/v2/style.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/style.go rename to vendor/github.com/stefanhaller/tcell/v2/style.go diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/.gitignore b/vendor/github.com/stefanhaller/tcell/v2/terminfo/.gitignore similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/terminfo/.gitignore rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/.gitignore diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/README.md b/vendor/github.com/stefanhaller/tcell/v2/terminfo/README.md similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/terminfo/README.md rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/README.md diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/TERMINALS.md b/vendor/github.com/stefanhaller/tcell/v2/terminfo/TERMINALS.md similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/terminfo/TERMINALS.md rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/TERMINALS.md diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/aixterm/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/aixterm/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/a/aixterm/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/a/aixterm/term.go index 503c9199e..165056e23 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/aixterm/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/aixterm/term.go @@ -2,7 +2,7 @@ package aixterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/direct.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/alacritty/direct.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/direct.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/a/alacritty/direct.go index db6351af2..fd8663cad 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/direct.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/alacritty/direct.go @@ -2,7 +2,7 @@ package alacritty -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/alacritty/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/a/alacritty/term.go index 5b9799846..ace85a698 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/alacritty/term.go @@ -2,7 +2,7 @@ package alacritty -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/a/ansi/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/ansi/term.go similarity index 95% rename from vendor/github.com/gdamore/tcell/v2/terminfo/a/ansi/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/a/ansi/term.go index 5c572fd49..8316373db 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/a/ansi/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/a/ansi/term.go @@ -2,7 +2,7 @@ package ansi -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/b/beterm/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/b/beterm/term.go similarity index 96% rename from vendor/github.com/gdamore/tcell/v2/terminfo/b/beterm/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/b/beterm/term.go index e6d88838c..dcdbabb44 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/b/beterm/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/b/beterm/term.go @@ -2,7 +2,7 @@ package beterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/base/base.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/base/base.go similarity index 80% rename from vendor/github.com/gdamore/tcell/v2/terminfo/base/base.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/base/base.go index fbecdfa93..514a909f7 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/base/base.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/base/base.go @@ -24,9 +24,9 @@ package base import ( // The following imports just register themselves -- // thse are the terminal types we aggregate in this package. - _ "github.com/gdamore/tcell/v2/terminfo/a/ansi" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt100" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt102" - _ "github.com/gdamore/tcell/v2/terminfo/v/vt220" - _ "github.com/gdamore/tcell/v2/terminfo/x/xterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/a/ansi" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt100" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt102" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt220" + _ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm" ) diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/c/cygwin/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/c/cygwin/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/c/cygwin/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/c/cygwin/term.go index 46a0a4a3a..33ecba451 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/c/cygwin/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/c/cygwin/term.go @@ -2,7 +2,7 @@ package cygwin -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/d/dtterm/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/d/dtterm/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/d/dtterm/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/d/dtterm/term.go index f471c80d2..fb2a19798 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/d/dtterm/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/d/dtterm/term.go @@ -2,7 +2,7 @@ package dtterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/dynamic/dynamic.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/dynamic/dynamic.go similarity index 99% rename from vendor/github.com/gdamore/tcell/v2/terminfo/dynamic/dynamic.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/dynamic/dynamic.go index 08ff24842..c6dbde54a 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/dynamic/dynamic.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/dynamic/dynamic.go @@ -29,7 +29,7 @@ import ( "strconv" "strings" - "github.com/gdamore/tcell/v2/terminfo" + "github.com/stefanhaller/tcell/v2/terminfo" ) type termcap struct { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/e/emacs/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/e/emacs/term.go similarity index 96% rename from vendor/github.com/gdamore/tcell/v2/terminfo/e/emacs/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/e/emacs/term.go index b0b9b4771..fe7667363 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/e/emacs/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/e/emacs/term.go @@ -2,7 +2,7 @@ package emacs -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/stefanhaller/tcell/v2/terminfo/extended/extended.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/extended/extended.go new file mode 100644 index 000000000..9e5845656 --- /dev/null +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/extended/extended.go @@ -0,0 +1,58 @@ +// Copyright 2020 The TCell Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use file except in compliance with the License. +// You may obtain a copy of the license at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package extended contains an extended set of terminal descriptions. +// Applications desiring to have a better chance of Just Working by +// default should include this package. This will significantly increase +// the size of the program. +package extended + +import ( + // The following imports just register themselves -- + // these are the terminal types we aggregate in this package. + _ "github.com/stefanhaller/tcell/v2/terminfo/a/aixterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/a/alacritty" + _ "github.com/stefanhaller/tcell/v2/terminfo/a/ansi" + _ "github.com/stefanhaller/tcell/v2/terminfo/b/beterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/c/cygwin" + _ "github.com/stefanhaller/tcell/v2/terminfo/d/dtterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/e/emacs" + _ "github.com/stefanhaller/tcell/v2/terminfo/f/foot" + _ "github.com/stefanhaller/tcell/v2/terminfo/g/gnome" + _ "github.com/stefanhaller/tcell/v2/terminfo/h/hpterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/k/konsole" + _ "github.com/stefanhaller/tcell/v2/terminfo/k/kterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/l/linux" + _ "github.com/stefanhaller/tcell/v2/terminfo/p/pcansi" + _ "github.com/stefanhaller/tcell/v2/terminfo/r/rxvt" + _ "github.com/stefanhaller/tcell/v2/terminfo/s/screen" + _ "github.com/stefanhaller/tcell/v2/terminfo/s/simpleterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/s/sun" + _ "github.com/stefanhaller/tcell/v2/terminfo/t/termite" + _ "github.com/stefanhaller/tcell/v2/terminfo/t/tmux" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt100" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt102" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt220" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt320" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt400" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt420" + _ "github.com/stefanhaller/tcell/v2/terminfo/v/vt52" + _ "github.com/stefanhaller/tcell/v2/terminfo/w/wy50" + _ "github.com/stefanhaller/tcell/v2/terminfo/w/wy60" + _ "github.com/stefanhaller/tcell/v2/terminfo/w/wy99_ansi" + _ "github.com/stefanhaller/tcell/v2/terminfo/x/xfce" + _ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm" + _ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm_kitty" + _ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm_termite" +) diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/f/foot/foot.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/f/foot/foot.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/f/foot/foot.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/f/foot/foot.go index 5daa3c8ac..7b132a1c0 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/f/foot/foot.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/f/foot/foot.go @@ -2,7 +2,7 @@ package foot -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/g/gnome/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/g/gnome/term.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/g/gnome/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/g/gnome/term.go index e85a3a343..09eb76925 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/g/gnome/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/g/gnome/term.go @@ -2,7 +2,7 @@ package gnome -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/gen.sh b/vendor/github.com/stefanhaller/tcell/v2/terminfo/gen.sh similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/terminfo/gen.sh rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/gen.sh diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/h/hpterm/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/h/hpterm/term.go similarity index 95% rename from vendor/github.com/gdamore/tcell/v2/terminfo/h/hpterm/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/h/hpterm/term.go index 123bfb939..9bc4a4cf3 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/h/hpterm/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/h/hpterm/term.go @@ -2,7 +2,7 @@ package hpterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/k/konsole/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/k/konsole/term.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/k/konsole/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/k/konsole/term.go index 236db9db2..c2dcdaa91 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/k/konsole/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/k/konsole/term.go @@ -2,7 +2,7 @@ package konsole -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/k/kterm/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/k/kterm/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/k/kterm/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/k/kterm/term.go index eedbe6de0..f65c5d827 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/k/kterm/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/k/kterm/term.go @@ -2,7 +2,7 @@ package kterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/l/linux/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/l/linux/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/l/linux/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/l/linux/term.go index 8783b4c7f..cdfb447eb 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/l/linux/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/l/linux/term.go @@ -2,7 +2,7 @@ package linux -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/models.txt b/vendor/github.com/stefanhaller/tcell/v2/terminfo/models.txt similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/terminfo/models.txt rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/models.txt diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/p/pcansi/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/p/pcansi/term.go similarity index 95% rename from vendor/github.com/gdamore/tcell/v2/terminfo/p/pcansi/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/p/pcansi/term.go index 9e89c1977..875929c80 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/p/pcansi/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/p/pcansi/term.go @@ -2,7 +2,7 @@ package pcansi -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/r/rxvt/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/r/rxvt/term.go similarity index 99% rename from vendor/github.com/gdamore/tcell/v2/terminfo/r/rxvt/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/r/rxvt/term.go index 6fa9e7fa4..6d2154554 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/r/rxvt/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/r/rxvt/term.go @@ -2,7 +2,7 @@ package rxvt -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/s/screen/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/s/screen/term.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/s/screen/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/s/screen/term.go index d95d63633..2769a6a98 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/s/screen/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/s/screen/term.go @@ -2,7 +2,7 @@ package screen -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/s/simpleterm/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/s/simpleterm/term.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/s/simpleterm/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/s/simpleterm/term.go index f633f2941..87714bf0c 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/s/simpleterm/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/s/simpleterm/term.go @@ -2,7 +2,7 @@ package simpleterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/s/sun/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/s/sun/term.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/s/sun/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/s/sun/term.go index 16cb96c20..9eaef4002 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/s/sun/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/s/sun/term.go @@ -20,7 +20,7 @@ package sun -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/t/termite/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/t/termite/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/t/termite/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/t/termite/term.go index 593d38556..dfd08287e 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/t/termite/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/t/termite/term.go @@ -2,7 +2,7 @@ package termite -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/t/tmux/term.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/t/tmux/term.go index 2da0c3cfb..d4fafac6e 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/t/tmux/term.go @@ -2,7 +2,7 @@ package tmux -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/terminfo.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/terminfo.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/terminfo/terminfo.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/terminfo.go diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt100/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt100/term.go similarity index 95% rename from vendor/github.com/gdamore/tcell/v2/terminfo/v/vt100/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt100/term.go index 0ae3918ac..d73fd3de6 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt100/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt100/term.go @@ -2,7 +2,7 @@ package vt100 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt102/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt102/term.go similarity index 95% rename from vendor/github.com/gdamore/tcell/v2/terminfo/v/vt102/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt102/term.go index ec8dae246..7738c9b93 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt102/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt102/term.go @@ -2,7 +2,7 @@ package vt102 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt220/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt220/term.go similarity index 96% rename from vendor/github.com/gdamore/tcell/v2/terminfo/v/vt220/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt220/term.go index 75ab9a8ca..ef07d388b 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt220/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt220/term.go @@ -2,7 +2,7 @@ package vt220 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt320/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt320/term.go similarity index 96% rename from vendor/github.com/gdamore/tcell/v2/terminfo/v/vt320/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt320/term.go index 3fd3d39f0..0bfcb6738 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt320/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt320/term.go @@ -2,7 +2,7 @@ package vt320 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt400/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt400/term.go similarity index 95% rename from vendor/github.com/gdamore/tcell/v2/terminfo/v/vt400/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt400/term.go index 0c07e9d2c..9839510b2 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt400/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt400/term.go @@ -2,7 +2,7 @@ package vt400 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt420/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt420/term.go similarity index 96% rename from vendor/github.com/gdamore/tcell/v2/terminfo/v/vt420/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt420/term.go index 094886e27..3d92ef927 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt420/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt420/term.go @@ -2,7 +2,7 @@ package vt420 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt52/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt52/term.go similarity index 92% rename from vendor/github.com/gdamore/tcell/v2/terminfo/v/vt52/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt52/term.go index ba49f7f5e..1390f7d35 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/v/vt52/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/v/vt52/term.go @@ -2,7 +2,7 @@ package vt52 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/w/wy50/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy50/term.go similarity index 96% rename from vendor/github.com/gdamore/tcell/v2/terminfo/w/wy50/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy50/term.go index beced62d5..1b3bf4f7c 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/w/wy50/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy50/term.go @@ -2,7 +2,7 @@ package wy50 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/w/wy60/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy60/term.go similarity index 96% rename from vendor/github.com/gdamore/tcell/v2/terminfo/w/wy60/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy60/term.go index 5b79310a7..56a7b90d4 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/w/wy60/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy60/term.go @@ -2,7 +2,7 @@ package wy60 -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy99_ansi/term.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy99_ansi/term.go index af470e46f..35fecc85b 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy99_ansi/term.go @@ -2,7 +2,7 @@ package wy99_ansi -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xfce/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xfce/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/x/xfce/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xfce/term.go index d70b2e910..0a5b286b6 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xfce/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xfce/term.go @@ -2,7 +2,7 @@ package xfce -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/direct.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm/direct.go similarity index 98% rename from vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/direct.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm/direct.go index 358ebae91..6e66f6980 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/direct.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm/direct.go @@ -20,7 +20,7 @@ package xterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm/term.go similarity index 99% rename from vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm/term.go index daa19c3f1..9d87ef51f 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm/term.go @@ -2,7 +2,7 @@ package xterm -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm_kitty/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm_kitty/term.go index ab50003e0..80d2c3ff0 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm_kitty/term.go @@ -2,7 +2,7 @@ package xterm_kitty -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_termite/term.go b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm_termite/term.go similarity index 97% rename from vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_termite/term.go rename to vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm_termite/term.go index f2d022101..7b7477da6 100644 --- a/vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_termite/term.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm_termite/term.go @@ -2,7 +2,7 @@ package xterm_termite -import "github.com/gdamore/tcell/v2/terminfo" +import "github.com/stefanhaller/tcell/v2/terminfo" func init() { diff --git a/vendor/github.com/gdamore/tcell/v2/terms_default.go b/vendor/github.com/stefanhaller/tcell/v2/terms_default.go similarity index 93% rename from vendor/github.com/gdamore/tcell/v2/terms_default.go rename to vendor/github.com/stefanhaller/tcell/v2/terms_default.go index fefcf8938..3a6b462e4 100644 --- a/vendor/github.com/gdamore/tcell/v2/terms_default.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terms_default.go @@ -20,5 +20,5 @@ package tcell import ( // This imports the default terminal entries. To disable, use the // tcell_minimal build tag. - _ "github.com/gdamore/tcell/v2/terminfo/extended" + _ "github.com/stefanhaller/tcell/v2/terminfo/extended" ) diff --git a/vendor/github.com/gdamore/tcell/v2/terms_dynamic.go b/vendor/github.com/stefanhaller/tcell/v2/terms_dynamic.go similarity index 93% rename from vendor/github.com/gdamore/tcell/v2/terms_dynamic.go rename to vendor/github.com/stefanhaller/tcell/v2/terms_dynamic.go index f552b0e8e..357c18d42 100644 --- a/vendor/github.com/gdamore/tcell/v2/terms_dynamic.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terms_dynamic.go @@ -25,8 +25,8 @@ import ( // also don't support Android here, because you really don't want // to run external programs there. Generally the android terminals // will be automatically included anyway. - "github.com/gdamore/tcell/v2/terminfo" - "github.com/gdamore/tcell/v2/terminfo/dynamic" + "github.com/stefanhaller/tcell/v2/terminfo" + "github.com/stefanhaller/tcell/v2/terminfo/dynamic" ) func loadDynamicTerminfo(term string) (*terminfo.Terminfo, error) { diff --git a/vendor/github.com/gdamore/tcell/v2/terms_static.go b/vendor/github.com/stefanhaller/tcell/v2/terms_static.go similarity index 95% rename from vendor/github.com/gdamore/tcell/v2/terms_static.go rename to vendor/github.com/stefanhaller/tcell/v2/terms_static.go index 6d725cbcc..286ef99d0 100644 --- a/vendor/github.com/gdamore/tcell/v2/terms_static.go +++ b/vendor/github.com/stefanhaller/tcell/v2/terms_static.go @@ -20,7 +20,7 @@ package tcell import ( "errors" - "github.com/gdamore/tcell/v2/terminfo" + "github.com/stefanhaller/tcell/v2/terminfo" ) func loadDynamicTerminfo(_ string) (*terminfo.Terminfo, error) { diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen.go b/vendor/github.com/stefanhaller/tcell/v2/tscreen.go similarity index 99% rename from vendor/github.com/gdamore/tcell/v2/tscreen.go rename to vendor/github.com/stefanhaller/tcell/v2/tscreen.go index 27635d38a..3746fc1f0 100644 --- a/vendor/github.com/gdamore/tcell/v2/tscreen.go +++ b/vendor/github.com/stefanhaller/tcell/v2/tscreen.go @@ -31,10 +31,10 @@ import ( "golang.org/x/term" "golang.org/x/text/transform" - "github.com/gdamore/tcell/v2/terminfo" + "github.com/stefanhaller/tcell/v2/terminfo" // import the stock terminals - _ "github.com/gdamore/tcell/v2/terminfo/base" + _ "github.com/stefanhaller/tcell/v2/terminfo/base" ) // NewTerminfoScreen returns a Screen that uses the stock TTY interface diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen_stub.go b/vendor/github.com/stefanhaller/tcell/v2/tscreen_stub.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/tscreen_stub.go rename to vendor/github.com/stefanhaller/tcell/v2/tscreen_stub.go diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen_unix.go b/vendor/github.com/stefanhaller/tcell/v2/tscreen_unix.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/tscreen_unix.go rename to vendor/github.com/stefanhaller/tcell/v2/tscreen_unix.go diff --git a/vendor/github.com/gdamore/tcell/v2/tty.go b/vendor/github.com/stefanhaller/tcell/v2/tty.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/tty.go rename to vendor/github.com/stefanhaller/tcell/v2/tty.go diff --git a/vendor/github.com/gdamore/tcell/v2/tty_unix.go b/vendor/github.com/stefanhaller/tcell/v2/tty_unix.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/tty_unix.go rename to vendor/github.com/stefanhaller/tcell/v2/tty_unix.go diff --git a/vendor/github.com/gdamore/tcell/v2/wscreen.go b/vendor/github.com/stefanhaller/tcell/v2/wscreen.go similarity index 100% rename from vendor/github.com/gdamore/tcell/v2/wscreen.go rename to vendor/github.com/stefanhaller/tcell/v2/wscreen.go diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh index 0c4d14929..8f775fafa 100644 --- a/vendor/golang.org/x/sys/unix/mkerrors.sh +++ b/vendor/golang.org/x/sys/unix/mkerrors.sh @@ -624,7 +624,7 @@ ccflags="$@" $2 ~ /^MEM/ || $2 ~ /^WG/ || $2 ~ /^FIB_RULE_/ || - $2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE)/ {printf("\t%s = C.%s\n", $2, $2)} + $2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE|IOMIN$|IOOPT$|ALIGNOFF$|DISCARD|ROTATIONAL$|ZEROOUT$|GETDISKSEQ$)/ {printf("\t%s = C.%s\n", $2, $2)} $2 ~ /^__WCOREFLAG$/ {next} $2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)} diff --git a/vendor/golang.org/x/sys/unix/mmap_nomremap.go b/vendor/golang.org/x/sys/unix/mmap_nomremap.go new file mode 100644 index 000000000..ca0513632 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mmap_nomremap.go @@ -0,0 +1,14 @@ +// Copyright 2023 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +//go:build aix || darwin || dragonfly || freebsd || openbsd || solaris +// +build aix darwin dragonfly freebsd openbsd solaris + +package unix + +var mapper = &mmapper{ + active: make(map[*byte][]byte), + mmap: mmap, + munmap: munmap, +} diff --git a/vendor/golang.org/x/sys/unix/mremap.go b/vendor/golang.org/x/sys/unix/mremap.go index 86213c05d..fa93d0aa9 100644 --- a/vendor/golang.org/x/sys/unix/mremap.go +++ b/vendor/golang.org/x/sys/unix/mremap.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build linux -// +build linux +//go:build linux || netbsd +// +build linux netbsd package unix @@ -14,8 +14,17 @@ type mremapMmapper struct { mremap func(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error) } +var mapper = &mremapMmapper{ + mmapper: mmapper{ + active: make(map[*byte][]byte), + mmap: mmap, + munmap: munmap, + }, + mremap: mremap, +} + func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) { - if newLength <= 0 || len(oldData) == 0 || len(oldData) != cap(oldData) || flags&MREMAP_FIXED != 0 { + if newLength <= 0 || len(oldData) == 0 || len(oldData) != cap(oldData) || flags&mremapFixed != 0 { return nil, EINVAL } @@ -32,9 +41,13 @@ func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data [ } bNew := unsafe.Slice((*byte)(unsafe.Pointer(newAddr)), newLength) pNew := &bNew[cap(bNew)-1] - if flags&MREMAP_DONTUNMAP == 0 { + if flags&mremapDontunmap == 0 { delete(m.active, pOld) } m.active[pNew] = bNew return bNew, nil } + +func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) { + return mapper.Mremap(oldData, newLength, flags) +} diff --git a/vendor/golang.org/x/sys/unix/syscall_aix.go b/vendor/golang.org/x/sys/unix/syscall_aix.go index c406ae00f..9a6e5acac 100644 --- a/vendor/golang.org/x/sys/unix/syscall_aix.go +++ b/vendor/golang.org/x/sys/unix/syscall_aix.go @@ -535,21 +535,6 @@ func Fsync(fd int) error { //sys sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = nsendmsg //sys munmap(addr uintptr, length uintptr) (err error) - -var mapper = &mmapper{ - active: make(map[*byte][]byte), - mmap: mmap, - munmap: munmap, -} - -func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) { - return mapper.Mmap(fd, offset, length, prot, flags) -} - -func Munmap(b []byte) (err error) { - return mapper.Munmap(b) -} - //sys Madvise(b []byte, advice int) (err error) //sys Mprotect(b []byte, prot int) (err error) //sys Mlock(b []byte) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go index 7705c3270..4217de518 100644 --- a/vendor/golang.org/x/sys/unix/syscall_bsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go @@ -601,20 +601,6 @@ func Poll(fds []PollFd, timeout int) (n int, err error) { // Gethostuuid(uuid *byte, timeout *Timespec) (err error) // Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error) -var mapper = &mmapper{ - active: make(map[*byte][]byte), - mmap: mmap, - munmap: munmap, -} - -func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) { - return mapper.Mmap(fd, offset, length, prot, flags) -} - -func Munmap(b []byte) (err error) { - return mapper.Munmap(b) -} - //sys Madvise(b []byte, behav int) (err error) //sys Mlock(b []byte) (err error) //sys Mlockall(flags int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go index 206921504..135cc3cd7 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go @@ -510,30 +510,36 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) { return nil, err } - // Find size. - n := uintptr(0) - if err := sysctl(mib, nil, &n, nil, 0); err != nil { - return nil, err - } - if n == 0 { - return nil, nil - } - if n%SizeofKinfoProc != 0 { - return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc) - } + for { + // Find size. + n := uintptr(0) + if err := sysctl(mib, nil, &n, nil, 0); err != nil { + return nil, err + } + if n == 0 { + return nil, nil + } + if n%SizeofKinfoProc != 0 { + return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc) + } - // Read into buffer of that size. - buf := make([]KinfoProc, n/SizeofKinfoProc) - if err := sysctl(mib, (*byte)(unsafe.Pointer(&buf[0])), &n, nil, 0); err != nil { - return nil, err - } - if n%SizeofKinfoProc != 0 { - return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc) - } + // Read into buffer of that size. + buf := make([]KinfoProc, n/SizeofKinfoProc) + if err := sysctl(mib, (*byte)(unsafe.Pointer(&buf[0])), &n, nil, 0); err != nil { + if err == ENOMEM { + // Process table grew. Try again. + continue + } + return nil, err + } + if n%SizeofKinfoProc != 0 { + return nil, fmt.Errorf("sysctl() returned a size of %d, which is not a multiple of %d", n, SizeofKinfoProc) + } - // The actual call may return less than the original reported required - // size so ensure we deal with that. - return buf[:n/SizeofKinfoProc], nil + // The actual call may return less than the original reported required + // size so ensure we deal with that. + return buf[:n/SizeofKinfoProc], nil + } } //sys sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go index 39de5f143..a730878e4 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -1885,7 +1885,7 @@ func Getpgrp() (pid int) { //sys PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) //sys PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT //sys Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) -//sys Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) = SYS_PSELECT6 +//sys pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *sigset_argpack) (n int, err error) //sys read(fd int, p []byte) (n int, err error) //sys Removexattr(path string, attr string) (err error) //sys Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) @@ -2125,28 +2125,6 @@ func writevRacedetect(iovecs []Iovec, n int) { // mmap varies by architecture; see syscall_linux_*.go. //sys munmap(addr uintptr, length uintptr) (err error) //sys mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error) - -var mapper = &mremapMmapper{ - mmapper: mmapper{ - active: make(map[*byte][]byte), - mmap: mmap, - munmap: munmap, - }, - mremap: mremap, -} - -func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) { - return mapper.Mmap(fd, offset, length, prot, flags) -} - -func Munmap(b []byte) (err error) { - return mapper.Munmap(b) -} - -func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) { - return mapper.Mremap(oldData, newLength, flags) -} - //sys Madvise(b []byte, advice int) (err error) //sys Mprotect(b []byte, prot int) (err error) //sys Mlock(b []byte) (err error) @@ -2155,6 +2133,12 @@ func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) { //sys Munlock(b []byte) (err error) //sys Munlockall() (err error) +const ( + mremapFixed = MREMAP_FIXED + mremapDontunmap = MREMAP_DONTUNMAP + mremapMaymove = MREMAP_MAYMOVE +) + // Vmsplice splices user pages from a slice of Iovecs into a pipe specified by fd, // using the specified flags. func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) { @@ -2454,6 +2438,39 @@ func Getresgid() (rgid, egid, sgid int) { return int(r), int(e), int(s) } +// Pselect is a wrapper around the Linux pselect6 system call. +// This version does not modify the timeout argument. +func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { + // Per https://man7.org/linux/man-pages/man2/select.2.html#NOTES, + // The Linux pselect6() system call modifies its timeout argument. + // [Not modifying the argument] is the behavior required by POSIX.1-2001. + var mutableTimeout *Timespec + if timeout != nil { + mutableTimeout = new(Timespec) + *mutableTimeout = *timeout + } + + // The final argument of the pselect6() system call is not a + // sigset_t * pointer, but is instead a structure + var kernelMask *sigset_argpack + if sigmask != nil { + wordBits := 32 << (^uintptr(0) >> 63) // see math.intSize + + // A sigset stores one bit per signal, + // offset by 1 (because signal 0 does not exist). + // So the number of words needed is ⌈__C_NSIG - 1 / wordBits⌉. + sigsetWords := (_C__NSIG - 1 + wordBits - 1) / (wordBits) + + sigsetBytes := uintptr(sigsetWords * (wordBits / 8)) + kernelMask = &sigset_argpack{ + ss: sigmask, + ssLen: sigsetBytes, + } + } + + return pselect6(nfd, r, w, e, mutableTimeout, kernelMask) +} + /* * Unimplemented */ diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go index 5b21fcfd7..70601ce36 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go @@ -40,7 +40,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err if timeout != nil { ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000} } - return Pselect(nfd, r, w, e, ts, nil) + return pselect6(nfd, r, w, e, ts, nil) } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go index a81f5742b..f5266689a 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go @@ -33,7 +33,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err if timeout != nil { ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000} } - return Pselect(nfd, r, w, e, ts, nil) + return pselect6(nfd, r, w, e, ts, nil) } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go b/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go index 69d2d7c3d..f6ab02ec1 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go @@ -28,7 +28,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err if timeout != nil { ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000} } - return Pselect(nfd, r, w, e, ts, nil) + return pselect6(nfd, r, w, e, ts, nil) } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go index 76d564095..93fe59d25 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go @@ -31,7 +31,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err if timeout != nil { ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000} } - return Pselect(nfd, r, w, e, ts, nil) + return pselect6(nfd, r, w, e, ts, nil) } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go index 35851ef70..5e6ceee12 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go @@ -32,7 +32,7 @@ func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err if timeout != nil { ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000} } - return Pselect(nfd, r, w, e, ts, nil) + return pselect6(nfd, r, w, e, ts, nil) } //sys sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) @@ -177,3 +177,14 @@ func KexecFileLoad(kernelFd int, initrdFd int, cmdline string, flags int) error } return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags) } + +//sys riscvHWProbe(pairs []RISCVHWProbePairs, cpuCount uintptr, cpus *CPUSet, flags uint) (err error) + +func RISCVHWProbe(pairs []RISCVHWProbePairs, set *CPUSet, flags uint) (err error) { + var setSize uintptr + + if set != nil { + setSize = uintptr(unsafe.Sizeof(*set)) + } + return riscvHWProbe(pairs, setSize, set, flags) +} diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go index 018d7d478..ddd1ac853 100644 --- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go @@ -360,6 +360,18 @@ func Statvfs(path string, buf *Statvfs_t) (err error) { //sys writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE //sys utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) +const ( + mremapFixed = MAP_FIXED + mremapDontunmap = 0 + mremapMaymove = 0 +) + +//sys mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) = SYS_MREMAP + +func mremap(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (uintptr, error) { + return mremapNetBSD(oldaddr, oldlength, newaddr, newlength, flags) +} + /* * Unimplemented */ @@ -564,7 +576,6 @@ func Statvfs(path string, buf *Statvfs_t) (err error) { // mq_timedreceive // mq_timedsend // mq_unlink -// mremap // msgget // msgrcv // msgsnd diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go index b600a289d..72d23575f 100644 --- a/vendor/golang.org/x/sys/unix/syscall_solaris.go +++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go @@ -716,20 +716,6 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) { return } -var mapper = &mmapper{ - active: make(map[*byte][]byte), - mmap: mmap, - munmap: munmap, -} - -func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) { - return mapper.Mmap(fd, offset, length, prot, flags) -} - -func Munmap(b []byte) (err error) { - return mapper.Munmap(b) -} - // Event Ports type fileObjCookie struct { diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go index 8e48c29ec..8bb30e7ce 100644 --- a/vendor/golang.org/x/sys/unix/syscall_unix.go +++ b/vendor/golang.org/x/sys/unix/syscall_unix.go @@ -147,6 +147,14 @@ func (m *mmapper) Munmap(data []byte) (err error) { return nil } +func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) { + return mapper.Mmap(fd, offset, length, prot, flags) +} + +func Munmap(b []byte) (err error) { + return mapper.Munmap(b) +} + func Read(fd int, p []byte) (n int, err error) { n, err = read(fd, p) if raceenabled { diff --git a/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go b/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go index d3d49ec3e..44e72edb4 100644 --- a/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go +++ b/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go @@ -285,25 +285,11 @@ func Close(fd int) (err error) { return } -var mapper = &mmapper{ - active: make(map[*byte][]byte), - mmap: mmap, - munmap: munmap, -} - // Dummy function: there are no semantics for Madvise on z/OS func Madvise(b []byte, advice int) (err error) { return } -func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) { - return mapper.Mmap(fd, offset, length, prot, flags) -} - -func Munmap(b []byte) (err error) { - return mapper.Munmap(b) -} - //sys Gethostname(buf []byte) (err error) = SYS___GETHOSTNAME_A //sysnb Getegid() (egid int) //sysnb Geteuid() (uid int) diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go index a46df0f1e..cfb143001 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x127a BLKBSZGET = 0x80041270 BLKBSZSET = 0x40041271 + BLKDISCARD = 0x1277 + BLKDISCARDZEROES = 0x127c BLKFLSBUF = 0x1261 BLKFRAGET = 0x1265 BLKFRASET = 0x1264 + BLKGETDISKSEQ = 0x80081280 BLKGETSIZE = 0x1260 BLKGETSIZE64 = 0x80041272 + BLKIOMIN = 0x1278 + BLKIOOPT = 0x1279 BLKPBSZGET = 0x127b BLKRAGET = 0x1263 BLKRASET = 0x1262 BLKROGET = 0x125e BLKROSET = 0x125d + BLKROTATIONAL = 0x127e BLKRRPART = 0x125f + BLKSECDISCARD = 0x127d BLKSECTGET = 0x1267 BLKSECTSET = 0x1266 BLKSSZGET = 0x1268 + BLKZEROOUT = 0x127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go index 6cd4a3ea9..df64f2d59 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x127a BLKBSZGET = 0x80081270 BLKBSZSET = 0x40081271 + BLKDISCARD = 0x1277 + BLKDISCARDZEROES = 0x127c BLKFLSBUF = 0x1261 BLKFRAGET = 0x1265 BLKFRASET = 0x1264 + BLKGETDISKSEQ = 0x80081280 BLKGETSIZE = 0x1260 BLKGETSIZE64 = 0x80081272 + BLKIOMIN = 0x1278 + BLKIOOPT = 0x1279 BLKPBSZGET = 0x127b BLKRAGET = 0x1263 BLKRASET = 0x1262 BLKROGET = 0x125e BLKROSET = 0x125d + BLKROTATIONAL = 0x127e BLKRRPART = 0x125f + BLKSECDISCARD = 0x127d BLKSECTGET = 0x1267 BLKSECTSET = 0x1266 BLKSSZGET = 0x1268 + BLKZEROOUT = 0x127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go index c7ebee24d..3025cd5b2 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x127a BLKBSZGET = 0x80041270 BLKBSZSET = 0x40041271 + BLKDISCARD = 0x1277 + BLKDISCARDZEROES = 0x127c BLKFLSBUF = 0x1261 BLKFRAGET = 0x1265 BLKFRASET = 0x1264 + BLKGETDISKSEQ = 0x80081280 BLKGETSIZE = 0x1260 BLKGETSIZE64 = 0x80041272 + BLKIOMIN = 0x1278 + BLKIOOPT = 0x1279 BLKPBSZGET = 0x127b BLKRAGET = 0x1263 BLKRASET = 0x1262 BLKROGET = 0x125e BLKROSET = 0x125d + BLKROTATIONAL = 0x127e BLKRRPART = 0x125f + BLKSECDISCARD = 0x127d BLKSECTGET = 0x1267 BLKSECTSET = 0x1266 BLKSSZGET = 0x1268 + BLKZEROOUT = 0x127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go index 12a9a1389..09e1ffbef 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x127a BLKBSZGET = 0x80081270 BLKBSZSET = 0x40081271 + BLKDISCARD = 0x1277 + BLKDISCARDZEROES = 0x127c BLKFLSBUF = 0x1261 BLKFRAGET = 0x1265 BLKFRASET = 0x1264 + BLKGETDISKSEQ = 0x80081280 BLKGETSIZE = 0x1260 BLKGETSIZE64 = 0x80081272 + BLKIOMIN = 0x1278 + BLKIOOPT = 0x1279 BLKPBSZGET = 0x127b BLKRAGET = 0x1263 BLKRASET = 0x1262 BLKROGET = 0x125e BLKROSET = 0x125d + BLKROTATIONAL = 0x127e BLKRRPART = 0x125f + BLKSECDISCARD = 0x127d BLKSECTGET = 0x1267 BLKSECTSET = 0x1266 BLKSSZGET = 0x1268 + BLKZEROOUT = 0x127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go index f26a164f4..a45723540 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x127a BLKBSZGET = 0x80081270 BLKBSZSET = 0x40081271 + BLKDISCARD = 0x1277 + BLKDISCARDZEROES = 0x127c BLKFLSBUF = 0x1261 BLKFRAGET = 0x1265 BLKFRASET = 0x1264 + BLKGETDISKSEQ = 0x80081280 BLKGETSIZE = 0x1260 BLKGETSIZE64 = 0x80081272 + BLKIOMIN = 0x1278 + BLKIOOPT = 0x1279 BLKPBSZGET = 0x127b BLKRAGET = 0x1263 BLKRASET = 0x1262 BLKROGET = 0x125e BLKROSET = 0x125d + BLKROTATIONAL = 0x127e BLKRRPART = 0x125f + BLKSECDISCARD = 0x127d BLKSECTGET = 0x1267 BLKSECTSET = 0x1266 BLKSSZGET = 0x1268 + BLKZEROOUT = 0x127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go index 890bc3c9b..fee7dfb81 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40041270 BLKBSZSET = 0x80041271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40041272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go index 549f26ac6..a5b2373ae 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40081270 BLKBSZSET = 0x80081271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40081272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go index e0365e32c..5dde82c98 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40081270 BLKBSZSET = 0x80081271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40081272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go index fdccce15c..2e80ea6b3 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40041270 BLKBSZSET = 0x80041271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40041272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go index b2205c83f..a65dcd7cb 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go @@ -27,22 +27,31 @@ const ( B57600 = 0x10 B576000 = 0x15 B921600 = 0x16 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40041270 BLKBSZSET = 0x80041271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40041272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1f BS1 = 0x8000 BSDLY = 0x8000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go index 81aa5ad0f..cbd34e3d8 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go @@ -27,22 +27,31 @@ const ( B57600 = 0x10 B576000 = 0x15 B921600 = 0x16 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40081270 BLKBSZSET = 0x80081271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40081272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1f BS1 = 0x8000 BSDLY = 0x8000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go index 76807a1fd..e4afa7a31 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go @@ -27,22 +27,31 @@ const ( B57600 = 0x10 B576000 = 0x15 B921600 = 0x16 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40081270 BLKBSZSET = 0x80081271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40081272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1f BS1 = 0x8000 BSDLY = 0x8000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go index d4a5ab9e4..44f45a039 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x127a BLKBSZGET = 0x80081270 BLKBSZSET = 0x40081271 + BLKDISCARD = 0x1277 + BLKDISCARDZEROES = 0x127c BLKFLSBUF = 0x1261 BLKFRAGET = 0x1265 BLKFRASET = 0x1264 + BLKGETDISKSEQ = 0x80081280 BLKGETSIZE = 0x1260 BLKGETSIZE64 = 0x80081272 + BLKIOMIN = 0x1278 + BLKIOOPT = 0x1279 BLKPBSZGET = 0x127b BLKRAGET = 0x1263 BLKRASET = 0x1262 BLKROGET = 0x125e BLKROSET = 0x125d + BLKROTATIONAL = 0x127e BLKRRPART = 0x125f + BLKSECDISCARD = 0x127d BLKSECTGET = 0x1267 BLKSECTSET = 0x1266 BLKSSZGET = 0x1268 + BLKZEROOUT = 0x127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go index 66e65db95..74733e260 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go @@ -27,22 +27,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x127a BLKBSZGET = 0x80081270 BLKBSZSET = 0x40081271 + BLKDISCARD = 0x1277 + BLKDISCARDZEROES = 0x127c BLKFLSBUF = 0x1261 BLKFRAGET = 0x1265 BLKFRASET = 0x1264 + BLKGETDISKSEQ = 0x80081280 BLKGETSIZE = 0x1260 BLKGETSIZE64 = 0x80081272 + BLKIOMIN = 0x1278 + BLKIOOPT = 0x1279 BLKPBSZGET = 0x127b BLKRAGET = 0x1263 BLKRASET = 0x1262 BLKROGET = 0x125e BLKROSET = 0x125d + BLKROTATIONAL = 0x127e BLKRRPART = 0x125f + BLKSECDISCARD = 0x127d BLKSECTGET = 0x1267 BLKSECTSET = 0x1266 BLKSSZGET = 0x1268 + BLKZEROOUT = 0x127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go index 48984202c..f5f3934b1 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go @@ -30,22 +30,31 @@ const ( B57600 = 0x1001 B576000 = 0x1006 B921600 = 0x1007 + BLKALIGNOFF = 0x2000127a BLKBSZGET = 0x40081270 BLKBSZSET = 0x80081271 + BLKDISCARD = 0x20001277 + BLKDISCARDZEROES = 0x2000127c BLKFLSBUF = 0x20001261 BLKFRAGET = 0x20001265 BLKFRASET = 0x20001264 + BLKGETDISKSEQ = 0x40081280 BLKGETSIZE = 0x20001260 BLKGETSIZE64 = 0x40081272 + BLKIOMIN = 0x20001278 + BLKIOOPT = 0x20001279 BLKPBSZGET = 0x2000127b BLKRAGET = 0x20001263 BLKRASET = 0x20001262 BLKROGET = 0x2000125e BLKROSET = 0x2000125d + BLKROTATIONAL = 0x2000127e BLKRRPART = 0x2000125f + BLKSECDISCARD = 0x2000127d BLKSECTGET = 0x20001267 BLKSECTSET = 0x20001266 BLKSSZGET = 0x20001268 + BLKZEROOUT = 0x2000127f BOTHER = 0x1000 BS1 = 0x2000 BSDLY = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go index 7ceec233f..a07321bed 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go @@ -1356,7 +1356,7 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) ( // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) { +func pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *sigset_argpack) (n int, err error) { r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask))) n = int(r0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go index 0b2923958..0ab4f2ed7 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go @@ -531,3 +531,19 @@ func kexecFileLoad(kernelFd int, initrdFd int, cmdlineLen int, cmdline string, f } return } + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func riscvHWProbe(pairs []RISCVHWProbePairs, cpuCount uintptr, cpus *CPUSet, flags uint) (err error) { + var _p0 unsafe.Pointer + if len(pairs) > 0 { + _p0 = unsafe.Pointer(&pairs[0]) + } else { + _p0 = unsafe.Pointer(&_zero) + } + _, _, e1 := Syscall6(SYS_RISCV_HWPROBE, uintptr(_p0), uintptr(len(pairs)), uintptr(cpuCount), uintptr(unsafe.Pointer(cpus)), uintptr(flags), 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go index cdb2af5ae..35f499b32 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go @@ -1858,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error } return } + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) { + r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0) + xaddr = uintptr(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go index 9d25f76b0..3cda65b0d 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go @@ -1858,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error } return } + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) { + r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0) + xaddr = uintptr(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go index d3f803516..1e1fea902 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go @@ -1858,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error } return } + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) { + r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0) + xaddr = uintptr(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go index 887188a52..3b77da110 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go @@ -1858,3 +1858,14 @@ func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error } return } + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func mremapNetBSD(oldp uintptr, oldsize uintptr, newp uintptr, newsize uintptr, flags int) (xaddr uintptr, err error) { + r0, _, e1 := Syscall6(SYS_MREMAP, uintptr(oldp), uintptr(oldsize), uintptr(newp), uintptr(newsize), uintptr(flags), 0) + xaddr = uintptr(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go index 3e594a8c0..ef285c567 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go @@ -251,6 +251,8 @@ const ( SYS_ACCEPT4 = 242 SYS_RECVMMSG = 243 SYS_ARCH_SPECIFIC_SYSCALL = 244 + SYS_RISCV_HWPROBE = 258 + SYS_RISCV_FLUSH_ICACHE = 259 SYS_WAIT4 = 260 SYS_PRLIMIT64 = 261 SYS_FANOTIFY_INIT = 262 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go index 02e2462c8..26ef52aaf 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -866,6 +866,11 @@ const ( POLLNVAL = 0x20 ) +type sigset_argpack struct { + ss *Sigset_t + ssLen uintptr +} + type SignalfdSiginfo struct { Signo uint32 Errno int32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go index 9ea54b7b8..83c69c119 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go @@ -718,3 +718,26 @@ type SysvShmDesc struct { _ uint64 _ uint64 } + +type RISCVHWProbePairs struct { + Key int64 + Value uint64 +} + +const ( + RISCV_HWPROBE_KEY_MVENDORID = 0x0 + RISCV_HWPROBE_KEY_MARCHID = 0x1 + RISCV_HWPROBE_KEY_MIMPID = 0x2 + RISCV_HWPROBE_KEY_BASE_BEHAVIOR = 0x3 + RISCV_HWPROBE_BASE_BEHAVIOR_IMA = 0x1 + RISCV_HWPROBE_KEY_IMA_EXT_0 = 0x4 + RISCV_HWPROBE_IMA_FD = 0x1 + RISCV_HWPROBE_IMA_C = 0x2 + RISCV_HWPROBE_KEY_CPUPERF_0 = 0x5 + RISCV_HWPROBE_MISALIGNED_UNKNOWN = 0x0 + RISCV_HWPROBE_MISALIGNED_EMULATED = 0x1 + RISCV_HWPROBE_MISALIGNED_SLOW = 0x2 + RISCV_HWPROBE_MISALIGNED_FAST = 0x3 + RISCV_HWPROBE_MISALIGNED_UNSUPPORTED = 0x4 + RISCV_HWPROBE_MISALIGNED_MASK = 0x7 +) diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go index 964590075..373d16388 100644 --- a/vendor/golang.org/x/sys/windows/syscall_windows.go +++ b/vendor/golang.org/x/sys/windows/syscall_windows.go @@ -135,14 +135,14 @@ func Getpagesize() int { return 4096 } // NewCallback converts a Go function to a function pointer conforming to the stdcall calling convention. // This is useful when interoperating with Windows code requiring callbacks. -// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr. +// The argument is expected to be a function with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr. func NewCallback(fn interface{}) uintptr { return syscall.NewCallback(fn) } // NewCallbackCDecl converts a Go function to a function pointer conforming to the cdecl calling convention. // This is useful when interoperating with Windows code requiring callbacks. -// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr. +// The argument is expected to be a function with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr. func NewCallbackCDecl(fn interface{}) uintptr { return syscall.NewCallbackCDecl(fn) } diff --git a/vendor/modules.txt b/vendor/modules.txt index a7c55468a..45f6eafa9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -33,47 +33,6 @@ github.com/fsmiamoto/git-todo-parser/todo # github.com/gdamore/encoding v1.0.0 ## explicit; go 1.9 github.com/gdamore/encoding -# github.com/gdamore/tcell/v2 v2.6.0 => github.com/stefanhaller/tcell/v2 v2.6.1 -## explicit; go 1.12 -github.com/gdamore/tcell/v2 -github.com/gdamore/tcell/v2/terminfo -github.com/gdamore/tcell/v2/terminfo/a/aixterm -github.com/gdamore/tcell/v2/terminfo/a/alacritty -github.com/gdamore/tcell/v2/terminfo/a/ansi -github.com/gdamore/tcell/v2/terminfo/b/beterm -github.com/gdamore/tcell/v2/terminfo/base -github.com/gdamore/tcell/v2/terminfo/c/cygwin -github.com/gdamore/tcell/v2/terminfo/d/dtterm -github.com/gdamore/tcell/v2/terminfo/dynamic -github.com/gdamore/tcell/v2/terminfo/e/emacs -github.com/gdamore/tcell/v2/terminfo/extended -github.com/gdamore/tcell/v2/terminfo/f/foot -github.com/gdamore/tcell/v2/terminfo/g/gnome -github.com/gdamore/tcell/v2/terminfo/h/hpterm -github.com/gdamore/tcell/v2/terminfo/k/konsole -github.com/gdamore/tcell/v2/terminfo/k/kterm -github.com/gdamore/tcell/v2/terminfo/l/linux -github.com/gdamore/tcell/v2/terminfo/p/pcansi -github.com/gdamore/tcell/v2/terminfo/r/rxvt -github.com/gdamore/tcell/v2/terminfo/s/screen -github.com/gdamore/tcell/v2/terminfo/s/simpleterm -github.com/gdamore/tcell/v2/terminfo/s/sun -github.com/gdamore/tcell/v2/terminfo/t/termite -github.com/gdamore/tcell/v2/terminfo/t/tmux -github.com/gdamore/tcell/v2/terminfo/v/vt100 -github.com/gdamore/tcell/v2/terminfo/v/vt102 -github.com/gdamore/tcell/v2/terminfo/v/vt220 -github.com/gdamore/tcell/v2/terminfo/v/vt320 -github.com/gdamore/tcell/v2/terminfo/v/vt400 -github.com/gdamore/tcell/v2/terminfo/v/vt420 -github.com/gdamore/tcell/v2/terminfo/v/vt52 -github.com/gdamore/tcell/v2/terminfo/w/wy50 -github.com/gdamore/tcell/v2/terminfo/w/wy60 -github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi -github.com/gdamore/tcell/v2/terminfo/x/xfce -github.com/gdamore/tcell/v2/terminfo/x/xterm -github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty -github.com/gdamore/tcell/v2/terminfo/x/xterm_termite # github.com/go-errors/errors v1.4.2 ## explicit; go 1.14 github.com/go-errors/errors @@ -165,7 +124,7 @@ github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem github.com/jesseduffield/go-git/v5/utils/merkletrie/index github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame github.com/jesseduffield/go-git/v5/utils/merkletrie/noder -# github.com/jesseduffield/gocui v0.3.1-0.20230802092815-ae0a5c181634 +# github.com/jesseduffield/gocui v0.3.1-0.20230806095321-ac7b03108825 ## explicit; go 1.12 github.com/jesseduffield/gocui # github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 @@ -255,6 +214,47 @@ github.com/spf13/afero/mem # github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad ## explicit github.com/spkg/bom +# github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68 +## explicit; go 1.12 +github.com/stefanhaller/tcell/v2 +github.com/stefanhaller/tcell/v2/terminfo +github.com/stefanhaller/tcell/v2/terminfo/a/aixterm +github.com/stefanhaller/tcell/v2/terminfo/a/alacritty +github.com/stefanhaller/tcell/v2/terminfo/a/ansi +github.com/stefanhaller/tcell/v2/terminfo/b/beterm +github.com/stefanhaller/tcell/v2/terminfo/base +github.com/stefanhaller/tcell/v2/terminfo/c/cygwin +github.com/stefanhaller/tcell/v2/terminfo/d/dtterm +github.com/stefanhaller/tcell/v2/terminfo/dynamic +github.com/stefanhaller/tcell/v2/terminfo/e/emacs +github.com/stefanhaller/tcell/v2/terminfo/extended +github.com/stefanhaller/tcell/v2/terminfo/f/foot +github.com/stefanhaller/tcell/v2/terminfo/g/gnome +github.com/stefanhaller/tcell/v2/terminfo/h/hpterm +github.com/stefanhaller/tcell/v2/terminfo/k/konsole +github.com/stefanhaller/tcell/v2/terminfo/k/kterm +github.com/stefanhaller/tcell/v2/terminfo/l/linux +github.com/stefanhaller/tcell/v2/terminfo/p/pcansi +github.com/stefanhaller/tcell/v2/terminfo/r/rxvt +github.com/stefanhaller/tcell/v2/terminfo/s/screen +github.com/stefanhaller/tcell/v2/terminfo/s/simpleterm +github.com/stefanhaller/tcell/v2/terminfo/s/sun +github.com/stefanhaller/tcell/v2/terminfo/t/termite +github.com/stefanhaller/tcell/v2/terminfo/t/tmux +github.com/stefanhaller/tcell/v2/terminfo/v/vt100 +github.com/stefanhaller/tcell/v2/terminfo/v/vt102 +github.com/stefanhaller/tcell/v2/terminfo/v/vt220 +github.com/stefanhaller/tcell/v2/terminfo/v/vt320 +github.com/stefanhaller/tcell/v2/terminfo/v/vt400 +github.com/stefanhaller/tcell/v2/terminfo/v/vt420 +github.com/stefanhaller/tcell/v2/terminfo/v/vt52 +github.com/stefanhaller/tcell/v2/terminfo/w/wy50 +github.com/stefanhaller/tcell/v2/terminfo/w/wy60 +github.com/stefanhaller/tcell/v2/terminfo/w/wy99_ansi +github.com/stefanhaller/tcell/v2/terminfo/x/xfce +github.com/stefanhaller/tcell/v2/terminfo/x/xterm +github.com/stefanhaller/tcell/v2/terminfo/x/xterm_kitty +github.com/stefanhaller/tcell/v2/terminfo/x/xterm_termite # github.com/stretchr/testify v1.8.0 ## explicit; go 1.13 github.com/stretchr/testify/assert @@ -293,17 +293,17 @@ golang.org/x/exp/slices golang.org/x/net/context golang.org/x/net/internal/socks golang.org/x/net/proxy -# golang.org/x/sys v0.10.0 +# golang.org/x/sys v0.11.0 ## explicit; go 1.17 golang.org/x/sys/cpu golang.org/x/sys/internal/unsafeheader golang.org/x/sys/plan9 golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/term v0.10.0 +# golang.org/x/term v0.11.0 ## explicit; go 1.17 golang.org/x/term -# golang.org/x/text v0.11.0 +# golang.org/x/text v0.12.0 ## explicit; go 1.17 golang.org/x/text/encoding golang.org/x/text/encoding/internal/identifier