newvers.sh: Don't use return to exit.
ClosedPublic
Actions

Authored by jhb on Jun 14 2022, 4:10 PM.

Details

Reviewers

emaste
imp

Commits

rG74a790b760a9: newvers.sh: Don't use return to exit.
rG6ab35c78fb5a: newvers.sh: Don't use return to exit.

Summary

Commit acfb506b3d00 replaced an exit 0 when using -V with a return
instead. FreeBSD's sh treats a return outside of a function like
exit, but this is a non-portable extension. Other Bourne shells only
permit return to be used within a function and continue execution
(possibly with a warning).

To fix, don't reuse VARS_ONLY (which is intended to be set by other
scripts before sourcing newvers.sh directly) and instead use a new
variable (VARS_ONLY_EXIT) to restore the use of exit for the
non-sourced case.

Obtained from: CheriBSD
Sponsored by: DARPA

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 45972
Build 42860: arc lint + arc unit

Event Timeline

jhb requested review of this revision.Jun 14 2022, 4:10 PM

jhb created this revision.

Harbormaster completed remote builds in B45972: Diff 106911.Jun 14 2022, 4:11 PM

emaste accepted this revision.Jun 14 2022, 4:15 PM

emaste added inline comments.

sys/conf/newvers.sh
138	could we just make this exit 0?

This revision is now accepted and ready to land.Jun 14 2022, 4:15 PM

jhb added inline comments.Jun 14 2022, 5:41 PM

sys/conf/newvers.sh
138	No. The intended use case is something like: #/bin/sh ... VARS_ONLY=1 . /path/to/sys/conf/newvers.sh ... If you called exit 0 here you would exit that outer script rather than returning to the next line in the outer script.