aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cmd/hakurei/command.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go
index 8f588654..b40b6b86 100644
--- a/cmd/hakurei/command.go
+++ b/cmd/hakurei/command.go
@@ -2,6 +2,7 @@ package main
import (
"context"
+ "errors"
"fmt"
"io"
"log"
@@ -11,7 +12,6 @@ import (
"strconv"
"sync"
"time"
- _ "unsafe" // for go:linkname
"hakurei.app/check"
"hakurei.app/command"
@@ -27,9 +27,12 @@ import (
// optionalErrorUnwrap calls [errors.Unwrap] and returns the resulting value
// if it is not nil, or the original value if it is.
-//
-//go:linkname optionalErrorUnwrap hakurei.app/container.optionalErrorUnwrap
-func optionalErrorUnwrap(err error) error
+func optionalErrorUnwrap(err error) error {
+ if underlyingErr := errors.Unwrap(err); underlyingErr != nil {
+ return underlyingErr
+ }
+ return err
+}
func buildCommand(ctx context.Context, msg message.Msg, early *earlyHardeningErrs, out io.Writer) command.Command {
var (