libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

do not handle errors on mktemp in shell scripts 

errors are not defined for mktemp, and the /tmp file
system should be assumed reliable.

if /tmp is *unreliable*, then this is not something that
lbmk either can or should fix; the user clearly has
bigger problems.

manpages for mktemp do not define errors. it is assumed
to be completely reliable.

Signed-off-by: Leah Rowe <leah@libreboot.org>
btrfsvols
Leah Rowe 2023-10-02 03:39:10 +01:00
parent 8c03b886c4
commit 7b02bb9aa6
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/option.sh
View File

@ -24,10 +24,9 @@ scan_config()
awkstr=" /\{.*${1}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }" awkstr=" /\{.*${1}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }"
confdir="${2}" confdir="${2}"
_fail="${3}" _fail="${3}"
revfile="$(mktemp -t sources.XXXXXXXXXX)" || \ revfile="$(mktemp -t sources.XXXXXXXXXX)"
"${_fail}" "scan_config: Cannot initialise tmpfile"
cat "${confdir}/"* > "${revfile}" || \ cat "${confdir}/"* > "${revfile}" || \
"${_fail}" "scan_config: Cannot concatenate files" "${_fail}" "scan_config ${confdir}: Cannot concatenate files"
while read -r line ; do while read -r line ; do
set ${line} 1>/dev/null 2>/dev/null || : set ${line} 1>/dev/null 2>/dev/null || :
if [ "${1%:}" = "depend" ]; then if [ "${1%:}" = "depend" ]; then

6
script/build/boot/roms_helper
View File

@ -263,8 +263,7 @@ build_grub_roms()
-n background.png -t raw -n background.png -t raw
fi fi
tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) || tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX)
err "build_grub_roms: cannot create temporary scan.cfg"
x_ printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}" x_ printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}"
[ "${grub_scan_disk}" = "both" ] || \ [ "${grub_scan_disk}" = "both" ] || \
x_ "${cbfstool}" "${tmprom}" add -f "${tmpcfg}" -n scan.cfg -t raw x_ "${cbfstool}" "${tmprom}" add -f "${tmpcfg}" -n scan.cfg -t raw
@ -302,8 +301,7 @@ mkGrubRom() {
keymapcfg="elf/grub/keymap_${_keymap}.cfg" keymapcfg="elf/grub/keymap_${_keymap}.cfg"
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) || \ tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
err "mkGrubRom: cannot create tmprom"
x_ cp "${_cbrom}" "${tmprom}" x_ cp "${_cbrom}" "${tmprom}"
x_ "${cbfstool}" "${tmprom}" add -f "${keymapcfg}" -n keymap.cfg -t raw x_ "${cbfstool}" "${tmprom}" add -f "${keymapcfg}" -n keymap.cfg -t raw

2
script/handle/make/config
View File

@ -18,7 +18,7 @@ export LOCALVERSION="-${projectname}-${our_version}"
eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \ eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \
elfdir listfile project romtype target target_dir targets tree cbfstool)" elfdir listfile project romtype target target_dir targets tree cbfstool)"
tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)" || fail "!mkdir tmpclean" tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)"
main() main()
{ {