diff --git a/Makefile b/Makefile index 89bd3d6..90cd049 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ #!/usr/bin/env gmake -f BUILDOPTS=-ldflags="-s -w" -a -gcflags=all=-l -trimpath -FILELIST=batteries.go clock.go collection.go config.go cputemp.go cron.go i3.go ifmon.go la.go main.go memory.go \ - pulseaudio.go signal.go spawn.go stdin.go vpn.go BINARY=i3status-go @@ -11,12 +9,12 @@ all: clean build ## This target compiles binary build: - go build ${BUILDOPTS} -o ${BINARY} ${FILELIST} + go build ${BUILDOPTS} -o ${BINARY} ./cmd/${BINARY} ## Remove binary with golang compiler' means clean: - go clean + rm -rf ${BINARY} ## Misc target, for development purposes. Updates vendored libs, brutal way. diff --git a/config_examples/example0.json b/configs/example0.json similarity index 100% rename from config_examples/example0.json rename to configs/example0.json diff --git a/config_examples/example1.json b/configs/example1.json similarity index 100% rename from config_examples/example1.json rename to configs/example1.json diff --git a/i3status-go-example.json b/configs/i3status-go-example.json similarity index 100% rename from i3status-go-example.json rename to configs/i3status-go-example.json diff --git a/go.mod b/go.mod index 1d8a528..5c55625 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ -module github.com/eleksir/i3status-go +module i3status-go -go 1.21 +go 1.22.6 require ( github.com/adrg/xdg v0.5.0 github.com/distatus/battery v0.11.0 - github.com/go-co-op/gocron/v2 v2.11.0 + github.com/go-co-op/gocron/v2 v2.12.1 github.com/hjson/hjson-go v3.3.0+incompatible github.com/mafik/pulseaudio v0.0.0-20240327130323-384e01075e6e github.com/shirou/gopsutil v3.21.11+incompatible @@ -13,14 +13,14 @@ require ( ) require ( - github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect - github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 // indirect - github.com/go-ole/go-ole v1.3.0 // indirect + github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 // indirect + github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e // indirect + github.com/go-ole/go-ole v1.2.6 // indirect github.com/google/uuid v1.6.0 // indirect github.com/jonboulle/clockwork v0.4.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect - golang.org/x/sys v0.25.0 // indirect - howett.net/plist v1.0.1 // indirect + golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/sys v0.22.0 // indirect + howett.net/plist v1.0.0 // indirect ) diff --git a/go.sum b/go.sum index a019e79..9bb65eb 100644 --- a/go.sum +++ b/go.sum @@ -1,20 +1,17 @@ +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc h1:7D+Bh06CRPCJO3gr2F7h1sriovOZ8BMhca2Rg85c2nk= -github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e h1:4ZrkT/RzpnROylmoQL57iVUL57wGKTR5O6KpVnbm2tA= github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e/go.mod h1:uw9h2sd4WWHOPdJ13MQpwK5qYWKYDumDqxWWIknEQ+k= -github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 h1:O/r2Sj+8QcMF7V5IcmiE2sMFV2q3J47BEirxbXJAdzA= -github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046/go.mod h1:uw9h2sd4WWHOPdJ13MQpwK5qYWKYDumDqxWWIknEQ+k= github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY= github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distatus/battery v0.11.0 h1:KJk89gz90Iq/wJtbjjM9yUzBXV+ASV/EG2WOOL7N8lc= github.com/distatus/battery v0.11.0/go.mod h1:KmVkE8A8hpIX4T78QRdMktYpEp35QfOL8A8dwZBxq2k= -github.com/go-co-op/gocron/v2 v2.11.0 h1:IOowNA6SzwdRFnD4/Ol3Kj6G2xKfsoiiGq2Jhhm9bvE= -github.com/go-co-op/gocron/v2 v2.11.0/go.mod h1:xY7bJxGazKam1cz04EebrlP4S9q4iWdiAylMGP3jY9w= +github.com/go-co-op/gocron/v2 v2.12.1 h1:dCIIBFbzhWKdgXeEifBjHPzgQ1hoWhjS4289Hjjy1uw= +github.com/go-co-op/gocron/v2 v2.12.1/go.mod h1:xY7bJxGazKam1cz04EebrlP4S9q4iWdiAylMGP3jY9w= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= -github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -41,19 +38,18 @@ go.i3wm.org/i3 v0.0.0-20190720062127-36e6ec85cc5a h1:yeQv6GWN8DsA2f3b+u1zhRIJg2H go.i3wm.org/i3 v0.0.0-20190720062127-36e6ec85cc5a/go.mod h1:7w17+r1F28Yxb1pHu8SxARJo+RGvJCAGOEf+GLw+2aQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= +golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= +golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM= -howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= +howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= +howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= diff --git a/batteries.go b/internal/lib/batteries.go similarity index 95% rename from batteries.go rename to internal/lib/batteries.go index 88887ec..42e3d17 100644 --- a/batteries.go +++ b/internal/lib/batteries.go @@ -1,4 +1,4 @@ -package main +package lib import ( "fmt" @@ -8,11 +8,8 @@ import ( "github.com/distatus/battery" ) -// Batt shows battery charge on i3bar. -var Batt = "⚡ ??% •" - // UpdateBatteryInfo updates info about battery charge. -func UpdateBatteryInfo() { +func (c MyConfig) UpdateBatteryInfo() { var ( ch int status string @@ -165,9 +162,9 @@ func UpdateBatteryInfo() { } } - if Batt == Batts { - Batt = Batts - UpdateReady <- true + if c.BatteryString == Batts { + c.BatteryString = Batts + c.UpdateReady <- true } time.Sleep(5 * time.Second) diff --git a/clock.go b/internal/lib/clock.go similarity index 77% rename from clock.go rename to internal/lib/clock.go index 62d9e0c..4f9b986 100644 --- a/clock.go +++ b/internal/lib/clock.go @@ -1,15 +1,12 @@ -package main +package lib import ( "fmt" "time" ) -// Clock shows current date and time on i3bar. -var Clock = "Thu, 1 Jan 1970 1:00" - // UpdateClock get and updates (on i3bar) info about system clock. -func UpdateClock() { +func (c MyConfig) UpdateClock() { for { currentTime := time.Now() hours, minutes, _ := currentTime.Clock() @@ -20,9 +17,9 @@ func UpdateClock() { myclock := fmt.Sprintf(" %s, %d %s %d % 2d:%02d ", rdow[dow], day, rmonth[month-1], year, hours, minutes) - if myclock != Clock { - Clock = myclock - UpdateReady <- true + if myclock != c.ClockTime { + c.ClockTime = myclock + c.UpdateReady <- true } time.Sleep(1 * time.Second) diff --git a/collection.go b/internal/lib/collection.go similarity index 99% rename from collection.go rename to internal/lib/collection.go index 5b7a00a..613d8da 100644 --- a/collection.go +++ b/internal/lib/collection.go @@ -1,4 +1,4 @@ -package main +package lib import ( "sync" diff --git a/config.go b/internal/lib/config.go similarity index 96% rename from config.go rename to internal/lib/config.go index 3245d4d..32979b0 100644 --- a/config.go +++ b/internal/lib/config.go @@ -1,4 +1,4 @@ -package main +package lib import ( "encoding/json" @@ -13,6 +13,29 @@ import ( "github.com/hjson/hjson-go" ) +// I3BarOutBlock is structure element for I3BarOut, it represents i3bar output json block format. +type I3BarOutBlock struct { + FullText string `json:"full_text"` + // ShortText will be shown if not enough room for FullText, threshold width defined in MinWidth + ShortText string `json:"short_text,omitempty"` + Color string `json:"color,omitempty"` + Background string `json:"background,omitempty"` + Border string `json:"border,omitempty"` + BorderTop int `json:"border_top"` + BorderRight int `json:"border_right"` + BorderBottom int `json:"border_bottom"` + BorderLeft int `json:"border_left"` + // measured either in pixels or in characters, so either int or string, let's make it string :) + MinWidth string `json:"min_width,omitempty"` + Align string `json:"align,omitempty"` + Name string `json:"name,omitempty"` + Instance string `json:"instance,omitempty"` + Urgent bool `json:"urgent,omitempty"` + Separator bool `json:"separator"` + SeparatorBlockWidth int `json:"separator_block_width"` + Markup string `json:"markup,omitempty"` +} + type Separator struct { Left struct { Enabled bool `json:"enabled,omitempty"` @@ -34,6 +57,17 @@ type Separator struct { } type MyConfig struct { + UpdateReady chan bool + PrintOutput bool + MsgChan chan []I3BarOutBlock + SigChan chan os.Signal + CPUTemperature int64 + BatteryString string + ClockTime string + IfStatus string + VPNStatus string + Memory Mem + La string // Default text color Color string `json:"color,omitempty"` @@ -211,7 +245,7 @@ var Conf MyConfig // readConf reads and validates config if config does not exist, it puts default config to the same dir where i3 config // is located. -func readConf() (MyConfig, error) { +func ReadConf(DefaultConfig []byte) (MyConfig, error) { var ( path string config MyConfig diff --git a/cputemp.go b/internal/lib/cputemp.go similarity index 86% rename from cputemp.go rename to internal/lib/cputemp.go index c662b90..306939e 100644 --- a/cputemp.go +++ b/internal/lib/cputemp.go @@ -1,4 +1,4 @@ -package main +package lib import ( "bufio" @@ -8,11 +8,8 @@ import ( "time" ) -// CPUTemperature stores average temperature among all cores. -var CPUTemperature int64 - // UpdateCPUTemperature gets and updates average CPU cores temperature. -func UpdateCPUTemperature() { +func (c MyConfig) UpdateCPUTemperature() { n := len(Conf.CPUTemp.File) for { @@ -70,9 +67,9 @@ func UpdateCPUTemperature() { tAvg = tSum / int64(len(temperature)) } - if CPUTemperature != tAvg { - CPUTemperature = tAvg - UpdateReady <- true + if c.CPUTemperature != tAvg { + c.CPUTemperature = tAvg + c.UpdateReady <- true } time.Sleep(3 * time.Second) diff --git a/cron.go b/internal/lib/cron.go similarity index 98% rename from cron.go rename to internal/lib/cron.go index e7914a7..2cbce41 100644 --- a/cron.go +++ b/internal/lib/cron.go @@ -1,4 +1,4 @@ -package main +package lib import ( "log" diff --git a/i3.go b/internal/lib/i3.go similarity index 94% rename from i3.go rename to internal/lib/i3.go index 9c277c0..83d50aa 100644 --- a/i3.go +++ b/internal/lib/i3.go @@ -1,4 +1,4 @@ -package main +package lib import ( "log" @@ -18,7 +18,7 @@ type WinList struct { var WL WinList // UpdateI3WinList subsribes to all window-related events and send them to I3EventParser() for more detailed parsing. -func UpdateI3WinList() { +func (c MyConfig) UpdateI3WinList() { // TODO: Здесь получить начальный список окон, управляемых i3wm (через GetTree()) и сложить их атрибутику в переменную WL Tree, err := i3.GetTree() @@ -26,20 +26,20 @@ func UpdateI3WinList() { log.Printf("Unable to get list of windows: %s", err) } - ExtractProps(Tree.Root) + c.ExtractProps(Tree.Root) i3wm := i3.Subscribe(i3.WindowEventType) for i3wm.Next() { e := i3wm.Event().(*i3.WindowEvent) - go I3EventParser(e) + go c.I3EventParser(e) } log.Fatal(i3wm.Close()) } // I3EventParser parses i3wm events and updates WL (aka Windows List). -func I3EventParser(e *i3.WindowEvent) { +func (c MyConfig) I3EventParser(e *i3.WindowEvent) { switch e.Change { case "new": var ( @@ -68,7 +68,7 @@ func I3EventParser(e *i3.WindowEvent) { count++ WL.Instance.Set(e.Container.WindowProperties.Instance, count) - UpdateReady <- true + c.UpdateReady <- true case "close": countI, exist := WL.Class.Get(e.Container.WindowProperties.Class) @@ -99,7 +99,7 @@ func I3EventParser(e *i3.WindowEvent) { } } - UpdateReady <- true + c.UpdateReady <- true } } @@ -210,18 +210,18 @@ func FindWindowClass(regexpStr string) bool { } // ExtractProps fills WL stricture collections with instance name and class name of given node (x11, that is). -func ExtractProps(n *i3.Node) { +func (c MyConfig) ExtractProps(n *i3.Node) { var e i3.WindowEvent e.Change = "new" e.Container = *n - I3EventParser(&e) + c.I3EventParser(&e) for _, node := range n.Nodes { - ExtractProps(node) + c.ExtractProps(node) } for _, node := range n.FloatingNodes { - ExtractProps(node) + c.ExtractProps(node) } } diff --git a/ifmon.go b/internal/lib/ifmon.go similarity index 89% rename from ifmon.go rename to internal/lib/ifmon.go index b8d9bf8..a1434d3 100644 --- a/ifmon.go +++ b/internal/lib/ifmon.go @@ -1,4 +1,4 @@ -package main +package lib import ( "fmt" @@ -13,7 +13,7 @@ import ( var IfStatus string // UpdateIfStatus updates network interfaces status for i3bar. -func UpdateIfStatus() { +func (c MyConfig) UpdateIfStatus() { for { var statusSum string @@ -52,9 +52,9 @@ func UpdateIfStatus() { statusSum += fmt.Sprintf("%s:%s", name, operstate) } - if IfStatus != statusSum { - IfStatus = statusSum - UpdateReady <- true + if c.IfStatus != statusSum { + c.IfStatus = statusSum + c.UpdateReady <- true } time.Sleep(3 * time.Second) diff --git a/la.go b/internal/lib/la.go similarity index 56% rename from la.go rename to internal/lib/la.go index 48c76a1..6d8308e 100644 --- a/la.go +++ b/internal/lib/la.go @@ -1,4 +1,4 @@ -package main +package lib import ( "fmt" @@ -7,19 +7,16 @@ import ( "github.com/shirou/gopsutil/load" ) -// La переменная, хранящая значение LA за последнюю минуту. -var La = "-1" - // UpdateLaStats вытаскивает показание LA за последнюю минуту. -func UpdateLaStats() { +func (c MyConfig) UpdateLaStats() { for { l, _ := load.Avg() lav := fmt.Sprintf("%.2f", l.Load1) - if La != lav { - La = lav - UpdateReady <- true + if c.La != lav { + c.La = lav + c.UpdateReady <- true } time.Sleep(3 * time.Second) diff --git a/memory.go b/internal/lib/memory.go similarity index 91% rename from memory.go rename to internal/lib/memory.go index dc9dbe0..2abe03e 100644 --- a/memory.go +++ b/internal/lib/memory.go @@ -1,4 +1,4 @@ -package main +package lib import ( "log" @@ -18,7 +18,7 @@ type Mem struct { var Memory Mem // UpdateMemStats parses mem info stats. -func UpdateMemStats() { +func (c MyConfig) UpdateMemStats() { for { v, err := mem.VirtualMemory() @@ -44,13 +44,13 @@ func UpdateMemStats() { Memory.Usedpct = uint64(v.UsedPercent) Memory.Shared = v.Shared / 1024 / 1024 Memory.Swap = sw.Used - UpdateReady <- true + c.UpdateReady <- true } } else { if Memory.Usedpct != uint64(v.UsedPercent) || Memory.Shared != v.Shared/1024/1024 { Memory.Usedpct = uint64(v.UsedPercent) Memory.Shared = v.Shared / 1024 / 1024 - UpdateReady <- true + c.UpdateReady <- true } } diff --git a/pulseaudio.go b/internal/lib/pulseaudio.go similarity index 87% rename from pulseaudio.go rename to internal/lib/pulseaudio.go index b13204b..0f45be1 100644 --- a/pulseaudio.go +++ b/internal/lib/pulseaudio.go @@ -1,4 +1,4 @@ -package main +package lib import ( "errors" @@ -18,7 +18,7 @@ var SVPAHandlerChan = make(chan ClickEvent, 256) // TODO: https://twin.sh/articles/44/add-a-timeout-to-any-function-in-go timeout pulseaudio calls // UpdateVolumeInfo updates info about current Sound Volume. -func UpdateVolumeInfo() { +func (c MyConfig) UpdateVolumeInfo() { var err error pa, err = p.NewClient() @@ -43,23 +43,23 @@ func UpdateVolumeInfo() { SoundVolume = fmt.Sprintf( "%s", - Conf.SimpleVolumePa.Color, - Conf.SimpleVolumePa.Background, - Conf.SimpleVolumePa.SymbolFont, - Conf.SimpleVolumePa.SymbolFontSize, - Conf.SimpleVolumePa.Symbol, + c.SimpleVolumePa.Color, + c.SimpleVolumePa.Background, + c.SimpleVolumePa.SymbolFont, + c.SimpleVolumePa.SymbolFontSize, + c.SimpleVolumePa.Symbol, ) SoundVolume += fmt.Sprintf( ":%d%%", - Conf.SimpleVolumePa.Color, - Conf.SimpleVolumePa.Background, - Conf.SimpleVolumePa.Font, - Conf.SimpleVolumePa.FontSize, + c.SimpleVolumePa.Color, + c.SimpleVolumePa.Background, + c.SimpleVolumePa.Font, + c.SimpleVolumePa.FontSize, int64(vol*100), ) - UpdateReady <- true + c.UpdateReady <- true for { // Subscribe to update notification channel, to get info that volume changed. @@ -83,23 +83,23 @@ func UpdateVolumeInfo() { SoundVolume = fmt.Sprintf( "%s", - Conf.SimpleVolumePa.Color, - Conf.SimpleVolumePa.Background, - Conf.SimpleVolumePa.SymbolFont, - Conf.SimpleVolumePa.SymbolFontSize, - Conf.SimpleVolumePa.Symbol, + c.SimpleVolumePa.Color, + c.SimpleVolumePa.Background, + c.SimpleVolumePa.SymbolFont, + c.SimpleVolumePa.SymbolFontSize, + c.SimpleVolumePa.Symbol, ) SoundVolume += fmt.Sprintf( ":%d%%", - Conf.SimpleVolumePa.Color, - Conf.SimpleVolumePa.Background, - Conf.SimpleVolumePa.Font, - Conf.SimpleVolumePa.FontSize, + c.SimpleVolumePa.Color, + c.SimpleVolumePa.Background, + c.SimpleVolumePa.Font, + c.SimpleVolumePa.FontSize, int64(vol*100), ) - UpdateReady <- true + c.UpdateReady <- true } if err := PaReinit(); err != nil { @@ -178,7 +178,7 @@ func PaReinit() error { return err } -func SVPAHandler() { +func (c MyConfig) SVPAHandler() { for e := range SVPAHandlerChan { if e.Button == 3 { RunChan <- Conf.SimpleVolumePa.RightClickCmd diff --git a/signal.go b/internal/lib/signal.go similarity index 74% rename from signal.go rename to internal/lib/signal.go index ea94087..857c890 100644 --- a/signal.go +++ b/internal/lib/signal.go @@ -1,4 +1,4 @@ -package main +package lib import ( "log" @@ -7,11 +7,10 @@ import ( ) var PrintOutput = true -var sigChan = make(chan os.Signal, 1) -// sigHandler OS signal handler. -func sigHandler() { - for s := range sigChan { +// SigHandler OS signal handler. +func (c MyConfig) SigHandler() { + for s := range c.SigChan { switch s { case syscall.SIGUSR1: log.Print("Got SIGUSR1, stopping output") @@ -23,7 +22,7 @@ func sigHandler() { PrintOutput = true - UpdateReady <- true + c.UpdateReady <- true case syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT: os.Exit(0) diff --git a/spawn.go b/internal/lib/spawn.go similarity index 93% rename from spawn.go rename to internal/lib/spawn.go index 77e292f..0a9a136 100644 --- a/spawn.go +++ b/internal/lib/spawn.go @@ -1,4 +1,4 @@ -package main +package lib import ( "log" @@ -12,7 +12,7 @@ import ( var RunChan = make(chan []string, 128) // Spawner forks and execs given program, and also detaches form its control tty. -func Spawner() { +func (c MyConfig) Spawner() { for prg := range RunChan { devnullR, _ := os.Open(os.DevNull) devnullW, _ := os.OpenFile(os.DevNull, os.O_WRONLY|os.O_APPEND, 0644) @@ -48,7 +48,7 @@ func Spawner() { } // CleanZombies reaps processes spawned by Spawner() and already exited. -func CleanZombies() { +func (c MyConfig) CleanZombies() { r := syscall.Rusage{} for { diff --git a/stdin.go b/internal/lib/stdin.go similarity index 98% rename from stdin.go rename to internal/lib/stdin.go index a07b825..401bf10 100644 --- a/stdin.go +++ b/internal/lib/stdin.go @@ -1,4 +1,4 @@ -package main +package lib import ( "bufio" @@ -26,7 +26,7 @@ type ClickEvent struct { // ParseStdin tries to parse text that i3bar prints to our stdin. Currently - it is mouse click events on different // area names of i3bar. -func ParseStdin() { +func (c MyConfig) ParseStdin() { reader := bufio.NewReader(os.Stdin) // De-facto it is jsonl, except first line is garbage. Also, first symbol in each strint garbage too. diff --git a/vpn.go b/internal/lib/vpn.go similarity index 61% rename from vpn.go rename to internal/lib/vpn.go index 1e60e3d..fb55f3c 100644 --- a/vpn.go +++ b/internal/lib/vpn.go @@ -1,4 +1,4 @@ -package main +package lib import ( "fmt" @@ -7,11 +7,8 @@ import ( "time" ) -// VPNStatus status string for i3bar, related to vpn. -var VPNStatus string - // UpdateVPNStatus periodically update status of openvpn daemon. -func UpdateVPNStatus() { +func (c MyConfig) UpdateVPNStatus() { var ( vpnCStatus string tcpCheck string @@ -19,32 +16,32 @@ func UpdateVPNStatus() { ) for { - if VPNFileCheck() { + if c.VPNFileCheck() { if Conf.Vpn.UpColor == "" { vpnCheck = `⍋` } else { - vpnCheck = fmt.Sprintf(`⍋`, Conf.Vpn.UpColor) + vpnCheck = fmt.Sprintf(`⍋`, c.Vpn.UpColor) } } else { if Conf.Vpn.DownColor == "" { vpnCheck = `⍒` } else { - vpnCheck = fmt.Sprintf(`⍒`, Conf.Vpn.DownColor) + vpnCheck = fmt.Sprintf(`⍒`, c.Vpn.DownColor) } } if Conf.Vpn.TCPCheck.Enabled { - if VPNTCPCheck() { + if c.VPNTCPCheck() { if Conf.Vpn.UpColor == "" { tcpCheck = `✔` } else { - tcpCheck = fmt.Sprintf(`✔`, Conf.Vpn.UpColor) + tcpCheck = fmt.Sprintf(`✔`, c.Vpn.UpColor) } } else { if Conf.Vpn.DownColor == "" { tcpCheck = `✘` } else { - tcpCheck = fmt.Sprintf(`✘`, Conf.Vpn.DownColor) + tcpCheck = fmt.Sprintf(`✘`, c.Vpn.DownColor) } } @@ -53,9 +50,9 @@ func UpdateVPNStatus() { vpnCStatus = fmt.Sprintf("VPN:%s", vpnCheck) } - if VPNStatus != vpnCStatus { - VPNStatus = vpnCStatus - UpdateReady <- true + if c.VPNStatus != vpnCStatus { + c.VPNStatus = vpnCStatus + c.UpdateReady <- true } time.Sleep(3 * time.Second) @@ -63,11 +60,11 @@ func UpdateVPNStatus() { } // VPNTCPCheck intended to check arbitrary service inside vpn segment, to indicate that openvpn sevice not stoned. -func VPNTCPCheck() bool { +func (c MyConfig) VPNTCPCheck() bool { conn, err := net.DialTimeout( "tcp", - fmt.Sprintf("%s:%d", Conf.Vpn.TCPCheck.Host, Conf.Vpn.TCPCheck.Port), - time.Second*time.Duration(Conf.Vpn.TCPCheck.Timeout), + fmt.Sprintf("%s:%d", c.Vpn.TCPCheck.Host, c.Vpn.TCPCheck.Port), + time.Second*time.Duration(c.Vpn.TCPCheck.Timeout), ) if err == nil { @@ -79,17 +76,17 @@ func VPNTCPCheck() bool { } // VPNFileCheck checks modification time of openvpn-status file. -func VPNFileCheck() bool { +func (c MyConfig) VPNFileCheck() bool { var ( fi os.FileInfo err error ) - if fi, err = os.Stat(Conf.Vpn.StatusFile); err != nil { + if fi, err = os.Stat(c.Vpn.StatusFile); err != nil { return false } - if time.Since(fi.ModTime()).Seconds() > float64(Conf.Vpn.MtimeThreshold) { + if time.Since(fi.ModTime()).Seconds() > float64(c.Vpn.MtimeThreshold) { return false } diff --git a/main.go b/main.go deleted file mode 100644 index 8887e10..0000000 --- a/main.go +++ /dev/null @@ -1,603 +0,0 @@ -package main - -import ( - "bytes" - "embed" - "encoding/json" - "fmt" - "log" - "os/signal" - "strings" - "syscall" -) - -// I3BarOutBlock is structure element for I3BarOut, it represents i3bar output json block format. -type I3BarOutBlock struct { - FullText string `json:"full_text"` - // ShortText will be shown if not enough room for FullText, threshold width defined in MinWidth - ShortText string `json:"short_text,omitempty"` - Color string `json:"color,omitempty"` - Background string `json:"background,omitempty"` - Border string `json:"border,omitempty"` - BorderTop int `json:"border_top"` - BorderRight int `json:"border_right"` - BorderBottom int `json:"border_bottom"` - BorderLeft int `json:"border_left"` - // measured either in pixels or in characters, so either int or string, let's make it string :) - MinWidth string `json:"min_width,omitempty"` - Align string `json:"align,omitempty"` - Name string `json:"name,omitempty"` - Instance string `json:"instance,omitempty"` - Urgent bool `json:"urgent,omitempty"` - Separator bool `json:"separator"` - SeparatorBlockWidth int `json:"separator_block_width"` - Markup string `json:"markup,omitempty"` -} - -// UpdateReady channel that "refreshes" i3bar (generates stdout json line). -var UpdateReady = make(chan bool) -var MsgChan = make(chan []I3BarOutBlock, 64) - -//go:embed i3status-go-example.json -var EmbeddedDefaultConfig embed.FS -var DefaultConfig []byte - -func init() { - DefaultConfig, _ = EmbeddedDefaultConfig.ReadFile("i3status-go-example.json") -} - -// Program entry point. -func main() { - var err error - - Conf, err = readConf() - - // TODO: Проставить дефолтные значения для глобальных переменных модулей. - Batt = fmt.Sprintf( - "%s", - Conf.Battery.Color, - Conf.Battery.Background, - Conf.Battery.SymbolFont, - Conf.Battery.SymbolFontSize, - Conf.Battery.Symbol, - ) - - Batt += fmt.Sprintf( - " ??%% •", - Conf.Battery.Color, - Conf.Battery.Background, - Conf.Battery.Font, - Conf.Battery.FontSize, - ) - - SoundVolume = fmt.Sprintf( - "🔊", - Conf.SimpleVolumePa.Color, - Conf.SimpleVolumePa.Background, - Conf.SimpleVolumePa.SymbolFont, - Conf.SimpleVolumePa.SymbolFontSize, - ) - - SoundVolume += fmt.Sprintf( - ":0%%", - Conf.SimpleVolumePa.Color, - Conf.SimpleVolumePa.Background, - Conf.SimpleVolumePa.Font, - Conf.SimpleVolumePa.FontSize, - ) - - Clock = fmt.Sprintf( - "Thu, 1 Jan 1970 1:00", - Conf.Clock.Color, - Conf.Clock.Background, - Conf.Clock.Font, - Conf.Clock.FontSize, - ) - - if err != nil { - log.Panicln(err) - } - - go Spawner() - go ParseStdin() - go CleanZombies() - go SVPAHandler() - go PrintToI3bar() - - if Conf.AppButtons.Enabled { - go UpdateI3WinList() - } - - // Kick signal handler - go sigHandler() - signal.Notify(sigChan, - syscall.SIGUSR1, - syscall.SIGUSR2, - syscall.SIGQUIT, - syscall.SIGTERM, - syscall.SIGINT) - - // Populate memory stats - if Conf.Mem.Enabled { - go UpdateMemStats() - } - - // Populate LA stats - if Conf.LA.Enabled { - go UpdateLaStats() - } - - // Populate CPUTemperature - if Conf.CPUTemp.Enabled { - go UpdateCPUTemperature() - } - - // Populate Clock - if Conf.Clock.Enabled { - go UpdateClock() - } - - if Conf.Battery.Enabled { - go UpdateBatteryInfo() - } - - if Conf.SimpleVolumePa.Enabled { - go UpdateVolumeInfo() - } - - if Conf.NetIf.Enabled { - go UpdateIfStatus() - } - - if Conf.Cron.Enabled { - go RunCron() - } - - if Conf.Vpn.Enabled { - go UpdateVPNStatus() - } - - /* - I3bar documentation pretends that message protocol must be valid json. In practice, we only have to print valid - header, empty json array and (potentially infinite) json lines (line that is valid json by itself) that is - actually json arrays. We do not need to *close* this json at all. - Gracefully closed json required when i3bar initiates our program to stop|quit, this (should) happens just before - i3bar itself terminating. So we don't care. - */ - - // Print header and one empty message and wait for updates - fmt.Printf( - "{\"version\": 1, \"stop_signal\": %d, \"cont_signal\": %d, \"click_events\": true}\n", - syscall.SIGUSR1, - syscall.SIGUSR2, - ) - - fmt.Println("[ [],") - - for { - if <-UpdateReady { - // Actually build json struct, marshal it and print result - var j []I3BarOutBlock - - // TODO: впилить для первого и последнего батона separator - if Conf.AppButtons.Enabled { - for num, app := range Conf.Apps { - var b I3BarOutBlock - - if num == 0 { - b.FullText = fmt.Sprintf( - "%s", - Conf.AppButtons.Separator.Left.Color, - Conf.AppButtons.Separator.Left.Background, - Conf.AppButtons.Separator.Left.Font, - Conf.AppButtons.Separator.Left.FontSize, - Conf.AppButtons.Separator.Left.Symbol, - ) - } - - b.FullText = app.FullText - - if num == len(Conf.Apps) { - b.FullText = fmt.Sprintf( - "%s", - Conf.AppButtons.Separator.Right.Color, - Conf.AppButtons.Separator.Right.Background, - Conf.AppButtons.Separator.Right.Font, - Conf.AppButtons.Separator.Right.FontSize, - Conf.AppButtons.Separator.Right.Symbol, - ) - } - - b.Background = app.Background - b.Color = app.Color - b.Instance = app.Instance - b.Markup = `pango` - b.Separator = app.Separator - b.SeparatorBlockWidth = app.SeparatorBlockWidth - b.Name = app.Name - - if HasWindows(app.Class, app.Instance) { - b.Border = app.BorderActive - } else { - b.Border = app.Border - } - - b.BorderTop = 1 - b.BorderRight = 1 - b.BorderBottom = 1 - b.BorderLeft = 1 - - j = append(j, b) - } - } - - if Conf.CPUTemp.Enabled { - var b I3BarOutBlock - - b.Color = Conf.CPUTemp.Color - b.Background = Conf.CPUTemp.Background - - if Conf.CPUTemp.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.CPUTemp.Separator.Left.Color, - Conf.CPUTemp.Separator.Left.Background, - Conf.CPUTemp.Separator.Left.Font, - Conf.CPUTemp.Separator.Left.FontSize, - Conf.CPUTemp.Separator.Left.Symbol, - ) - } - - b.FullText += fmt.Sprintf( - "CPU: %d°", - Conf.CPUTemp.Color, - Conf.CPUTemp.Background, - Conf.CPUTemp.Font, - Conf.CPUTemp.FontSize, - CPUTemperature, - ) - - if Conf.CPUTemp.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.CPUTemp.Separator.Right.Color, - Conf.CPUTemp.Separator.Right.Background, - Conf.CPUTemp.Separator.Right.Font, - Conf.CPUTemp.Separator.Right.FontSize, - Conf.CPUTemp.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if Conf.Mem.Enabled { - var b I3BarOutBlock - - b.Color = Conf.Mem.Color - b.Background = Conf.Mem.Background - - if Conf.Mem.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.Mem.Separator.Left.Color, - Conf.Mem.Separator.Left.Background, - Conf.Mem.Separator.Left.Font, - Conf.Mem.Separator.Left.FontSize, - Conf.Mem.Separator.Left.Symbol, - ) - } - - if Conf.Mem.ShowSwap { - b.FullText += fmt.Sprintf( - "M:%d%% SHM:%dM SW:%dM", - Conf.Mem.Color, - Conf.Mem.Background, - Conf.Mem.Font, - Conf.Mem.FontSize, - Memory.Usedpct, - Memory.Shared, - Memory.Swap, - ) - } else { - b.FullText += fmt.Sprintf( - "M:%d%% SHM:%dM", - Conf.Mem.Color, - Conf.Mem.Background, - Conf.Mem.Font, - Conf.Mem.FontSize, - Memory.Usedpct, - Memory.Shared, - ) - } - - if Conf.Mem.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.Mem.Separator.Right.Color, - Conf.Mem.Separator.Right.Background, - Conf.Mem.Separator.Right.Font, - Conf.Mem.Separator.Right.FontSize, - Conf.Mem.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if Conf.LA.Enabled { - var b I3BarOutBlock - - b.Color = Conf.LA.Color - b.Background = Conf.LA.Background - - if Conf.LA.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.LA.Separator.Left.Color, - Conf.LA.Separator.Left.Background, - Conf.LA.Separator.Left.Font, - Conf.LA.Separator.Left.FontSize, - Conf.LA.Separator.Left.Symbol, - ) - } - - b.FullText += fmt.Sprintf( - "LA:%s", - Conf.LA.Color, - Conf.LA.Background, - Conf.LA.Font, - Conf.LA.FontSize, - La, - ) - - if Conf.LA.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.LA.Separator.Right.Color, - Conf.LA.Separator.Right.Background, - Conf.LA.Separator.Right.Font, - Conf.LA.Separator.Right.FontSize, - Conf.LA.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if Conf.NetIf.Enabled { - var b I3BarOutBlock - - b.Color = Conf.NetIf.Color - b.Background = Conf.NetIf.Background - - if Conf.NetIf.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.NetIf.Separator.Left.Color, - Conf.NetIf.Separator.Left.Background, - Conf.NetIf.Separator.Left.Font, - Conf.NetIf.Separator.Left.FontSize, - Conf.NetIf.Separator.Left.Symbol, - ) - } - - b.FullText += fmt.Sprintf( - "%s", - Conf.NetIf.Color, - Conf.NetIf.Background, - Conf.NetIf.Font, - Conf.NetIf.FontSize, - IfStatus, - ) - - if Conf.NetIf.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.NetIf.Separator.Right.Color, - Conf.NetIf.Separator.Right.Background, - Conf.NetIf.Separator.Right.Font, - Conf.NetIf.Separator.Right.FontSize, - Conf.NetIf.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if Conf.Vpn.Enabled { - var b I3BarOutBlock - - b.Color = Conf.Vpn.Color - b.Background = Conf.Vpn.Background - - if Conf.Vpn.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.Vpn.Separator.Left.Color, - Conf.Vpn.Separator.Left.Background, - Conf.Vpn.Separator.Left.Font, - Conf.Vpn.Separator.Left.FontSize, - Conf.Vpn.Separator.Left.Symbol, - ) - } - - b.FullText += fmt.Sprintf( - "%s", - Conf.Vpn.Color, - Conf.Vpn.Background, - Conf.Vpn.Font, - Conf.Vpn.FontSize, - VPNStatus, - ) - - if Conf.Vpn.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.Vpn.Separator.Right.Color, - Conf.Vpn.Separator.Right.Background, - Conf.Vpn.Separator.Right.Font, - Conf.Vpn.Separator.Right.FontSize, - Conf.Vpn.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if Conf.Battery.Enabled { - var b I3BarOutBlock - - b.Color = Conf.Battery.Color - b.Background = Conf.Battery.Background - - if Conf.Battery.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.Battery.Separator.Left.Color, - Conf.Battery.Separator.Left.Background, - Conf.Battery.Separator.Left.Font, - Conf.Battery.Separator.Left.FontSize, - Conf.Battery.Separator.Left.Symbol, - ) - } - - b.FullText += Batt - - if Conf.Battery.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.Battery.Separator.Right.Color, - Conf.Battery.Separator.Right.Background, - Conf.Battery.Separator.Right.Font, - Conf.Battery.Separator.Right.FontSize, - Conf.Battery.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if Conf.SimpleVolumePa.Enabled { - var b I3BarOutBlock - - b.Name = "simple-volume-pa" - b.Color = Conf.SimpleVolumePa.Color - b.Background = Conf.SimpleVolumePa.Background - - if Conf.SimpleVolumePa.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.SimpleVolumePa.Separator.Left.Color, - Conf.SimpleVolumePa.Separator.Left.Background, - Conf.SimpleVolumePa.Separator.Left.Font, - Conf.SimpleVolumePa.Separator.Left.FontSize, - Conf.SimpleVolumePa.Separator.Left.Symbol, - ) - } - - // Pango format is already applied in plugin src. - b.FullText += SoundVolume - - if Conf.SimpleVolumePa.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.SimpleVolumePa.Separator.Right.Color, - Conf.SimpleVolumePa.Separator.Right.Background, - Conf.SimpleVolumePa.Separator.Right.Font, - Conf.SimpleVolumePa.Separator.Right.FontSize, - Conf.SimpleVolumePa.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if Conf.Clock.Enabled { - var b I3BarOutBlock - - b.Name = `wallclock` - b.Color = Conf.Clock.Color - b.Background = Conf.Clock.Background - - if Conf.Clock.Separator.Left.Enabled { - b.FullText = fmt.Sprintf( - "%s", - Conf.Clock.Separator.Left.Color, - Conf.Clock.Separator.Left.Background, - Conf.Clock.Separator.Left.Font, - Conf.Clock.Separator.Left.FontSize, - Conf.Clock.Separator.Left.Symbol, - ) - } - - b.FullText += fmt.Sprintf( - "%s", - Conf.Clock.Color, - Conf.Clock.Background, - Conf.Clock.Font, - Conf.Clock.FontSize, - Clock, - ) - - if Conf.Clock.Separator.Right.Enabled { - b.FullText += fmt.Sprintf( - "%s", - Conf.Clock.Separator.Right.Color, - Conf.Clock.Separator.Right.Background, - Conf.Clock.Separator.Right.Font, - Conf.Clock.Separator.Right.FontSize, - Conf.Clock.Separator.Right.Symbol, - ) - } - - b.Markup = "pango" - b.Separator = false - - j = append(j, b) - } - - if PrintOutput && len(j) > 0 { - MsgChan <- j - } - } - } -} - -// PrintToI3bar prints info to stdout according to ipc docs (https://i3wm.org/docs/i3bar-protocol.html) -func PrintToI3bar() { - for message := range MsgChan { - // we do not need to html-encode output, json.Marshal does this forcefully, so invent our own Marshal - buf := new(bytes.Buffer) - encoder := json.NewEncoder(buf) - encoder.SetEscapeHTML(false) - err := encoder.Encode(message) - - if err != nil { - log.Printf("Unable to json-encode message, %s\n", err) - } - - fmt.Println(strings.TrimSuffix(buf.String(), "\n") + ",") - } -} diff --git a/vendor/github.com/BurntSushi/xgb/README b/vendor/github.com/BurntSushi/xgb/README index e0bd8a2..c96a5fb 100644 --- a/vendor/github.com/BurntSushi/xgb/README +++ b/vendor/github.com/BurntSushi/xgb/README @@ -1,8 +1,3 @@ -Note that this project is largely unmaintained as I don't have the time to do -or support more development. Please consider using this fork instead: -https://github.com/jezek/xgb - - XGB is the X Go Binding, which is a low-level API to communicate with the core X protocol and many of the X extensions. It is closely modeled after XCB and xpyb. @@ -25,7 +20,7 @@ BurntSushi's Fork I've forked the XGB repository from Google Code due to inactivty upstream. Godoc documentation can be found here: -https://godoc.org/github.com/BurntSushi/xgb +http://godoc.burntsushi.net/pkg/github.com/BurntSushi/xgb/ Much of the code has been rewritten in an effort to support thread safety and multiple extensions. Namely, go_client.py has been thrown away in favor diff --git a/vendor/github.com/BurntSushi/xgb/conn.go b/vendor/github.com/BurntSushi/xgb/conn.go index f1b85c0..1b7d838 100644 --- a/vendor/github.com/BurntSushi/xgb/conn.go +++ b/vendor/github.com/BurntSushi/xgb/conn.go @@ -168,14 +168,13 @@ func (c *Conn) dial(display string) error { // Connect to server if len(socket) != 0 { c.conn, err = net.Dial("unix", socket+":"+c.display) - } else if len(c.host) != 0 && c.host != "unix" { + } else if len(c.host) != 0 { if protocol == "" { protocol = "tcp" } c.conn, err = net.Dial(protocol, c.host+":"+strconv.Itoa(6000+c.DisplayNumber)) } else { - c.host = "" c.conn, err = net.Dial("unix", "/tmp/.X11-unix/X"+c.display) } diff --git a/vendor/github.com/BurntSushi/xgbutil/README b/vendor/github.com/BurntSushi/xgbutil/README index a31507a..f898b55 100644 --- a/vendor/github.com/BurntSushi/xgbutil/README +++ b/vendor/github.com/BurntSushi/xgbutil/README @@ -1,18 +1,18 @@ -xgbutil is a utility library designed to work with the X Go Binding. This -project's main goal is to make various X related tasks easier. For example, -binding keys, using the EWMH or ICCCM specs with the window manager, +xgbutil is a utility library designed to work with the X Go Binding. This +project's main goal is to make various X related tasks easier. For example, +binding keys, using the EWMH or ICCCM specs with the window manager, moving/resizing windows, assigning function callbacks to particular events, drawing images to a window, etc. -xgbutil attempts to be thread safe, but it has not been completely tested in -this regard. In general, the X event loop implemented in the xevent package is -sequential. The idea is to be sequential by default, and let the user spawn -concurrent code at their discretion. (i.e., the complexity of making the main +xgbutil attempts to be thread safe, but it has not been completely tested in +this regard. In general, the X event loop implemented in the xevent package is +sequential. The idea is to be sequential by default, and let the user spawn +concurrent code at their discretion. (i.e., the complexity of making the main event loop generally concurrent is vast.) You may sleep safely at night by assuming that XGB is thread safe, though. -To start using xgbutil, you should have at least a passing familiarity with X. +To start using xgbutil, you should have at least a passing familiarity with X. Your first stop should be the examples directory. Installation @@ -31,24 +31,29 @@ Quick Example go get github.com/BurntSushi/xgbutil/_examples/window-name-sizes "$GOPATH"/bin/window-name-sizes -The output will be a list of names of all top-level windows and their geometry -including window manager decorations. (Assuming your window manager supports +The output will be a list of names of all top-level windows and their geometry +including window manager decorations. (Assuming your window manager supports some basic EWMH properties.) Documentation ============= -https://godoc.org/github.com/BurntSushi/xgbutil +gopkgdoc is well-suited to provide documentation for xgbutil. Its cross-package +hyperlinking on types is also extremely useful, since much of xgbutil relies on +XGB. + +With that said, documentation is also hosted here: +http://godoc.burntsushi.net/pkg/github.com/BurntSushi/xgbutil/ Examples ======== -There are several examples in the examples directory covering common use cases. +There are several examples in the examples directory covering common use cases. They are heavily documented and should run out of the box. Python ====== -An older project of mine, xpybutil, served as inspiration for xgbutil. If you -want to use Python, xpybutil should help quite a bit. Please note though, that -at this point, xgbutil provides a lot more functionality and is much better +An older project of mine, xpybutil, served as inspiration for xgbutil. If you +want to use Python, xpybutil should help quite a bit. Please note though, that +at this point, xgbutil provides a lot more functionality and is much better documented. xpybutil project URL: https://github.com/BurntSushi/xpybutil diff --git a/vendor/github.com/go-co-op/gocron/v2/errors.go b/vendor/github.com/go-co-op/gocron/v2/errors.go index 5378125..04c3ffa 100644 --- a/vendor/github.com/go-co-op/gocron/v2/errors.go +++ b/vendor/github.com/go-co-op/gocron/v2/errors.go @@ -4,6 +4,7 @@ import "fmt" // Public error definitions var ( + ErrCronJobInvalid = fmt.Errorf("gocron: CronJob: invalid crontab") ErrCronJobParse = fmt.Errorf("gocron: CronJob: crontab parse failure") ErrDailyJobAtTimeNil = fmt.Errorf("gocron: DailyJob: atTime within atTimes must not be nil") ErrDailyJobAtTimesNil = fmt.Errorf("gocron: DailyJob: atTimes must not be nil") diff --git a/vendor/github.com/go-co-op/gocron/v2/executor.go b/vendor/github.com/go-co-op/gocron/v2/executor.go index 1b13285..ae346b1 100644 --- a/vendor/github.com/go-co-op/gocron/v2/executor.go +++ b/vendor/github.com/go-co-op/gocron/v2/executor.go @@ -196,7 +196,7 @@ func (e *executor) start() { default: // runner is busy, reschedule the work for later // which means we just skip it here and do nothing - // TODO when metrics are added, this should increment a rescheduled metric + e.incrementJobCounter(*j, SingletonRescheduled) e.sendOutForRescheduling(&jIn) } } else { @@ -397,9 +397,7 @@ func (e *executor) runJob(j internalJob, jIn jobIn) { startTime := time.Now() err := e.callJobWithRecover(j) - if e.monitor != nil { - e.monitor.RecordJobTiming(startTime, time.Now(), j.id, j.name, j.tags) - } + e.recordJobTiming(startTime, time.Now(), j) if err != nil { _ = callJobFuncWithParams(j.afterJobRunsWithError, j.id, j.name, err) e.incrementJobCounter(j, Fail) @@ -422,6 +420,12 @@ func (e *executor) callJobWithRecover(j internalJob) (err error) { return callJobFuncWithParams(j.function, j.parameters...) } +func (e *executor) recordJobTiming(start time.Time, end time.Time, j internalJob) { + if e.monitor != nil { + e.monitor.RecordJobTiming(start, end, j.id, j.name, j.tags) + } +} + func (e *executor) incrementJobCounter(j internalJob, status JobStatus) { if e.monitor != nil { e.monitor.IncrementJob(j.id, j.name, j.tags, status) diff --git a/vendor/github.com/go-co-op/gocron/v2/job.go b/vendor/github.com/go-co-op/gocron/v2/job.go index 6f09f3d..ee206af 100644 --- a/vendor/github.com/go-co-op/gocron/v2/job.go +++ b/vendor/github.com/go-co-op/gocron/v2/job.go @@ -116,7 +116,7 @@ type cronJobDefinition struct { withSeconds bool } -func (c cronJobDefinition) setup(j *internalJob, location *time.Location, _ time.Time) error { +func (c cronJobDefinition) setup(j *internalJob, location *time.Location, now time.Time) error { var withLocation string if strings.HasPrefix(c.crontab, "TZ=") || strings.HasPrefix(c.crontab, "CRON_TZ=") { withLocation = c.crontab @@ -140,6 +140,9 @@ func (c cronJobDefinition) setup(j *internalJob, location *time.Location, _ time if err != nil { return errors.Join(ErrCronJobParse, err) } + if cronSchedule.Next(now).IsZero() { + return ErrCronJobInvalid + } j.jobSchedule = &cronJob{cronSchedule: cronSchedule} return nil @@ -456,6 +459,8 @@ type oneTimeJobDefinition struct { func (o oneTimeJobDefinition) setup(j *internalJob, _ *time.Location, now time.Time) error { sortedTimes := o.startAt(j) slices.SortStableFunc(sortedTimes, ascendingTime) + // deduplicate the times + sortedTimes = removeSliceDuplicatesTimeOnSortedSlice(sortedTimes) // keep only schedules that are in the future idx, found := slices.BinarySearchFunc(sortedTimes, now, ascendingTime) if found { @@ -469,6 +474,16 @@ func (o oneTimeJobDefinition) setup(j *internalJob, _ *time.Location, now time.T return nil } +func removeSliceDuplicatesTimeOnSortedSlice(times []time.Time) []time.Time { + ret := make([]time.Time, 0, len(times)) + for i, t := range times { + if i == 0 || t != times[i-1] { + ret = append(ret, t) + } + } + return ret +} + // OneTimeJobStartAtOption defines when the one time job is run type OneTimeJobStartAtOption func(*internalJob) []time.Time diff --git a/vendor/github.com/go-co-op/gocron/v2/monitor.go b/vendor/github.com/go-co-op/gocron/v2/monitor.go index ecf2880..d3c5bbd 100644 --- a/vendor/github.com/go-co-op/gocron/v2/monitor.go +++ b/vendor/github.com/go-co-op/gocron/v2/monitor.go @@ -11,9 +11,10 @@ type JobStatus string // The different statuses of job that can be used. const ( - Fail JobStatus = "fail" - Success JobStatus = "success" - Skip JobStatus = "skip" + Fail JobStatus = "fail" + Success JobStatus = "success" + Skip JobStatus = "skip" + SingletonRescheduled JobStatus = "singleton_rescheduled" ) // Monitor represents the interface to collect jobs metrics. diff --git a/vendor/github.com/go-co-op/gocron/v2/scheduler.go b/vendor/github.com/go-co-op/gocron/v2/scheduler.go index 4131747..90ff521 100644 --- a/vendor/github.com/go-co-op/gocron/v2/scheduler.go +++ b/vendor/github.com/go-co-op/gocron/v2/scheduler.go @@ -311,7 +311,7 @@ func (s *scheduler) selectRemoveJob(id uuid.UUID) { } // Jobs coming back from the executor to the scheduler that -// need to evaluated for rescheduling. +// need to be evaluated for rescheduling. func (s *scheduler) selectExecJobsOutForRescheduling(id uuid.UUID) { select { case <-s.shutdownCtx.Done(): @@ -359,6 +359,13 @@ func (s *scheduler) selectExecJobsOutForRescheduling(id uuid.UUID) { next = j.next(next) } } + + // Clean up any existing timer to prevent leaks + if j.timer != nil { + j.timer.Stop() + j.timer = nil // Ensure timer is cleared for GC + } + j.nextScheduled = append(j.nextScheduled, next) j.timer = s.exec.clock.AfterFunc(next.Sub(s.now()), func() { // set the actual timer on the job here and listen for diff --git a/vendor/github.com/go-ole/go-ole/SECURITY.md b/vendor/github.com/go-ole/go-ole/SECURITY.md deleted file mode 100644 index dac2815..0000000 --- a/vendor/github.com/go-ole/go-ole/SECURITY.md +++ /dev/null @@ -1,13 +0,0 @@ -# Security Policy - -## Supported Versions - -Security updates are applied only to the latest release. - -## Reporting a Vulnerability - -If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released. - -Please disclose it at [security advisory](https://github.com/go-ole/go-ole/security/advisories/new). - -This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure. diff --git a/vendor/github.com/go-ole/go-ole/appveyor.yml b/vendor/github.com/go-ole/go-ole/appveyor.yml index 8df7fa2..0d557ac 100644 --- a/vendor/github.com/go-ole/go-ole/appveyor.yml +++ b/vendor/github.com/go-ole/go-ole/appveyor.yml @@ -6,29 +6,7 @@ version: "1.3.0.{build}-alpha-{branch}" -os: Visual Studio 2019 - -build: off - -skip_tags: true - -clone_folder: c:\gopath\src\github.com\go-ole\go-ole - -environment: - GOPATH: c:\gopath - GOROOT: c:\go - DOWNLOADPLATFORM: "x64" - -before_test: - # - Download COM Server - - ps: Start-FileDownload "https://github.com/go-ole/test-com-server/releases/download/v1.0.2/test-com-server-${env:DOWNLOADPLATFORM}.zip" - - 7z e test-com-server-%DOWNLOADPLATFORM%.zip -oc:\gopath\src\github.com\go-ole\go-ole > NUL - - c:\gopath\src\github.com\go-ole\go-ole\build\register-assembly.bat - -test_script: - - go test -v -cover ./... - # go vet has false positives on unsafe.Pointer with windows/sys. Disabling since it is recommended to use go test instead. - # - go vet ./... +os: Windows Server 2012 R2 branches: only: @@ -37,19 +15,26 @@ branches: - v1.1 - v1.0 -matrix: - allow_failures: - - environment: - GOROOT: C:\go-x86 - DOWNLOADPLATFORM: "x86" - - environment: - GOROOT: C:\go118 - DOWNLOADPLATFORM: "x64" - - environment: - GOROOT: C:\go118-x86 - DOWNLOADPLATFORM: "x86" +skip_tags: true + +clone_folder: c:\gopath\src\github.com\go-ole\go-ole + +environment: + GOPATH: c:\gopath + matrix: + - GOARCH: amd64 + GOVERSION: 1.5 + GOROOT: c:\go + DOWNLOADPLATFORM: "x64" install: + - choco install mingw + - SET PATH=c:\tools\mingw64\bin;%PATH% + # - Download COM Server + - ps: Start-FileDownload "https://github.com/go-ole/test-com-server/releases/download/v1.0.2/test-com-server-${env:DOWNLOADPLATFORM}.zip" + - 7z e test-com-server-%DOWNLOADPLATFORM%.zip -oc:\gopath\src\github.com\go-ole\go-ole > NUL + - c:\gopath\src\github.com\go-ole\go-ole\build\register-assembly.bat + # - set - go version - go env - go get -u golang.org/x/tools/cmd/cover @@ -60,9 +45,10 @@ build_script: - cd c:\gopath\src\github.com\go-ole\go-ole - go get -v -t ./... - go build + - go test -v -cover ./... # disable automatic tests -test: on +test: off # disable deployment deploy: off diff --git a/vendor/github.com/go-ole/go-ole/com.go b/vendor/github.com/go-ole/go-ole/com.go index cabbac0..a9bef15 100644 --- a/vendor/github.com/go-ole/go-ole/com.go +++ b/vendor/github.com/go-ole/go-ole/com.go @@ -11,7 +11,6 @@ import ( var ( procCoInitialize = modole32.NewProc("CoInitialize") procCoInitializeEx = modole32.NewProc("CoInitializeEx") - procCoInitializeSecurity = modole32.NewProc("CoInitializeSecurity") procCoUninitialize = modole32.NewProc("CoUninitialize") procCoCreateInstance = modole32.NewProc("CoCreateInstance") procCoTaskMemFree = modole32.NewProc("CoTaskMemFree") @@ -38,9 +37,6 @@ var ( procDispatchMessageW = moduser32.NewProc("DispatchMessageW") ) -// This is to enable calling COM Security initialization multiple times -var bSecurityInit bool = false - // coInitialize initializes COM library on current thread. // // MSDN documentation suggests that this function should not be called. Call @@ -72,35 +68,6 @@ func coInitializeEx(coinit uint32) (err error) { return } -// coInitializeSecurity: Registers security and sets the default security values -// for the process. -func coInitializeSecurity(cAuthSvc int32, - dwAuthnLevel uint32, - dwImpLevel uint32, - dwCapabilities uint32) (err error) { - // Check COM Security initialization has done previously - if !bSecurityInit { - // https://learn.microsoft.com/en-us/windows/win32/api/combaseapi/nf-combaseapi-coinitializesecurity - hr, _, _ := procCoInitializeSecurity.Call( - uintptr(0), // Allow *all* VSS writers to communicate back! - uintptr(cAuthSvc), // Default COM authentication service - uintptr(0), // Default COM authorization service - uintptr(0), // Reserved parameter - uintptr(dwAuthnLevel), // Strongest COM authentication level - uintptr(dwImpLevel), // Minimal impersonation abilities - uintptr(0), // Default COM authentication settings - uintptr(dwCapabilities), // Cloaking - uintptr(0)) // eserved parameter - if hr != 0 { - err = NewError(hr) - } else { - // COM Security initialization done make global flag true. - bSecurityInit = true - } - } - return -} - // CoInitialize initializes COM library on current thread. // // MSDN documentation suggests that this function should not be called. Call @@ -129,15 +96,6 @@ func CoUninitialize() { procCoUninitialize.Call() } -// CoInitializeSecurity: Registers security and sets the default security values -// for the process. -func CoInitializeSecurity(cAuthSvc int32, - dwAuthnLevel uint32, - dwImpLevel uint32, - dwCapabilities uint32) (err error) { - return coInitializeSecurity(cAuthSvc, dwAuthnLevel, dwImpLevel, dwCapabilities) -} - // CoTaskMemFree frees memory pointer. func CoTaskMemFree(memptr uintptr) { procCoTaskMemFree.Call(memptr) diff --git a/vendor/github.com/go-ole/go-ole/idispatch_windows.go b/vendor/github.com/go-ole/go-ole/idispatch_windows.go index 649c073..b399f04 100644 --- a/vendor/github.com/go-ole/go-ole/idispatch_windows.go +++ b/vendor/github.com/go-ole/go-ole/idispatch_windows.go @@ -1,4 +1,3 @@ -//go:build windows // +build windows package ole @@ -93,7 +92,7 @@ func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{} case int8: vargs[n] = NewVariant(VT_I1, int64(v.(int8))) case *int8: - vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int8))))) + vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint8))))) case int16: vargs[n] = NewVariant(VT_I2, int64(v.(int16))) case *int16: diff --git a/vendor/github.com/go-ole/go-ole/variant.go b/vendor/github.com/go-ole/go-ole/variant.go index a2c8402..967a23f 100644 --- a/vendor/github.com/go-ole/go-ole/variant.go +++ b/vendor/github.com/go-ole/go-ole/variant.go @@ -99,7 +99,7 @@ func (v *VARIANT) Value() interface{} { case VT_DISPATCH: return v.ToIDispatch() case VT_BOOL: - return (v.Val & 0xffff) != 0 + return v.Val != 0 } return nil } diff --git a/vendor/golang.org/x/exp/LICENSE b/vendor/golang.org/x/exp/LICENSE index 2a7cf70..6a66aea 100644 --- a/vendor/golang.org/x/exp/LICENSE +++ b/vendor/golang.org/x/exp/LICENSE @@ -1,4 +1,4 @@ -Copyright 2009 The Go Authors. +Copyright (c) 2009 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google LLC nor the names of its + * Neither the name of Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/vendor/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE index 2a7cf70..6a66aea 100644 --- a/vendor/golang.org/x/sys/LICENSE +++ b/vendor/golang.org/x/sys/LICENSE @@ -1,4 +1,4 @@ -Copyright 2009 The Go Authors. +Copyright (c) 2009 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google LLC nor the names of its + * Neither the name of Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh index e14b766..4ed2e48 100644 --- a/vendor/golang.org/x/sys/unix/mkerrors.sh +++ b/vendor/golang.org/x/sys/unix/mkerrors.sh @@ -58,7 +58,6 @@ includes_Darwin=' #define _DARWIN_USE_64_BIT_INODE #define __APPLE_USE_RFC_3542 #include -#include #include #include #include @@ -552,7 +551,6 @@ ccflags="$@" $2 !~ /^RTC_VL_(ACCURACY|BACKUP|DATA)/ && $2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTC|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P|NETNSA)_/ || $2 ~ /^SOCK_|SK_DIAG_|SKNLGRP_$/ || - $2 ~ /^(CONNECT|SAE)_/ || $2 ~ /^FIORDCHK$/ || $2 ~ /^SIOC/ || $2 ~ /^TIOC/ || diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go index 099867d..4cc7b00 100644 --- a/vendor/golang.org/x/sys/unix/syscall_darwin.go +++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go @@ -402,18 +402,6 @@ func IoctlSetIfreqMTU(fd int, ifreq *IfreqMTU) error { return ioctlPtr(fd, SIOCSIFMTU, unsafe.Pointer(ifreq)) } -//sys renamexNp(from string, to string, flag uint32) (err error) - -func RenamexNp(from string, to string, flag uint32) (err error) { - return renamexNp(from, to, flag) -} - -//sys renameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error) - -func RenameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error) { - return renameatxNp(fromfd, from, tofd, to, flag) -} - //sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS_SYSCTL func Uname(uname *Utsname) error { @@ -566,43 +554,6 @@ func PthreadFchdir(fd int) (err error) { return pthread_fchdir_np(fd) } -// Connectx calls connectx(2) to initiate a connection on a socket. -// -// srcIf, srcAddr, and dstAddr are filled into a [SaEndpoints] struct and passed as the endpoints argument. -// -// - srcIf is the optional source interface index. 0 means unspecified. -// - srcAddr is the optional source address. nil means unspecified. -// - dstAddr is the destination address. -// -// On success, Connectx returns the number of bytes enqueued for transmission. -func Connectx(fd int, srcIf uint32, srcAddr, dstAddr Sockaddr, associd SaeAssocID, flags uint32, iov []Iovec, connid *SaeConnID) (n uintptr, err error) { - endpoints := SaEndpoints{ - Srcif: srcIf, - } - - if srcAddr != nil { - addrp, addrlen, err := srcAddr.sockaddr() - if err != nil { - return 0, err - } - endpoints.Srcaddr = (*RawSockaddr)(addrp) - endpoints.Srcaddrlen = uint32(addrlen) - } - - if dstAddr != nil { - addrp, addrlen, err := dstAddr.sockaddr() - if err != nil { - return 0, err - } - endpoints.Dstaddr = (*RawSockaddr)(addrp) - endpoints.Dstaddrlen = uint32(addrlen) - } - - err = connectx(fd, &endpoints, associd, flags, iov, &n, connid) - return -} - -//sys connectx(fd int, endpoints *SaEndpoints, associd SaeAssocID, flags uint32, iov []Iovec, n *uintptr, connid *SaeConnID) (err error) //sys sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) //sys shmat(id int, addr uintptr, flag int) (ret uintptr, err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_hurd.go b/vendor/golang.org/x/sys/unix/syscall_hurd.go index a6a2d2f..ba46651 100644 --- a/vendor/golang.org/x/sys/unix/syscall_hurd.go +++ b/vendor/golang.org/x/sys/unix/syscall_hurd.go @@ -11,7 +11,6 @@ package unix int ioctl(int, unsigned long int, uintptr_t); */ import "C" -import "unsafe" func ioctl(fd int, req uint, arg uintptr) (err error) { r0, er := C.ioctl(C.int(fd), C.ulong(req), C.uintptr_t(arg)) diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go index 3f1d3d4..5682e26 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -2592,4 +2592,3 @@ func SchedGetAttr(pid int, flags uint) (*SchedAttr, error) { } //sys Cachestat(fd uint, crange *CachestatRange, cstat *Cachestat_t, flags uint) (err error) -//sys Mseal(b []byte, flags uint) (err error) diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go index b86ded5..b25343c 100644 --- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go +++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go @@ -293,7 +293,6 @@ func Uname(uname *Utsname) error { //sys Mkfifoat(dirfd int, path string, mode uint32) (err error) //sys Mknod(path string, mode uint32, dev int) (err error) //sys Mknodat(dirfd int, path string, mode uint32, dev int) (err error) -//sys Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) //sys Nanosleep(time *Timespec, leftover *Timespec) (err error) //sys Open(path string, mode int, perm uint32) (fd int, err error) //sys Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go index d73c465..e40fa85 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go @@ -237,9 +237,6 @@ const ( CLOCK_UPTIME_RAW_APPROX = 0x9 CLONE_NOFOLLOW = 0x1 CLONE_NOOWNERCOPY = 0x2 - CONNECT_DATA_AUTHENTICATED = 0x4 - CONNECT_DATA_IDEMPOTENT = 0x2 - CONNECT_RESUME_ON_READ_WRITE = 0x1 CR0 = 0x0 CR1 = 0x1000 CR2 = 0x2000 @@ -1172,11 +1169,6 @@ const ( PT_WRITE_D = 0x5 PT_WRITE_I = 0x4 PT_WRITE_U = 0x6 - RENAME_EXCL = 0x4 - RENAME_NOFOLLOW_ANY = 0x10 - RENAME_RESERVED1 = 0x8 - RENAME_SECLUDE = 0x1 - RENAME_SWAP = 0x2 RLIMIT_AS = 0x5 RLIMIT_CORE = 0x4 RLIMIT_CPU = 0x0 @@ -1268,10 +1260,6 @@ const ( RTV_SSTHRESH = 0x20 RUSAGE_CHILDREN = -0x1 RUSAGE_SELF = 0x0 - SAE_ASSOCID_ALL = 0xffffffff - SAE_ASSOCID_ANY = 0x0 - SAE_CONNID_ALL = 0xffffffff - SAE_CONNID_ANY = 0x0 SCM_CREDS = 0x3 SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go index 4a55a40..bb02aa6 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go @@ -237,9 +237,6 @@ const ( CLOCK_UPTIME_RAW_APPROX = 0x9 CLONE_NOFOLLOW = 0x1 CLONE_NOOWNERCOPY = 0x2 - CONNECT_DATA_AUTHENTICATED = 0x4 - CONNECT_DATA_IDEMPOTENT = 0x2 - CONNECT_RESUME_ON_READ_WRITE = 0x1 CR0 = 0x0 CR1 = 0x1000 CR2 = 0x2000 @@ -1172,11 +1169,6 @@ const ( PT_WRITE_D = 0x5 PT_WRITE_I = 0x4 PT_WRITE_U = 0x6 - RENAME_EXCL = 0x4 - RENAME_NOFOLLOW_ANY = 0x10 - RENAME_RESERVED1 = 0x8 - RENAME_SECLUDE = 0x1 - RENAME_SWAP = 0x2 RLIMIT_AS = 0x5 RLIMIT_CORE = 0x4 RLIMIT_CPU = 0x0 @@ -1268,10 +1260,6 @@ const ( RTV_SSTHRESH = 0x20 RUSAGE_CHILDREN = -0x1 RUSAGE_SELF = 0x0 - SAE_ASSOCID_ALL = 0xffffffff - SAE_ASSOCID_ANY = 0x0 - SAE_CONNID_ALL = 0xffffffff - SAE_CONNID_ANY = 0x0 SCM_CREDS = 0x3 SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x2 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go index 01a70b2..877a62b 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go @@ -457,7 +457,6 @@ const ( B600 = 0x8 B75 = 0x2 B9600 = 0xd - BCACHEFS_SUPER_MAGIC = 0xca451a4e BDEVFS_MAGIC = 0x62646576 BINDERFS_SUPER_MAGIC = 0x6c6f6f70 BINFMTFS_MAGIC = 0x42494e4d @@ -929,7 +928,6 @@ const ( EPOLL_CTL_ADD = 0x1 EPOLL_CTL_DEL = 0x2 EPOLL_CTL_MOD = 0x3 - EPOLL_IOC_TYPE = 0x8a EROFS_SUPER_MAGIC_V1 = 0xe0f5e1e2 ESP_V4_FLOW = 0xa ESP_V6_FLOW = 0xc @@ -943,6 +941,9 @@ const ( ETHTOOL_FEC_OFF = 0x4 ETHTOOL_FEC_RS = 0x8 ETHTOOL_FLAG_ALL = 0x7 + ETHTOOL_FLAG_COMPACT_BITSETS = 0x1 + ETHTOOL_FLAG_OMIT_REPLY = 0x2 + ETHTOOL_FLAG_STATS = 0x4 ETHTOOL_FLASHDEV = 0x33 ETHTOOL_FLASH_MAX_FILENAME = 0x80 ETHTOOL_FWVERS_LEN = 0x20 @@ -1704,7 +1705,6 @@ const ( KEXEC_ARCH_S390 = 0x160000 KEXEC_ARCH_SH = 0x2a0000 KEXEC_ARCH_X86_64 = 0x3e0000 - KEXEC_CRASH_HOTPLUG_SUPPORT = 0x8 KEXEC_FILE_DEBUG = 0x8 KEXEC_FILE_NO_INITRAMFS = 0x4 KEXEC_FILE_ON_CRASH = 0x2 @@ -1780,7 +1780,6 @@ const ( KEY_SPEC_USER_KEYRING = -0x4 KEY_SPEC_USER_SESSION_KEYRING = -0x5 LANDLOCK_ACCESS_FS_EXECUTE = 0x1 - LANDLOCK_ACCESS_FS_IOCTL_DEV = 0x8000 LANDLOCK_ACCESS_FS_MAKE_BLOCK = 0x800 LANDLOCK_ACCESS_FS_MAKE_CHAR = 0x40 LANDLOCK_ACCESS_FS_MAKE_DIR = 0x80 @@ -1862,19 +1861,6 @@ const ( MAP_FILE = 0x0 MAP_FIXED = 0x10 MAP_FIXED_NOREPLACE = 0x100000 - MAP_HUGE_16GB = 0x88000000 - MAP_HUGE_16KB = 0x38000000 - MAP_HUGE_16MB = 0x60000000 - MAP_HUGE_1GB = 0x78000000 - MAP_HUGE_1MB = 0x50000000 - MAP_HUGE_256MB = 0x70000000 - MAP_HUGE_2GB = 0x7c000000 - MAP_HUGE_2MB = 0x54000000 - MAP_HUGE_32MB = 0x64000000 - MAP_HUGE_512KB = 0x4c000000 - MAP_HUGE_512MB = 0x74000000 - MAP_HUGE_64KB = 0x40000000 - MAP_HUGE_8MB = 0x5c000000 MAP_HUGE_MASK = 0x3f MAP_HUGE_SHIFT = 0x1a MAP_PRIVATE = 0x2 @@ -2512,23 +2498,6 @@ const ( PR_PAC_GET_ENABLED_KEYS = 0x3d PR_PAC_RESET_KEYS = 0x36 PR_PAC_SET_ENABLED_KEYS = 0x3c - PR_PPC_DEXCR_CTRL_CLEAR = 0x4 - PR_PPC_DEXCR_CTRL_CLEAR_ONEXEC = 0x10 - PR_PPC_DEXCR_CTRL_EDITABLE = 0x1 - PR_PPC_DEXCR_CTRL_MASK = 0x1f - PR_PPC_DEXCR_CTRL_SET = 0x2 - PR_PPC_DEXCR_CTRL_SET_ONEXEC = 0x8 - PR_PPC_DEXCR_IBRTPD = 0x1 - PR_PPC_DEXCR_NPHIE = 0x3 - PR_PPC_DEXCR_SBHE = 0x0 - PR_PPC_DEXCR_SRAPD = 0x2 - PR_PPC_GET_DEXCR = 0x48 - PR_PPC_SET_DEXCR = 0x49 - PR_RISCV_CTX_SW_FENCEI_OFF = 0x1 - PR_RISCV_CTX_SW_FENCEI_ON = 0x0 - PR_RISCV_SCOPE_PER_PROCESS = 0x0 - PR_RISCV_SCOPE_PER_THREAD = 0x1 - PR_RISCV_SET_ICACHE_FLUSH_CTX = 0x47 PR_RISCV_V_GET_CONTROL = 0x46 PR_RISCV_V_SET_CONTROL = 0x45 PR_RISCV_V_VSTATE_CTRL_CUR_MASK = 0x3 @@ -3223,7 +3192,6 @@ const ( STATX_MTIME = 0x40 STATX_NLINK = 0x4 STATX_SIZE = 0x200 - STATX_SUBVOL = 0x8000 STATX_TYPE = 0x1 STATX_UID = 0x8 STATX__RESERVED = 0x80000000 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 684a516..e4bc0bd 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x80088a02 - EPIOCSPARAMS = 0x40088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 61d74b5..689317a 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x80088a02 - EPIOCSPARAMS = 0x40088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 a28c9e3..5cca668 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x80088a02 - EPIOCSPARAMS = 0x40088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 ab5d1fe..1427050 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x80088a02 - EPIOCSPARAMS = 0x40088a01 EPOLL_CLOEXEC = 0x80000 ESR_MAGIC = 0x45535201 EXTPROC = 0x10000 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 c523090..28e39af 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x80088a02 - EPIOCSPARAMS = 0x40088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 01e6ea7..cd66e92 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x80 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 7aa610b..c1595eb 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x80 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 92af771..ee9456b 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x80 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 b27ef5e..8cfca81 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x80 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 237a2ce..60b0deb 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x20 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000000 FF1 = 0x4000 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 4a5c555..f90aa72 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x20 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000000 FF1 = 0x4000 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 a02fb49..ba9e015 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x20 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000000 FF1 = 0x4000 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 e26a7c6..07cdfd6 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x80088a02 - EPIOCSPARAMS = 0x40088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 c48f7c2..2f1dd21 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go @@ -78,8 +78,6 @@ const ( ECHOPRT = 0x400 EFD_CLOEXEC = 0x80000 EFD_NONBLOCK = 0x800 - EPIOCGPARAMS = 0x80088a02 - EPIOCSPARAMS = 0x40088a01 EPOLL_CLOEXEC = 0x80000 EXTPROC = 0x10000 FF1 = 0x8000 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 ad4b9aa..f40519d 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go @@ -82,8 +82,6 @@ const ( EFD_CLOEXEC = 0x400000 EFD_NONBLOCK = 0x4000 EMT_TAGOVF = 0x1 - EPIOCGPARAMS = 0x40088a02 - EPIOCSPARAMS = 0x80088a01 EPOLL_CLOEXEC = 0x400000 EXTPROC = 0x10000 FF1 = 0x8000 diff --git a/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go index 1ec2b14..da08b2a 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go +++ b/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go @@ -581,8 +581,6 @@ const ( AT_EMPTY_PATH = 0x1000 AT_REMOVEDIR = 0x200 RENAME_NOREPLACE = 1 << 0 - ST_RDONLY = 1 - ST_NOSUID = 2 ) const ( diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go index 24b346e..07642c3 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go @@ -740,54 +740,6 @@ func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func renamexNp(from string, to string, flag uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(from) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(to) - if err != nil { - return - } - _, _, e1 := syscall_syscall(libc_renamex_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_renamex_np_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_renamex_np renamex_np "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func renameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(from) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(to) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_renameatx_np_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), uintptr(flag), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_renameatx_np_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_renameatx_np renameatx_np "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { var _p0 unsafe.Pointer if len(mib) > 0 { @@ -841,26 +793,6 @@ var libc_pthread_fchdir_np_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func connectx(fd int, endpoints *SaEndpoints, associd SaeAssocID, flags uint32, iov []Iovec, n *uintptr, connid *SaeConnID) (err error) { - var _p0 unsafe.Pointer - if len(iov) > 0 { - _p0 = unsafe.Pointer(&iov[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := syscall_syscall9(libc_connectx_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(endpoints)), uintptr(associd), uintptr(flags), uintptr(_p0), uintptr(len(iov)), uintptr(unsafe.Pointer(n)), uintptr(unsafe.Pointer(connid)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_connectx_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_connectx connectx "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s index ebd2131..923e08c 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s @@ -223,16 +223,6 @@ TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $8 DATA ·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB) -TEXT libc_renamex_np_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_renamex_np(SB) -GLOBL ·libc_renamex_np_trampoline_addr(SB), RODATA, $8 -DATA ·libc_renamex_np_trampoline_addr(SB)/8, $libc_renamex_np_trampoline<>(SB) - -TEXT libc_renameatx_np_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_renameatx_np(SB) -GLOBL ·libc_renameatx_np_trampoline_addr(SB), RODATA, $8 -DATA ·libc_renameatx_np_trampoline_addr(SB)/8, $libc_renameatx_np_trampoline<>(SB) - TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_sysctl(SB) GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8 @@ -248,11 +238,6 @@ TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8 DATA ·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB) -TEXT libc_connectx_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_connectx(SB) -GLOBL ·libc_connectx_trampoline_addr(SB), RODATA, $8 -DATA ·libc_connectx_trampoline_addr(SB)/8, $libc_connectx_trampoline<>(SB) - TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_sendfile(SB) GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go index 824b9c2..7d73dda 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go @@ -740,54 +740,6 @@ func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func renamexNp(from string, to string, flag uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(from) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(to) - if err != nil { - return - } - _, _, e1 := syscall_syscall(libc_renamex_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_renamex_np_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_renamex_np renamex_np "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func renameatxNp(fromfd int, from string, tofd int, to string, flag uint32) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(from) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(to) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_renameatx_np_trampoline_addr, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), uintptr(flag), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_renameatx_np_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_renameatx_np renameatx_np "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { var _p0 unsafe.Pointer if len(mib) > 0 { @@ -841,26 +793,6 @@ var libc_pthread_fchdir_np_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func connectx(fd int, endpoints *SaEndpoints, associd SaeAssocID, flags uint32, iov []Iovec, n *uintptr, connid *SaeConnID) (err error) { - var _p0 unsafe.Pointer - if len(iov) > 0 { - _p0 = unsafe.Pointer(&iov[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := syscall_syscall9(libc_connectx_trampoline_addr, uintptr(fd), uintptr(unsafe.Pointer(endpoints)), uintptr(associd), uintptr(flags), uintptr(_p0), uintptr(len(iov)), uintptr(unsafe.Pointer(n)), uintptr(unsafe.Pointer(connid)), 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_connectx_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_connectx connectx "/usr/lib/libSystem.B.dylib" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { _, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s index 4f178a2..0577001 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s @@ -223,16 +223,6 @@ TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $8 DATA ·libc_ioctl_trampoline_addr(SB)/8, $libc_ioctl_trampoline<>(SB) -TEXT libc_renamex_np_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_renamex_np(SB) -GLOBL ·libc_renamex_np_trampoline_addr(SB), RODATA, $8 -DATA ·libc_renamex_np_trampoline_addr(SB)/8, $libc_renamex_np_trampoline<>(SB) - -TEXT libc_renameatx_np_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_renameatx_np(SB) -GLOBL ·libc_renameatx_np_trampoline_addr(SB), RODATA, $8 -DATA ·libc_renameatx_np_trampoline_addr(SB)/8, $libc_renameatx_np_trampoline<>(SB) - TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_sysctl(SB) GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8 @@ -248,11 +238,6 @@ TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8 DATA ·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB) -TEXT libc_connectx_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_connectx(SB) -GLOBL ·libc_connectx_trampoline_addr(SB), RODATA, $8 -DATA ·libc_connectx_trampoline_addr(SB)/8, $libc_connectx_trampoline<>(SB) - TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_sendfile(SB) GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go index 1bc1a5a..87d8612 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go @@ -2229,19 +2229,3 @@ func Cachestat(fd uint, crange *CachestatRange, cstat *Cachestat_t, flags uint) } return } - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -func Mseal(b []byte, flags uint) (err error) { - var _p0 unsafe.Pointer - if len(b) > 0 { - _p0 = unsafe.Pointer(&b[0]) - } else { - _p0 = unsafe.Pointer(&_zero) - } - _, _, e1 := Syscall(SYS_MSEAL, uintptr(_p0), uintptr(len(b)), uintptr(flags)) - if e1 != 0 { - err = errnoErr(e1) - } - return -} diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go index 1851df1..9dc4241 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go @@ -1493,30 +1493,6 @@ var libc_mknodat_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(fsType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(dir) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_mount_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_mount mount "libc.so" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Nanosleep(time *Timespec, leftover *Timespec) (err error) { _, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s index 0b43c69..41b5617 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s @@ -463,11 +463,6 @@ TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_mknodat_trampoline_addr(SB), RODATA, $4 DATA ·libc_mknodat_trampoline_addr(SB)/4, $libc_mknodat_trampoline<>(SB) -TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_mount(SB) -GLOBL ·libc_mount_trampoline_addr(SB), RODATA, $4 -DATA ·libc_mount_trampoline_addr(SB)/4, $libc_mount_trampoline<>(SB) - TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_nanosleep(SB) GLOBL ·libc_nanosleep_trampoline_addr(SB), RODATA, $4 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go index e1ec0db..0d3a075 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go @@ -1493,30 +1493,6 @@ var libc_mknodat_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(fsType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(dir) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_mount_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_mount mount "libc.so" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Nanosleep(time *Timespec, leftover *Timespec) (err error) { _, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s index 880c6d6..4019a65 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s @@ -463,11 +463,6 @@ TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_mknodat_trampoline_addr(SB), RODATA, $8 DATA ·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB) -TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_mount(SB) -GLOBL ·libc_mount_trampoline_addr(SB), RODATA, $8 -DATA ·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB) - TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_nanosleep(SB) GLOBL ·libc_nanosleep_trampoline_addr(SB), RODATA, $8 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go index 7c8452a..c39f777 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go @@ -1493,30 +1493,6 @@ var libc_mknodat_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(fsType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(dir) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_mount_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_mount mount "libc.so" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Nanosleep(time *Timespec, leftover *Timespec) (err error) { _, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s index b8ef95b..ac4af24 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s @@ -463,11 +463,6 @@ TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_mknodat_trampoline_addr(SB), RODATA, $4 DATA ·libc_mknodat_trampoline_addr(SB)/4, $libc_mknodat_trampoline<>(SB) -TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_mount(SB) -GLOBL ·libc_mount_trampoline_addr(SB), RODATA, $4 -DATA ·libc_mount_trampoline_addr(SB)/4, $libc_mount_trampoline<>(SB) - TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_nanosleep(SB) GLOBL ·libc_nanosleep_trampoline_addr(SB), RODATA, $4 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go index 2ffdf86..57571d0 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go @@ -1493,30 +1493,6 @@ var libc_mknodat_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(fsType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(dir) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_mount_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_mount mount "libc.so" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Nanosleep(time *Timespec, leftover *Timespec) (err error) { _, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s index 2af3b5c..f77d532 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s @@ -463,11 +463,6 @@ TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_mknodat_trampoline_addr(SB), RODATA, $8 DATA ·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB) -TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_mount(SB) -GLOBL ·libc_mount_trampoline_addr(SB), RODATA, $8 -DATA ·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB) - TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_nanosleep(SB) GLOBL ·libc_nanosleep_trampoline_addr(SB), RODATA, $8 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go index 1da08d5..e62963e 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go @@ -1493,30 +1493,6 @@ var libc_mknodat_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(fsType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(dir) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_mount_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_mount mount "libc.so" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Nanosleep(time *Timespec, leftover *Timespec) (err error) { _, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s index b7a2513..fae140b 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s @@ -463,11 +463,6 @@ TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_mknodat_trampoline_addr(SB), RODATA, $8 DATA ·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB) -TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_mount(SB) -GLOBL ·libc_mount_trampoline_addr(SB), RODATA, $8 -DATA ·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB) - TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_nanosleep(SB) GLOBL ·libc_nanosleep_trampoline_addr(SB), RODATA, $8 diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go index 6e85b0a..0083135 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go @@ -1493,30 +1493,6 @@ var libc_mknodat_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(fsType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(dir) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_mount_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_mount mount "libc.so" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Nanosleep(time *Timespec, leftover *Timespec) (err error) { _, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s index f15dadf..9d1e0ff 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s @@ -555,12 +555,6 @@ TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_mknodat_trampoline_addr(SB), RODATA, $8 DATA ·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB) -TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0 - CALL libc_mount(SB) - RET -GLOBL ·libc_mount_trampoline_addr(SB), RODATA, $8 -DATA ·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB) - TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0 CALL libc_nanosleep(SB) RET diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go index 28b487d..79029ed 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go @@ -1493,30 +1493,6 @@ var libc_mknodat_trampoline_addr uintptr // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func Mount(fsType string, dir string, flags int, data unsafe.Pointer) (err error) { - var _p0 *byte - _p0, err = BytePtrFromString(fsType) - if err != nil { - return - } - var _p1 *byte - _p1, err = BytePtrFromString(dir) - if err != nil { - return - } - _, _, e1 := syscall_syscall6(libc_mount_trampoline_addr, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flags), uintptr(data), 0, 0) - if e1 != 0 { - err = errnoErr(e1) - } - return -} - -var libc_mount_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_mount mount "libc.so" - -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - func Nanosleep(time *Timespec, leftover *Timespec) (err error) { _, _, e1 := syscall_syscall(libc_nanosleep_trampoline_addr, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0) if e1 != 0 { diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s index 1e7f321..da115f9 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s @@ -463,11 +463,6 @@ TEXT libc_mknodat_trampoline<>(SB),NOSPLIT,$0-0 GLOBL ·libc_mknodat_trampoline_addr(SB), RODATA, $8 DATA ·libc_mknodat_trampoline_addr(SB)/8, $libc_mknodat_trampoline<>(SB) -TEXT libc_mount_trampoline<>(SB),NOSPLIT,$0-0 - JMP libc_mount(SB) -GLOBL ·libc_mount_trampoline_addr(SB), RODATA, $8 -DATA ·libc_mount_trampoline_addr(SB)/8, $libc_mount_trampoline<>(SB) - TEXT libc_nanosleep_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_nanosleep(SB) GLOBL ·libc_nanosleep_trampoline_addr(SB), RODATA, $8 diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go index 524b082..53aef5d 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go @@ -457,5 +457,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go index d3e38f6..71d5247 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go @@ -379,5 +379,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go index 70b35bf..c747706 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go @@ -421,5 +421,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go index 6c778c2..f96e214 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go @@ -324,5 +324,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go index 37281cf..2842534 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go @@ -318,5 +318,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go index 7e567f1..d095301 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go @@ -441,5 +441,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 4459 SYS_LSM_SET_SELF_ATTR = 4460 SYS_LSM_LIST_MODULES = 4461 - SYS_MSEAL = 4462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go index 38ae55e..295c7f4 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go @@ -371,5 +371,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 5459 SYS_LSM_SET_SELF_ATTR = 5460 SYS_LSM_LIST_MODULES = 5461 - SYS_MSEAL = 5462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go index 55e92e6..d1a9eac 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go @@ -371,5 +371,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 5459 SYS_LSM_SET_SELF_ATTR = 5460 SYS_LSM_LIST_MODULES = 5461 - SYS_MSEAL = 5462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go index 60658d6..bec157c 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go @@ -441,5 +441,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 4459 SYS_LSM_SET_SELF_ATTR = 4460 SYS_LSM_LIST_MODULES = 4461 - SYS_MSEAL = 4462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go index e203e8a..7ee7bdc 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go @@ -448,5 +448,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go index 5944b97..fad1f25 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go @@ -420,5 +420,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go index c66d416..7d3e163 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go @@ -420,5 +420,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) 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 9889f6a..0ed53ad 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go @@ -325,5 +325,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go index 01d8682..2fba04a 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go @@ -386,5 +386,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go index 7b703e7..621d00d 100644 --- a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go @@ -399,5 +399,4 @@ const ( SYS_LSM_GET_SELF_ATTR = 459 SYS_LSM_SET_SELF_ATTR = 460 SYS_LSM_LIST_MODULES = 461 - SYS_MSEAL = 462 ) diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go index d003c3d..091d107 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go @@ -306,19 +306,6 @@ type XVSockPgen struct { type _Socklen uint32 -type SaeAssocID uint32 - -type SaeConnID uint32 - -type SaEndpoints struct { - Srcif uint32 - Srcaddr *RawSockaddr - Srcaddrlen uint32 - Dstaddr *RawSockaddr - Dstaddrlen uint32 - _ [4]byte -} - type Xucred struct { Version uint32 Uid uint32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go index 0d45a94..28ff4ef 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go @@ -306,19 +306,6 @@ type XVSockPgen struct { type _Socklen uint32 -type SaeAssocID uint32 - -type SaeConnID uint32 - -type SaEndpoints struct { - Srcif uint32 - Srcaddr *RawSockaddr - Srcaddrlen uint32 - Dstaddr *RawSockaddr - Dstaddrlen uint32 - _ [4]byte -} - type Xucred struct { Version uint32 Uid uint32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go index 51e13eb..6cbd094 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go @@ -625,7 +625,6 @@ const ( POLLRDNORM = 0x40 POLLWRBAND = 0x100 POLLWRNORM = 0x4 - POLLRDHUP = 0x4000 ) type CapRights struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go index d002d8e..7c03b6e 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go @@ -630,7 +630,6 @@ const ( POLLRDNORM = 0x40 POLLWRBAND = 0x100 POLLWRNORM = 0x4 - POLLRDHUP = 0x4000 ) type CapRights struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go index 3f863d8..422107e 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go @@ -616,7 +616,6 @@ const ( POLLRDNORM = 0x40 POLLWRBAND = 0x100 POLLWRNORM = 0x4 - POLLRDHUP = 0x4000 ) type CapRights struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go index 61c7293..505a12a 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go @@ -610,7 +610,6 @@ const ( POLLRDNORM = 0x40 POLLWRBAND = 0x100 POLLWRNORM = 0x4 - POLLRDHUP = 0x4000 ) type CapRights struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go index b5d1741..cc986c7 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go @@ -612,7 +612,6 @@ const ( POLLRDNORM = 0x40 POLLWRBAND = 0x100 POLLWRNORM = 0x4 - POLLRDHUP = 0x4000 ) type CapRights struct { diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go index 9f2550d..4740b83 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -110,8 +110,7 @@ type Statx_t struct { Mnt_id uint64 Dio_mem_align uint32 Dio_offset_align uint32 - Subvol uint64 - _ [11]uint64 + _ [12]uint64 } type Fsid struct { @@ -2486,7 +2485,7 @@ type XDPMmapOffsets struct { type XDPUmemReg struct { Addr uint64 Len uint64 - Size uint32 + Chunk_size uint32 Headroom uint32 Flags uint32 Tx_metadata_len uint32 @@ -3474,7 +3473,7 @@ const ( DEVLINK_PORT_FN_ATTR_STATE = 0x2 DEVLINK_PORT_FN_ATTR_OPSTATE = 0x3 DEVLINK_PORT_FN_ATTR_CAPS = 0x4 - DEVLINK_PORT_FUNCTION_ATTR_MAX = 0x6 + DEVLINK_PORT_FUNCTION_ATTR_MAX = 0x5 ) type FsverityDigest struct { @@ -3807,9 +3806,6 @@ const ( ETHTOOL_MSG_PSE_GET_REPLY = 0x25 ETHTOOL_MSG_RSS_GET_REPLY = 0x26 ETHTOOL_MSG_KERNEL_MAX = 0x2b - ETHTOOL_FLAG_COMPACT_BITSETS = 0x1 - ETHTOOL_FLAG_OMIT_REPLY = 0x2 - ETHTOOL_FLAG_STATS = 0x4 ETHTOOL_A_HEADER_UNSPEC = 0x0 ETHTOOL_A_HEADER_DEV_INDEX = 0x1 ETHTOOL_A_HEADER_DEV_NAME = 0x2 @@ -3979,7 +3975,7 @@ const ( ETHTOOL_A_TSINFO_TX_TYPES = 0x3 ETHTOOL_A_TSINFO_RX_FILTERS = 0x4 ETHTOOL_A_TSINFO_PHC_INDEX = 0x5 - ETHTOOL_A_TSINFO_MAX = 0x6 + ETHTOOL_A_TSINFO_MAX = 0x5 ETHTOOL_A_CABLE_TEST_UNSPEC = 0x0 ETHTOOL_A_CABLE_TEST_HEADER = 0x1 ETHTOOL_A_CABLE_TEST_MAX = 0x1 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 ad05b51..15adc04 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go @@ -727,37 +727,6 @@ const ( RISCV_HWPROBE_EXT_ZBA = 0x8 RISCV_HWPROBE_EXT_ZBB = 0x10 RISCV_HWPROBE_EXT_ZBS = 0x20 - RISCV_HWPROBE_EXT_ZICBOZ = 0x40 - RISCV_HWPROBE_EXT_ZBC = 0x80 - RISCV_HWPROBE_EXT_ZBKB = 0x100 - RISCV_HWPROBE_EXT_ZBKC = 0x200 - RISCV_HWPROBE_EXT_ZBKX = 0x400 - RISCV_HWPROBE_EXT_ZKND = 0x800 - RISCV_HWPROBE_EXT_ZKNE = 0x1000 - RISCV_HWPROBE_EXT_ZKNH = 0x2000 - RISCV_HWPROBE_EXT_ZKSED = 0x4000 - RISCV_HWPROBE_EXT_ZKSH = 0x8000 - RISCV_HWPROBE_EXT_ZKT = 0x10000 - RISCV_HWPROBE_EXT_ZVBB = 0x20000 - RISCV_HWPROBE_EXT_ZVBC = 0x40000 - RISCV_HWPROBE_EXT_ZVKB = 0x80000 - RISCV_HWPROBE_EXT_ZVKG = 0x100000 - RISCV_HWPROBE_EXT_ZVKNED = 0x200000 - RISCV_HWPROBE_EXT_ZVKNHA = 0x400000 - RISCV_HWPROBE_EXT_ZVKNHB = 0x800000 - RISCV_HWPROBE_EXT_ZVKSED = 0x1000000 - RISCV_HWPROBE_EXT_ZVKSH = 0x2000000 - RISCV_HWPROBE_EXT_ZVKT = 0x4000000 - RISCV_HWPROBE_EXT_ZFH = 0x8000000 - RISCV_HWPROBE_EXT_ZFHMIN = 0x10000000 - RISCV_HWPROBE_EXT_ZIHINTNTL = 0x20000000 - RISCV_HWPROBE_EXT_ZVFH = 0x40000000 - RISCV_HWPROBE_EXT_ZVFHMIN = 0x80000000 - RISCV_HWPROBE_EXT_ZFA = 0x100000000 - RISCV_HWPROBE_EXT_ZTSO = 0x200000000 - RISCV_HWPROBE_EXT_ZACAS = 0x400000000 - RISCV_HWPROBE_EXT_ZICOND = 0x800000000 - RISCV_HWPROBE_EXT_ZIHINTPAUSE = 0x1000000000 RISCV_HWPROBE_KEY_CPUPERF_0 = 0x5 RISCV_HWPROBE_MISALIGNED_UNKNOWN = 0x0 RISCV_HWPROBE_MISALIGNED_EMULATED = 0x1 @@ -765,6 +734,4 @@ const ( RISCV_HWPROBE_MISALIGNED_FAST = 0x3 RISCV_HWPROBE_MISALIGNED_UNSUPPORTED = 0x4 RISCV_HWPROBE_MISALIGNED_MASK = 0x7 - RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE = 0x6 - RISCV_HWPROBE_WHICH_CPUS = 0x1 ) diff --git a/vendor/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go index b6e1ab7..97651b5 100644 --- a/vendor/golang.org/x/sys/windows/security_windows.go +++ b/vendor/golang.org/x/sys/windows/security_windows.go @@ -1179,7 +1179,7 @@ type OBJECTS_AND_NAME struct { //sys makeSelfRelativeSD(absoluteSD *SECURITY_DESCRIPTOR, selfRelativeSD *SECURITY_DESCRIPTOR, selfRelativeSDSize *uint32) (err error) = advapi32.MakeSelfRelativeSD //sys setEntriesInAcl(countExplicitEntries uint32, explicitEntries *EXPLICIT_ACCESS, oldACL *ACL, newACL **ACL) (ret error) = advapi32.SetEntriesInAclW -//sys GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (err error) = advapi32.GetAce +//sys GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (ret error) = advapi32.GetAce // Control returns the security descriptor control bits. func (sd *SECURITY_DESCRIPTOR) Control() (control SECURITY_DESCRIPTOR_CONTROL, revision uint32, err error) { diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go index 5cee9a3..6525c62 100644 --- a/vendor/golang.org/x/sys/windows/syscall_windows.go +++ b/vendor/golang.org/x/sys/windows/syscall_windows.go @@ -17,10 +17,8 @@ import ( "unsafe" ) -type ( - Handle uintptr - HWND uintptr -) +type Handle uintptr +type HWND uintptr const ( InvalidHandle = ^Handle(0) @@ -213,10 +211,6 @@ func NewCallbackCDecl(fn interface{}) uintptr { //sys OpenProcess(desiredAccess uint32, inheritHandle bool, processId uint32) (handle Handle, err error) //sys ShellExecute(hwnd Handle, verb *uint16, file *uint16, args *uint16, cwd *uint16, showCmd int32) (err error) [failretval<=32] = shell32.ShellExecuteW //sys GetWindowThreadProcessId(hwnd HWND, pid *uint32) (tid uint32, err error) = user32.GetWindowThreadProcessId -//sys LoadKeyboardLayout(name *uint16, flags uint32) (hkl Handle, err error) [failretval==0] = user32.LoadKeyboardLayoutW -//sys UnloadKeyboardLayout(hkl Handle) (err error) = user32.UnloadKeyboardLayout -//sys GetKeyboardLayout(tid uint32) (hkl Handle) = user32.GetKeyboardLayout -//sys ToUnicodeEx(vkey uint32, scancode uint32, keystate *byte, pwszBuff *uint16, cchBuff int32, flags uint32, hkl Handle) (ret int32) = user32.ToUnicodeEx //sys GetShellWindow() (shellWindow HWND) = user32.GetShellWindow //sys MessageBox(hwnd HWND, text *uint16, caption *uint16, boxtype uint32) (ret int32, err error) [failretval==0] = user32.MessageBoxW //sys ExitWindowsEx(flags uint32, reason uint32) (err error) = user32.ExitWindowsEx @@ -313,10 +307,6 @@ func NewCallbackCDecl(fn interface{}) uintptr { //sys SetConsoleMode(console Handle, mode uint32) (err error) = kernel32.SetConsoleMode //sys GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) = kernel32.GetConsoleScreenBufferInfo //sys setConsoleCursorPosition(console Handle, position uint32) (err error) = kernel32.SetConsoleCursorPosition -//sys GetConsoleCP() (cp uint32, err error) = kernel32.GetConsoleCP -//sys GetConsoleOutputCP() (cp uint32, err error) = kernel32.GetConsoleOutputCP -//sys SetConsoleCP(cp uint32) (err error) = kernel32.SetConsoleCP -//sys SetConsoleOutputCP(cp uint32) (err error) = kernel32.SetConsoleOutputCP //sys WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) = kernel32.WriteConsoleW //sys ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) = kernel32.ReadConsoleW //sys resizePseudoConsole(pconsole Handle, size uint32) (hr error) = kernel32.ResizePseudoConsole @@ -1378,11 +1368,9 @@ func SetsockoptLinger(fd Handle, level, opt int, l *Linger) (err error) { func SetsockoptInet4Addr(fd Handle, level, opt int, value [4]byte) (err error) { return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&value[0])), 4) } - func SetsockoptIPMreq(fd Handle, level, opt int, mreq *IPMreq) (err error) { return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(mreq)), int32(unsafe.Sizeof(*mreq))) } - func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) { return syscall.EWINDOWS } diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go index 7b97a15..d8cb71d 100644 --- a/vendor/golang.org/x/sys/windows/types_windows.go +++ b/vendor/golang.org/x/sys/windows/types_windows.go @@ -1060,7 +1060,6 @@ const ( SIO_GET_EXTENSION_FUNCTION_POINTER = IOC_INOUT | IOC_WS2 | 6 SIO_KEEPALIVE_VALS = IOC_IN | IOC_VENDOR | 4 SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12 - SIO_UDP_NETRESET = IOC_IN | IOC_VENDOR | 15 // cf. http://support.microsoft.com/default.aspx?scid=kb;en-us;257460 @@ -2004,21 +2003,7 @@ const ( MOVEFILE_FAIL_IF_NOT_TRACKABLE = 0x20 ) -// Flags for GetAdaptersAddresses, see -// https://learn.microsoft.com/en-us/windows/win32/api/iphlpapi/nf-iphlpapi-getadaptersaddresses. -const ( - GAA_FLAG_SKIP_UNICAST = 0x1 - GAA_FLAG_SKIP_ANYCAST = 0x2 - GAA_FLAG_SKIP_MULTICAST = 0x4 - GAA_FLAG_SKIP_DNS_SERVER = 0x8 - GAA_FLAG_INCLUDE_PREFIX = 0x10 - GAA_FLAG_SKIP_FRIENDLY_NAME = 0x20 - GAA_FLAG_INCLUDE_WINS_INFO = 0x40 - GAA_FLAG_INCLUDE_GATEWAYS = 0x80 - GAA_FLAG_INCLUDE_ALL_INTERFACES = 0x100 - GAA_FLAG_INCLUDE_ALL_COMPARTMENTS = 0x200 - GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER = 0x400 -) +const GAA_FLAG_INCLUDE_PREFIX = 0x00000010 const ( IF_TYPE_OTHER = 1 @@ -2032,50 +2017,6 @@ const ( IF_TYPE_IEEE1394 = 144 ) -// Enum NL_PREFIX_ORIGIN for [IpAdapterUnicastAddress], see -// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_prefix_origin -const ( - IpPrefixOriginOther = 0 - IpPrefixOriginManual = 1 - IpPrefixOriginWellKnown = 2 - IpPrefixOriginDhcp = 3 - IpPrefixOriginRouterAdvertisement = 4 - IpPrefixOriginUnchanged = 1 << 4 -) - -// Enum NL_SUFFIX_ORIGIN for [IpAdapterUnicastAddress], see -// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_suffix_origin -const ( - NlsoOther = 0 - NlsoManual = 1 - NlsoWellKnown = 2 - NlsoDhcp = 3 - NlsoLinkLayerAddress = 4 - NlsoRandom = 5 - IpSuffixOriginOther = 0 - IpSuffixOriginManual = 1 - IpSuffixOriginWellKnown = 2 - IpSuffixOriginDhcp = 3 - IpSuffixOriginLinkLayerAddress = 4 - IpSuffixOriginRandom = 5 - IpSuffixOriginUnchanged = 1 << 4 -) - -// Enum NL_DAD_STATE for [IpAdapterUnicastAddress], see -// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_dad_state -const ( - NldsInvalid = 0 - NldsTentative = 1 - NldsDuplicate = 2 - NldsDeprecated = 3 - NldsPreferred = 4 - IpDadStateInvalid = 0 - IpDadStateTentative = 1 - IpDadStateDuplicate = 2 - IpDadStateDeprecated = 3 - IpDadStatePreferred = 4 -) - type SocketAddress struct { Sockaddr *syscall.RawSockaddrAny SockaddrLength int32 @@ -3463,14 +3404,3 @@ type DCB struct { EvtChar byte wReserved1 uint16 } - -// Keyboard Layout Flags. -// See https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-loadkeyboardlayoutw -const ( - KLF_ACTIVATE = 0x00000001 - KLF_SUBSTITUTE_OK = 0x00000002 - KLF_REORDER = 0x00000008 - KLF_REPLACELANG = 0x00000010 - KLF_NOTELLSHELL = 0x00000080 - KLF_SETFORPROCESS = 0x00000100 -) diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go index 4c2e1bd..eba7610 100644 --- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go +++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go @@ -247,9 +247,7 @@ var ( procGetCommandLineW = modkernel32.NewProc("GetCommandLineW") procGetComputerNameExW = modkernel32.NewProc("GetComputerNameExW") procGetComputerNameW = modkernel32.NewProc("GetComputerNameW") - procGetConsoleCP = modkernel32.NewProc("GetConsoleCP") procGetConsoleMode = modkernel32.NewProc("GetConsoleMode") - procGetConsoleOutputCP = modkernel32.NewProc("GetConsoleOutputCP") procGetConsoleScreenBufferInfo = modkernel32.NewProc("GetConsoleScreenBufferInfo") procGetCurrentDirectoryW = modkernel32.NewProc("GetCurrentDirectoryW") procGetCurrentProcessId = modkernel32.NewProc("GetCurrentProcessId") @@ -349,10 +347,8 @@ var ( procSetCommMask = modkernel32.NewProc("SetCommMask") procSetCommState = modkernel32.NewProc("SetCommState") procSetCommTimeouts = modkernel32.NewProc("SetCommTimeouts") - procSetConsoleCP = modkernel32.NewProc("SetConsoleCP") procSetConsoleCursorPosition = modkernel32.NewProc("SetConsoleCursorPosition") procSetConsoleMode = modkernel32.NewProc("SetConsoleMode") - procSetConsoleOutputCP = modkernel32.NewProc("SetConsoleOutputCP") procSetCurrentDirectoryW = modkernel32.NewProc("SetCurrentDirectoryW") procSetDefaultDllDirectories = modkernel32.NewProc("SetDefaultDllDirectories") procSetDllDirectoryW = modkernel32.NewProc("SetDllDirectoryW") @@ -482,16 +478,12 @@ var ( procGetDesktopWindow = moduser32.NewProc("GetDesktopWindow") procGetForegroundWindow = moduser32.NewProc("GetForegroundWindow") procGetGUIThreadInfo = moduser32.NewProc("GetGUIThreadInfo") - procGetKeyboardLayout = moduser32.NewProc("GetKeyboardLayout") procGetShellWindow = moduser32.NewProc("GetShellWindow") procGetWindowThreadProcessId = moduser32.NewProc("GetWindowThreadProcessId") procIsWindow = moduser32.NewProc("IsWindow") procIsWindowUnicode = moduser32.NewProc("IsWindowUnicode") procIsWindowVisible = moduser32.NewProc("IsWindowVisible") - procLoadKeyboardLayoutW = moduser32.NewProc("LoadKeyboardLayoutW") procMessageBoxW = moduser32.NewProc("MessageBoxW") - procToUnicodeEx = moduser32.NewProc("ToUnicodeEx") - procUnloadKeyboardLayout = moduser32.NewProc("UnloadKeyboardLayout") procCreateEnvironmentBlock = moduserenv.NewProc("CreateEnvironmentBlock") procDestroyEnvironmentBlock = moduserenv.NewProc("DestroyEnvironmentBlock") procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW") @@ -797,14 +789,6 @@ func FreeSid(sid *SID) (err error) { return } -func GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (err error) { - r1, _, e1 := syscall.Syscall(procGetAce.Addr(), 3, uintptr(unsafe.Pointer(acl)), uintptr(aceIndex), uintptr(unsafe.Pointer(pAce))) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - func GetLengthSid(sid *SID) (len uint32) { r0, _, _ := syscall.Syscall(procGetLengthSid.Addr(), 1, uintptr(unsafe.Pointer(sid)), 0, 0) len = uint32(r0) @@ -1241,6 +1225,14 @@ func setEntriesInAcl(countExplicitEntries uint32, explicitEntries *EXPLICIT_ACCE return } +func GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (ret error) { + r0, _, _ := syscall.Syscall(procGetAce.Addr(), 3, uintptr(unsafe.Pointer(acl)), uintptr(aceIndex), uintptr(unsafe.Pointer(pAce))) + if r0 == 0 { + ret = GetLastError() + } + return +} + func SetKernelObjectSecurity(handle Handle, securityInformation SECURITY_INFORMATION, securityDescriptor *SECURITY_DESCRIPTOR) (err error) { r1, _, e1 := syscall.Syscall(procSetKernelObjectSecurity.Addr(), 3, uintptr(handle), uintptr(securityInformation), uintptr(unsafe.Pointer(securityDescriptor))) if r1 == 0 { @@ -2166,15 +2158,6 @@ func GetComputerName(buf *uint16, n *uint32) (err error) { return } -func GetConsoleCP() (cp uint32, err error) { - r0, _, e1 := syscall.Syscall(procGetConsoleCP.Addr(), 0, 0, 0, 0) - cp = uint32(r0) - if cp == 0 { - err = errnoErr(e1) - } - return -} - func GetConsoleMode(console Handle, mode *uint32) (err error) { r1, _, e1 := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(mode)), 0) if r1 == 0 { @@ -2183,15 +2166,6 @@ func GetConsoleMode(console Handle, mode *uint32) (err error) { return } -func GetConsoleOutputCP() (cp uint32, err error) { - r0, _, e1 := syscall.Syscall(procGetConsoleOutputCP.Addr(), 0, 0, 0, 0) - cp = uint32(r0) - if cp == 0 { - err = errnoErr(e1) - } - return -} - func GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) { r1, _, e1 := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(info)), 0) if r1 == 0 { @@ -3060,14 +3034,6 @@ func SetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error) { return } -func SetConsoleCP(cp uint32) (err error) { - r1, _, e1 := syscall.Syscall(procSetConsoleCP.Addr(), 1, uintptr(cp), 0, 0) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - func setConsoleCursorPosition(console Handle, position uint32) (err error) { r1, _, e1 := syscall.Syscall(procSetConsoleCursorPosition.Addr(), 2, uintptr(console), uintptr(position), 0) if r1 == 0 { @@ -3084,14 +3050,6 @@ func SetConsoleMode(console Handle, mode uint32) (err error) { return } -func SetConsoleOutputCP(cp uint32) (err error) { - r1, _, e1 := syscall.Syscall(procSetConsoleOutputCP.Addr(), 1, uintptr(cp), 0, 0) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - func SetCurrentDirectory(path *uint16) (err error) { r1, _, e1 := syscall.Syscall(procSetCurrentDirectoryW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0) if r1 == 0 { @@ -4124,12 +4082,6 @@ func GetGUIThreadInfo(thread uint32, info *GUIThreadInfo) (err error) { return } -func GetKeyboardLayout(tid uint32) (hkl Handle) { - r0, _, _ := syscall.Syscall(procGetKeyboardLayout.Addr(), 1, uintptr(tid), 0, 0) - hkl = Handle(r0) - return -} - func GetShellWindow() (shellWindow HWND) { r0, _, _ := syscall.Syscall(procGetShellWindow.Addr(), 0, 0, 0, 0) shellWindow = HWND(r0) @@ -4163,15 +4115,6 @@ func IsWindowVisible(hwnd HWND) (isVisible bool) { return } -func LoadKeyboardLayout(name *uint16, flags uint32) (hkl Handle, err error) { - r0, _, e1 := syscall.Syscall(procLoadKeyboardLayoutW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(flags), 0) - hkl = Handle(r0) - if hkl == 0 { - err = errnoErr(e1) - } - return -} - func MessageBox(hwnd HWND, text *uint16, caption *uint16, boxtype uint32) (ret int32, err error) { r0, _, e1 := syscall.Syscall6(procMessageBoxW.Addr(), 4, uintptr(hwnd), uintptr(unsafe.Pointer(text)), uintptr(unsafe.Pointer(caption)), uintptr(boxtype), 0, 0) ret = int32(r0) @@ -4181,20 +4124,6 @@ func MessageBox(hwnd HWND, text *uint16, caption *uint16, boxtype uint32) (ret i return } -func ToUnicodeEx(vkey uint32, scancode uint32, keystate *byte, pwszBuff *uint16, cchBuff int32, flags uint32, hkl Handle) (ret int32) { - r0, _, _ := syscall.Syscall9(procToUnicodeEx.Addr(), 7, uintptr(vkey), uintptr(scancode), uintptr(unsafe.Pointer(keystate)), uintptr(unsafe.Pointer(pwszBuff)), uintptr(cchBuff), uintptr(flags), uintptr(hkl), 0, 0) - ret = int32(r0) - return -} - -func UnloadKeyboardLayout(hkl Handle) (err error) { - r1, _, e1 := syscall.Syscall(procUnloadKeyboardLayout.Addr(), 1, uintptr(hkl), 0, 0) - if r1 == 0 { - err = errnoErr(e1) - } - return -} - func CreateEnvironmentBlock(block **uint16, token Token, inheritExisting bool) (err error) { var _p0 uint32 if inheritExisting { diff --git a/vendor/howett.net/plist/bplist_parser.go b/vendor/howett.net/plist/bplist_parser.go index 8bb164e..1825b57 100644 --- a/vendor/howett.net/plist/bplist_parser.go +++ b/vendor/howett.net/plist/bplist_parser.go @@ -137,10 +137,7 @@ func (p *bplistParser) parseSizedInteger(off offset, nbytes int) (lo uint64, hi case 16: lo, hi = binary.BigEndian.Uint64(p.buffer[off+8:]), binary.BigEndian.Uint64(p.buffer[off:]) default: - if nbytes > 8 { - panic(errors.New("illegal integer size")) - } - lo, hi = binary.BigEndian.Uint64(p.buffer[off-(8-offset(nbytes)):]) & ((1<