opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-04 20:28:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor github.com/godbus/dbus/v5@4b691ce

Browse Source 
This pulls in https://github.com/godbus/dbus/pull/332 allowing dbus to
build without cgo on FreeBSD. This will allow freebsd targets in the cross
build.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-10-29 16:03:29 +01:00
parent a263069568
commit 0d505f20ff
26 changed files with 111 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/github.com/godbus/dbus/v5/transport_unix.go generated vendored
View File

@@ -1,4 +1,5 @@
//+build !windows,!solaris
//go:build !windows && !solaris
// +build !windows,!solaris
package dbus
@@ -101,8 +102,12 @@ func (t *unixTransport) ReadMessage() (*Message, error) {
}
// csheader[4:8] -> length of message body, csheader[12:16] -> length of
// header fields (without alignment)
binary.Read(bytes.NewBuffer(csheader[4:8]), order, &blen)
binary.Read(bytes.NewBuffer(csheader[12:]), order, &hlen)
if err := binary.Read(bytes.NewBuffer(csheader[4:8]), order, &blen); err != nil {
return nil, err
}
if err := binary.Read(bytes.NewBuffer(csheader[12:]), order, &hlen); err != nil {
return nil, err
}
if hlen%8 != 0 {
hlen += 8 - (hlen % 8)
}
@@ -119,7 +124,10 @@ func (t *unixTransport) ReadMessage() (*Message, error) {
if err != nil {
return nil, err
}
Store(vs, &headers)
err = Store(vs, &headers)
if err != nil {
return nil, err
}
for _, v := range headers {
if v.Field == byte(FieldUnixFDs) {
unixfds, _ = v.Variant.value.(uint32)