From 79060a37949efb19678a4a67b5b57fe38514bcf7 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Mon, 16 Dec 2024 03:09:53 +0000 Subject: [PATCH] Build system tweaks; other small tweaks & cleanups Main changes: libast: Reduce the dependencies on ast_release.h (which defines _AST_release for release builds, disabling debugging code). No longer auto-include this from ast.h. Files that need it should include it explicitly and declare this dependency in the Mamfile. bin/package: Rework the way of dealing with LD_LIBRARY_PATH and friends. On init, ensure $INSTALLROOT-based directories are *not* in there (potentially inherited from a 'bin/package use' environmetn) as this may break the build. When doing 'test' and/or 'use', re-add these as appropriate. --- bin/package | 131 +++++++++++----------- src/cmd/INIT/Mamfile | 3 +- src/cmd/INIT/iffe.sh | 42 +++---- src/cmd/INIT/utils/Mamfile_rm_unused_vars | 2 +- src/cmd/ksh93/Mamfile | 4 + src/cmd/ksh93/edit/emacs.c | 1 + src/cmd/ksh93/include/edit.h | 4 +- src/cmd/ksh93/sh/arith.c | 1 + src/cmd/ksh93/sh/array.c | 1 + src/cmd/ksh93/sh/lex.c | 1 + src/cmd/ksh93/tests/builtins.sh | 2 +- src/cmd/ksh93/tests/case.sh | 4 +- src/cmd/ksh93/tests/path.sh | 2 +- src/cmd/ksh93/tests/shtests | 3 +- src/lib/libast/Mamfile | 14 +-- src/lib/libast/features/wchar | 38 ++++--- src/lib/libast/include/ast.h | 2 - src/lib/libast/port/astconf.c | 2 +- src/lib/libcmd/chgrp.c | 4 +- src/lib/libcmd/cksum.c | 4 +- src/lib/libcmd/cp.c | 6 +- 21 files changed, 135 insertions(+), 136 deletions(-) diff --git a/bin/package b/bin/package index 63eaf7b96e18..39431b3b4d7f 100755 --- a/bin/package +++ b/bin/package @@ -131,7 +131,7 @@ command=${0##*/} case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in 0123) USAGE=$' [-? -@(#)$Id: '$command$' (ksh 93u+m) 2024-12-07 $ +@(#)$Id: '$command$' (ksh 93u+m) 2024-12-16 $ ] [-author?Glenn Fowler ] [-author?Contributors to https://github.com/ksh93/ksh] @@ -564,7 +564,7 @@ SEE ALSO pkgadd(1), pkgmk(1), rpm(1), sh(1), tar(1), optget(3) IMPLEMENTATION - version package (ksh 93u+m) 2024-12-07 + version package (ksh 93u+m) 2024-12-16 author Glenn Fowler author Contributors to https://github.com/ksh93/ksh copyright (c) 1994-2012 AT&T Intellectual Property @@ -1794,6 +1794,43 @@ export DEFPATH # for iffe, etc. PATH=$(sanitize_PATH "/opt/ast/bin:$DEFPATH:$PATH") +# remove $INSTALLROOT/... from these; may be harmful while building +# (these comes pre-set when running package from a 'package use' environment) +case $LD_LIBRARY_PATH in +"$INSTALLROOT"/dyn/lib) + unset LD_LIBRARY_PATH ;; +"$INSTALLROOT"/dyn/lib:*) + LD_LIBRARY_PATH=${LD_LIBRARY_PATH#*:} ;; +esac +case $LIBPATH in +"$INSTALLROOT"/dyn/bin:"$INSTALLROOT"/dyn/lib:*) + LIBPATH=${LIBPATH#*:*:} ;; +esac +case $SHLIB_PATH in +"$INSTALLROOT"/dyn/lib) + unset SHLIB_PATH ;; +"$INSTALLROOT"/dyn/lib:*) + SHLIB_PATH=${SHLIB_PATH#*:} ;; +esac +case $DYLD_LIBRARY_PATH in +"$INSTALLROOT"/dyn/lib) + unset DYLD_LIBRARY_PATH ;; +"$INSTALLROOT"/dyn/lib:*) + DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH#*:} ;; +esac +case $LIBRARY_PATH in +"$INSTALLROOT"/dyn/lib) + unset LIBRARY_PATH ;; +"$INSTALLROOT"/dyn/lib:*) + LIBRARY_PATH=${LIBRARY_PATH#*:} ;; +esac +case $C_INCLUDE_PATH in +"$INSTALLROOT"/include/ast) + unset C_INCLUDE_PATH ;; +"$INSTALLROOT"/include/ast:*) + C_INCLUDE_PATH=${C_INCLUDE_PATH#*:} ;; +esac + # some actions have their own PACKAGEROOT or kick out early case $action in @@ -2032,74 +2069,32 @@ case $x in # Allow loading dynamic libraries from $INSTALLROOT/dyn/lib by setting library # path variables for various systems; instead of bothering to detect the system, # just set them all. (Note: not needed and potentially harmful while building.) - case $LD_LIBRARY_PATH: in - $INSTALLROOT/dyn/lib:*) - ;; - *) LD_LIBRARY_PATH=$INSTALLROOT/dyn/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - $show LD_LIBRARY_PATH=$LD_LIBRARY_PATH - $show export LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; - esac - case $LIBPATH: in - $INSTALLROOT/dyn/bin:$INSTALLROOT/dyn/lib:*) - ;; - *) case $LIBPATH in - '') LIBPATH=/usr/lib:/lib ;; - esac - LIBPATH=$INSTALLROOT/dyn/bin:$INSTALLROOT/dyn/lib:$LIBPATH - $show LIBPATH=$LIBPATH - $show export LIBPATH - export LIBPATH - ;; - esac - case $SHLIB_PATH: in - $INSTALLROOT/dyn/lib:*) - ;; - *) SHLIB_PATH=$INSTALLROOT/dyn/lib${SHLIB_PATH:+:$SHLIB_PATH} - $show SHLIB_PATH=$SHLIB_PATH - $show export SHLIB_PATH - export SHLIB_PATH - ;; - esac - case $DYLD_LIBRARY_PATH: in - $INSTALLROOT/dyn/lib:*) - ;; - *) DYLD_LIBRARY_PATH=$INSTALLROOT/dyn/lib${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH} - $show DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH - $show export DYLD_LIBRARY_PATH - export DYLD_LIBRARY_PATH - ;; - esac - case $_RLD_ROOT in - $INSTALLROOT/arch*) ;; - ':') _RLD_ROOT=$INSTALLROOT/arch:/ ;; - /|*:/) _RLD_ROOT=$INSTALLROOT/arch:$_RLD_ROOT ;; - *) _RLD_ROOT=$INSTALLROOT/arch:$_RLD_ROOT:/ ;; + export LD_LIBRARY_PATH=$INSTALLROOT/dyn/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + $show export LD_LIBRARY_PATH=$LD_LIBRARY_PATH + + case $LIBPATH in + '') LIBPATH=/usr/lib:/lib ;; esac - $show _RLD_ROOT=$_RLD_ROOT - $show export _RLD_ROOT - export _RLD_ROOT + export LIBPATH=$INSTALLROOT/dyn/bin:$INSTALLROOT/dyn/lib:$LIBPATH + $show export LIBPATH=$LIBPATH + + export SHLIB_PATH=$INSTALLROOT/dyn/lib${SHLIB_PATH:+:$SHLIB_PATH} + $show export SHLIB_PATH=$SHLIB_PATH + + export DYLD_LIBRARY_PATH=$INSTALLROOT/dyn/lib${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH} + $show export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH + # dynamic library search path for gcc and clang; also used for runtime linking on Haiku - case $LIBRARY_PATH: in - $INSTALLROOT/dyn/lib:*) - ;; - *) LIBRARY_PATH=$INSTALLROOT/dyn/lib${LIBRARY_PATH:+:$LIBRARY_PATH} - $show LIBRARY_PATH=$LIBRARY_PATH - $show export LIBRARY_PATH - export LIBRARY_PATH - ;; - esac - # include header search path for gcc and clang - case $C_INCLUDE_PATH: in - $INSTALLROOT/include/ast:*) - ;; - *) C_INCLUDE_PATH=$INSTALLROOT/include/ast${C_INCLUDE_PATH:+:$C_INCLUDE_PATH} - $show C_INCLUDE_PATH=$C_INCLUDE_PATH - $show export C_INCLUDE_PATH - export C_INCLUDE_PATH - ;; - esac + export LIBRARY_PATH=$INSTALLROOT/dyn/lib${LIBRARY_PATH:+:$LIBRARY_PATH} + $show export LIBRARY_PATH=$LIBRARY_PATH + ;; + esac + case $action in + use) + # Include header search path for gcc and clang. Allows skipping '-I ~ast/include/ast' + # when compiling a test program from the command line in a 'package use' environment. + export C_INCLUDE_PATH=$INSTALLROOT/include/ast${C_INCLUDE_PATH:+:$C_INCLUDE_PATH} + $show export C_INCLUDE_PATH=$C_INCLUDE_PATH ;; esac diff --git a/src/cmd/INIT/Mamfile b/src/cmd/INIT/Mamfile index c22d4bfac0c3..67c529005295 100644 --- a/src/cmd/INIT/Mamfile +++ b/src/cmd/INIT/Mamfile @@ -11,7 +11,7 @@ note * initialization for the build system note * make install virtual - loop DIR bin include/ast lib/lib lib/probe/C/make lib/probe/C/pp lib/probe/C/mam + loop DIR bin include/ast lib/lib lib/probe/C/make lib/probe/C/mam make %{INSTALLROOT}/%{DIR} exec - mkdir -p %{@} done @@ -184,7 +184,6 @@ make test dontcare virtual done make test.iffe virtual makp iffe.tst - exec - unset C_INCLUDE_PATH # set by bin/package, but invalidates some iffe tests exec - regress --verbose %{<} iffe done done test diff --git a/src/cmd/INIT/iffe.sh b/src/cmd/INIT/iffe.sh index 154df7fd725c..0042ab4c4f82 100644 --- a/src/cmd/INIT/iffe.sh +++ b/src/cmd/INIT/iffe.sh @@ -33,13 +33,16 @@ esac set -o noglob command=iffe -version=2024-08-02 +version=2024-12-16 # DEFPATH should be inherited from package(1) case $DEFPATH in /*) ;; -*) echo "$command: DEFPATH not set" >&2 - exit 1 ;; +*) DEFPATH=$(getconf PATH) || + { + echo "$command: DEFPATH not set" >&2 + exit 1 + } ;; esac compile() # $cc ... @@ -1173,8 +1176,10 @@ esac { test -f "$3" && test "$o" -nt "$3" } } || exit 1 - echo "$command: test results in $o are up to date" >&$stderr - # update timestamp for correct dependency resolution in mamake + # still bump the timestamp for correct dependency resolution in mamake + case $verbose in + 1) echo "$command: test results in $o are up to date; bumping timestamp" >&$stderr ;; + esac touch "$o" || kill "$$" ) && exit 0 @@ -1211,9 +1216,11 @@ std='/* AST backward compatibility macros */ #define _END_EXTERNS_' # To ensure the environment tested is the same as that used, add standards # compliance macros as probed by libast as soon as they are available. -if test -f "${INSTALLROOT}/src/lib/libast/${dir}/standards" -then std=${std}${nl}$(cat "${INSTALLROOT}/src/lib/libast/${dir}/standards") -fi +case $INSTALLROOT in +/*) if test -f "${INSTALLROOT}/src/lib/libast/${dir}/standards" + then std="${std}${nl}#include \"${INSTALLROOT}/src/lib/libast/${dir}/standards\"" + fi ;; +esac tst= ext="#include " @@ -2855,18 +2862,13 @@ int x; sed 's,/\*[^/]*\*/, ,g' $x > $tmp.t ;; esac - if cmp -s $tmp.c $tmp.t - then rm -f $tmp.h - case $verbose in - 1) echo "$command: $x: unchanged;" \ - "updating timestamp" >&$stderr ;; - esac - touch "$x" # needed for mamake dependency tree integrity - else case $x in - ${dir}[\\/]$cur) test -d $dir || mkdir $dir || exit 1 ;; - esac - mv $tmp.h $x - fi + # to ensure correct dependency resolution, always move the new file + # over, to bump the timestamp even if the results haven't changed + case $x in + ${dir}[\\/]$cur) + test -d $dir || mkdir $dir || exit ;; + esac + mv -f $tmp.h $x || exit ;; esac ;; diff --git a/src/cmd/INIT/utils/Mamfile_rm_unused_vars b/src/cmd/INIT/utils/Mamfile_rm_unused_vars index 80845dfb1d91..073f6b3dae21 100755 --- a/src/cmd/INIT/utils/Mamfile_rm_unused_vars +++ b/src/cmd/INIT/utils/Mamfile_rm_unused_vars @@ -20,7 +20,7 @@ IFS=$CCn; for varname in $vars; do IFS= MAMAKE_STRICT) continue ;; esac case $mamfile in - *"\${$varname"[}[:=?+-]* | *"%{$varname"[}\|?+-]* ) + *"\${$varname"[}\[:=?+-]* | *"%{$varname"[}\|?+-]* ) ;; * ) # add with '|' separator for Extended Regular Expression rm_unused_ere="${rm_unused_ere:+$rm_unused_ere|}setv[[:blank:]]+$varname([[:blank:]]|$)" ;; diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile index 0b70f6ab9afd..3718a74bc000 100644 --- a/src/cmd/ksh93/Mamfile +++ b/src/cmd/ksh93/Mamfile @@ -561,6 +561,7 @@ make install virtual done make sh/arith.c + prev %{INCLUDE_AST}/ast_release.h prev include/builtins.h prev include/variables.h prev include/streval.h @@ -584,6 +585,7 @@ make install virtual done make sh/array.c + prev %{INCLUDE_AST}/ast_release.h prev include/name.h prev include/defs.h prev shopt.h @@ -727,6 +729,7 @@ make install virtual done make sh/lex.c + prev %{INCLUDE_AST}/ast_release.h prev include/shlex.h prev include/io.h prev include/lexstates.h @@ -973,6 +976,7 @@ make install virtual done make edit/emacs.c + prev %{INCLUDE_AST}/ast_release.h prev include/terminal.h prev include/edit.h prev include/history.h diff --git a/src/cmd/ksh93/edit/emacs.c b/src/cmd/ksh93/edit/emacs.c index 2fe4e14e5685..fb07b62d5ee8 100644 --- a/src/cmd/ksh93/edit/emacs.c +++ b/src/cmd/ksh93/edit/emacs.c @@ -72,6 +72,7 @@ One line screen editor for any program #if SHOPT_MULTIBYTE #include #endif /* SHOPT_MULTIBYTE */ +#include #define ESH_NFIRST #define ESH_KAPPEND diff --git a/src/cmd/ksh93/include/edit.h b/src/cmd/ksh93/include/edit.h index 90067a85c7d4..8b01a48f6609 100644 --- a/src/cmd/ksh93/include/edit.h +++ b/src/cmd/ksh93/include/edit.h @@ -35,9 +35,7 @@ #define LOOKAHEAD 80 #if SHOPT_MULTIBYTE -# ifndef ESS_MAXCHAR -# include "national.h" -# endif /* ESS_MAXCHAR */ +# include "national.h" typedef wchar_t genchar; # define CHARSIZE (sizeof(wchar_t)<=2?3:sizeof(wchar_t)) #else diff --git a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c index 838c4a7d85d0..788f9553b63c 100644 --- a/src/cmd/ksh93/sh/arith.c +++ b/src/cmd/ksh93/sh/arith.c @@ -29,6 +29,7 @@ #include "streval.h" #include "variables.h" #include "builtins.h" +#include #ifndef LLONG_MAX #define LLONG_MAX LONG_MAX diff --git a/src/cmd/ksh93/sh/array.c b/src/cmd/ksh93/sh/array.c index db20e8730e96..a68246447c41 100644 --- a/src/cmd/ksh93/sh/array.c +++ b/src/cmd/ksh93/sh/array.c @@ -28,6 +28,7 @@ #include "shopt.h" #include "defs.h" #include "name.h" +#include #if _AST_release #define NDEBUG diff --git a/src/cmd/ksh93/sh/lex.c b/src/cmd/ksh93/sh/lex.c index 7dfb5858cab0..9f36e04822d7 100644 --- a/src/cmd/ksh93/sh/lex.c +++ b/src/cmd/ksh93/sh/lex.c @@ -35,6 +35,7 @@ #include "lexstates.h" #include "io.h" #include "shlex.h" +#include #define TEST_RE 3 #define SYNBAD 3 /* exit value for syntax errors */ diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh index 3fb9070c8b4f..05ca03202cb1 100755 --- a/src/cmd/ksh93/tests/builtins.sh +++ b/src/cmd/ksh93/tests/builtins.sh @@ -594,7 +594,7 @@ fi while (( i <2)) do (( i++)) done) == $'0\n0\n1\n1\n2' ]] || err_exit "DEBUG trap not working" -if builtin getconf 2> /dev/null; then +if ((!SHOPT_ECHOPRINT)) && builtin getconf 2> /dev/null; then getconf UNIVERSE - ucb [[ $($SHELL -c 'echo -3') == -3 ]] || err_exit "echo -3 not working in ucb universe" fi diff --git a/src/cmd/ksh93/tests/case.sh b/src/cmd/ksh93/tests/case.sh index a791b24772c8..7689b5090834 100755 --- a/src/cmd/ksh93/tests/case.sh +++ b/src/cmd/ksh93/tests/case.sh @@ -2,7 +2,7 @@ # # # This software is part of the ast package # # Copyright (c) 1982-2011 AT&T Intellectual Property # -# Copyright (c) 2020-2023 Contributors to ksh 93u+m # +# Copyright (c) 2020-2024 Contributors to ksh 93u+m # # and is licensed under the # # Eclipse Public License, Version 2.0 # # # @@ -55,7 +55,7 @@ fi a) print -n a > /dev/null ;& b) print b;; esac') != b ]] && err_exit 'bug in ;& at end of script' -[[ $(VMDEBUG=1 $SHELL -c ' +[[ $("$SHELL" -c ' tmp=foo for i in a b do case $i in diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh index c534d96e4452..6e3f233f0a53 100755 --- a/src/cmd/ksh93/tests/path.sh +++ b/src/cmd/ksh93/tests/path.sh @@ -310,7 +310,7 @@ status=$($SHELL -c $'trap \'print $?\' ERR;/dev/null 2> /dev/null') # universe via PATH -if builtin getconf 2> /dev/null; then +if ((!SHOPT_ECHOPRINT)) && builtin getconf 2> /dev/null; then getconf UNIVERSE - att # override sticky default 'UNIVERSE = foo' [[ $(PATH=/usr/ucb/bin:/usr/bin echo -n ucb) == 'ucb' ]] || err_exit "ucb universe echo ignores -n option" diff --git a/src/cmd/ksh93/tests/shtests b/src/cmd/ksh93/tests/shtests index 921739159ff0..1ed797132fff 100755 --- a/src/cmd/ksh93/tests/shtests +++ b/src/cmd/ksh93/tests/shtests @@ -278,8 +278,9 @@ then s=${SHELL:##*sh} fi # when testing a shell outside of INSTALLROOT, make sure libraries in INSTALLROOT are not loaded +# The variables unset below should be the same ones that are set for 'test' or 'use' in bin/package if ! [[ ${SHELL%/*} -ef $INSTALLROOT/bin || ${SHELL%/*} -ef $INSTALLROOT/dyn/bin ]] -then unset -v LD_LIBRARY_PATH LIBPATH SHLIB_PATH DYLD_LIBRARY_PATH _RLD_ROOT +then unset -v LD_LIBRARY_PATH LIBPATH SHLIB_PATH DYLD_LIBRARY_PATH LIBRARY_PATH C_INCLUDE_PATH fi tmp=$( diff --git a/src/lib/libast/Mamfile b/src/lib/libast/Mamfile index a2db7f9d278d..7ed52d2368de 100644 --- a/src/lib/libast/Mamfile +++ b/src/lib/libast/Mamfile @@ -44,7 +44,7 @@ make install virtual note * (The target is 'virtual' as it needs to be run at note * every build, so we can catch changes of git status) note * - make ast_release notrace virtual + make ast_release_info notrace virtual exec - if git_branch=$(git branch 2>/dev/null) exec - then echo "/* generated by libast/Mamfile using $(git --version) */" exec - case $git_branch in @@ -75,6 +75,7 @@ make install virtual exec - else mv -f ast_release.h.new ast_release.h exec - fi done + makp ast_release.h note * note * Generate some fundamental headers from iffe feature tests @@ -98,6 +99,7 @@ make install virtual note * Compiler features, basic system headers, backward compat, etc. -- included by just about everything make FEATURE/common + prev ast_release.h makp features/common exec - invoke_iffe %{<} done @@ -419,7 +421,6 @@ make install virtual prev ast_common.h prev include/ast_std.h done - makp ast_release.h done make include/stak.h @@ -4447,13 +4448,6 @@ make install virtual done done - note * install ast_release.h outside the lib/mam/ast block below, so the mkdeps action - note * is not triggered when ast_release.h changes (it's known not to contain #includes) - make %{INCLUDE_AST}/ast_release.h - prev ast_release.h - exec - cp -f %{<} %{@} - done - note * #include headers make %{INSTALLROOT}/lib/mam/ast note * ...main AST headers @@ -4478,7 +4472,7 @@ make install virtual done done note * ...generated headers - loop HDR ast_standards ast_common ast_lib ast_sys lc align sig tmx tv ast_api ast_ccode ast_fcntl ast_float ast_fs ast_map ast_mmap ast_mode ast_ndbm ast_param ast_time ast_tty ast_limits ast_sizeof ast_dirent ast_iconv ast_nl_types ast_stdio ast_wchar ast_wctype + loop HDR ast_release ast_standards ast_common ast_lib ast_sys lc align sig tmx tv ast_api ast_ccode ast_fcntl ast_float ast_fs ast_map ast_mmap ast_mode ast_ndbm ast_param ast_time ast_tty ast_limits ast_sizeof ast_dirent ast_iconv ast_nl_types ast_stdio ast_wchar ast_wctype make %{INCLUDE_AST}/%{HDR}.h prev %{HDR}.h exec - cp -f %{<} %{@} diff --git a/src/lib/libast/features/wchar b/src/lib/libast/features/wchar index c3c55eda0944..c0c32aab25c4 100644 --- a/src/lib/libast/features/wchar +++ b/src/lib/libast/features/wchar @@ -16,15 +16,18 @@ typ mbstate_t stdlib.h stdio.h wchar.h nxt wchar run{ -cat < #include #endif - - #if _hdr_wchar && defined(_nxt_wchar) - #include ${_nxt_wchar-_nxt_wchar} /* the native wchar.h */ - #endif + ! + case ${_hdr_wchar},${_nxt_wchar} in + 1,\<*) + echo "#include ${_nxt_wchar} /* the native wchar.h */" + ;; + esac ! }end @@ -51,7 +54,7 @@ endif if hdr - wctype wchar.h if ! npt - iswalpha wchar.h { - #include /* includes */ + #include /* includes */ } endif endif @@ -73,7 +76,7 @@ tst iswpunct_broken note{ is iswpunct(3) broken }end execute{ }end run{ -cat < can be included multiple times with multiple effects */' + echo "#include ${_nxt_wchar} /* the native wchar.h */" + echo + ;; + esac - /* on some systems is included multiple times with multiple effects */ - - #if _hdr_wchar && defined(_nxt_wchar) - #include ${_nxt_wchar-_nxt_wchar} /* the native wchar.h */ - #endif - - #endif -! + echo '#endif /* !_AST_WCHAR_H */' }end diff --git a/src/lib/libast/include/ast.h b/src/lib/libast/include/ast.h index 45f3f96c16cf..f3728a8c7b3b 100644 --- a/src/lib/libast/include/ast.h +++ b/src/lib/libast/include/ast.h @@ -28,8 +28,6 @@ #ifndef _AST_H #define _AST_H -#include - #ifndef _AST_STD_H #include #endif diff --git a/src/lib/libast/port/astconf.c b/src/lib/libast/port/astconf.c index ab1ebdb61a00..4f0f98cef38a 100644 --- a/src/lib/libast/port/astconf.c +++ b/src/lib/libast/port/astconf.c @@ -1280,7 +1280,7 @@ print(Sfio_t* sp, Lookup_t* look, const char* name, const char* path, int listfl if (call = sfstruse(sp)) call = buffer(call); else - call = "[ out of space ]"; + call = "[ out of memory ]"; sfclose(sp); return call; } diff --git a/src/lib/libcmd/chgrp.c b/src/lib/libcmd/chgrp.c index 3c7708da5909..e2cb3b6b42ac 100644 --- a/src/lib/libcmd/chgrp.c +++ b/src/lib/libcmd/chgrp.c @@ -235,7 +235,7 @@ b_chgrp(int argc, char** argv, Shbltin_t* context) before = ~0; if (!(sp = sfstropen())) { - error(ERROR_SYSTEM|3, "out of space"); + error(ERROR_SYSTEM|3, "out of memory"); UNREACHABLE(); } sfputr(sp, usage_1, -1); @@ -254,7 +254,7 @@ b_chgrp(int argc, char** argv, Shbltin_t* context) sfputr(sp, usage_3, -1); if (!(usage = sfstruse(sp))) { - error(ERROR_SYSTEM|3, "out of space"); + error(ERROR_SYSTEM|3, "out of memory"); UNREACHABLE(); } for (;;) diff --git a/src/lib/libcmd/cksum.c b/src/lib/libcmd/cksum.c index 5a419ddf6c6a..ac0919eff52f 100644 --- a/src/lib/libcmd/cksum.c +++ b/src/lib/libcmd/cksum.c @@ -305,7 +305,7 @@ verify(State_t* state, char* s, char* check, Sfio_t* rp) pr(state, rp, sp, file, -1, NULL, NULL); if (!(t = sfstruse(rp))) { - error(ERROR_SYSTEM|3, "out of space"); + error(ERROR_SYSTEM|3, "out of memory"); UNREACHABLE(); } if (!streq(s, t)) @@ -474,7 +474,7 @@ b_cksum(int argc, char** argv, Shbltin_t* context) continue; case 'c': if (!(state.check = sfstropen())) - error(3, "out of space [check]"); + error(3, "out of memory"); continue; case 'h': state.header = 1; diff --git a/src/lib/libcmd/cp.c b/src/lib/libcmd/cp.c index a8cb81280453..5390990d894a 100644 --- a/src/lib/libcmd/cp.c +++ b/src/lib/libcmd/cp.c @@ -510,7 +510,7 @@ visit(State_t* state, FTSENT* ent) backup: if (!(s = sfstruse(state->tmp))) { - error(ERROR_SYSTEM|3, "%s: out of space", state->path); + error(ERROR_SYSTEM|3, "%s: out of memory", state->path); UNREACHABLE(); } if (rename(state->path, s)) @@ -699,7 +699,7 @@ b_cp(int argc, char** argv, Shbltin_t* context) state->wflags = O_WRONLY|O_CREAT|O_TRUNC|O_BINARY; if (!state->tmp && !(state->tmp = sfstropen())) { - error(ERROR_SYSTEM|3, "out of space [tmp string]"); + error(ERROR_SYSTEM|3, "out of memory"); UNREACHABLE(); } sfputr(state->tmp, usage_head, -1); @@ -739,7 +739,7 @@ b_cp(int argc, char** argv, Shbltin_t* context) sfputr(state->tmp, usage_tail, -1); if (!(usage = sfstruse(state->tmp))) { - error(ERROR_SYSTEM|3, "%s: out of space", state->path); + error(ERROR_SYSTEM|3, "out of memory"); UNREACHABLE(); } state->opname = state->op == CP ? ERROR_translate(0, 0, 0, "overwrite") : ERROR_translate(0, 0, 0, "replace");