diff --git a/Build.sh b/Build.sh index 2be2b06..778cbf1 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.648 2013/10/31 20:05:38 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.649 2013/11/17 22:21:16 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013 @@ -325,9 +325,12 @@ addsrcs() { } -curdir=`pwd` srcdir=`dirname "$0" 2>/dev/null` check_categories= -test -n "$srcdir" || srcdir=. # in case dirname does not exist -dstversion=`sed -n '/define MKSH_VERSION/s/^.*"\([^"]*\)".*$/\1/p' $srcdir/sh.h` +curdir=`pwd` srcdir=`dirname "$0" 2>/dev/null` +case x$srcdir in +x) srcdir=. ;; +*"'"*) echo Source directory must not contain single quotes.; exit 1 ;; +esac +dstversion=`sed -n '/define MKSH_VERSION/s/^.*"\([^"]*\)".*$/\1/p' "$srcdir/sh.h"` add_cppflags -DMKSH_BUILDSH e=echo @@ -336,6 +339,7 @@ eq=0 pm=0 cm=normal optflags=-std-compile-opts +check_categories= last= tfn= legacy=0 @@ -1598,7 +1602,7 @@ else #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.648 2013/10/31 20:05:38 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.649 2013/11/17 22:21:16 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (0); } EOF case $cm in @@ -2253,7 +2257,7 @@ echo tcfn=$mkshexe >>Rebuild.sh echo "$CC $CFLAGS $LDFLAGS -o \$tcfn $lobjs $LIBS $ccpr" >>Rebuild.sh echo "test -f \$tcfn || exit 1; $SIZE \$tcfn" >>Rebuild.sh if test $cm = makefile; then - extras='emacsfn.h sh.h sh_flags.h var_spec.h' + extras='emacsfn.h genopt.sh rlimits.opt sh.h sh_flags.h var_spec.h' test 0 = $HAVE_SYS_SIGNAME && extras="$extras signames.inc" cat >Makefrag.inc <name && l->option != what; l++) - ; - if (!l->name) { - internal_warningf("ulimit: %c", what); - return (1); + while (i < NELEM(rlimits)) { + if (rlimits[i]->optchar == what) + goto found; + ++i; } - + internal_warningf("ulimit: %c", what); + return (1); + found: if (wp[builtin_opt.optind]) { if (all || wp[builtin_opt.optind + 1]) { bi_errorf("too many arguments"); return (1); } - return (set_ulimit(l, wp[builtin_opt.optind], how)); + return (set_ulimit(rlimits[i], wp[builtin_opt.optind], how)); } if (!all) - print_ulimit(l, how); - else for (l = limits; l->name; l++) { - shprintf("%-20s ", l->name); - print_ulimit(l, how); + print_ulimit(rlimits[i], how); + else for (i = 0; i < NELEM(rlimits); ++i) { + shprintf("%-20s ", rlimits[i]->name); + print_ulimit(rlimits[i], how); } return (0); } diff --git a/genopt.sh b/genopt.sh new file mode 100644 index 0000000..370ac55 --- /dev/null +++ b/genopt.sh @@ -0,0 +1,169 @@ +#!/bin/sh +# $MirOS: src/bin/mksh/genopt.sh,v 1.1 2013/11/17 22:21:18 tg Exp $ +#- +# Copyright (c) 2013 +# Thorsten Glaser +# +# Provided that these terms and disclaimer and all copyright notices +# are retained or reproduced in an accompanying document, permission +# is granted to deal in this work without restriction, including un- +# limited rights to use, publicly perform, distribute, sell, modify, +# merge, give away, or sublicence. +# +# This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to +# the utmost extent permitted by applicable law, neither express nor +# implied; without malicious intent or gross negligence. In no event +# may a licensor, author or contributor be held liable for indirect, +# direct, other damage, loss, or other issues arising in any way out +# of dealing in the work, even if advised of the possibility of such +# damage or existence of a defect, except proven that it results out +# of said person's immediate fault when using the work as intended. +#- +# Compile *.opt files to *.gen (F0, FN, getopt string) files. + +LC_ALL=C +export LC_ALL + +case $ZSH_VERSION:$VERSION in +:zsh*) ZSH_VERSION=2 ;; +esac + +if test -n "${ZSH_VERSION+x}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +fi + +if test -d /usr/xpg4/bin/. >/dev/null 2>&1; then + # Solaris: some of the tools have weird behaviour, use portable ones + PATH=/usr/xpg4/bin:$PATH + export PATH +fi + +allu=QWERTYUIOPASDFGHJKLZXCVBNM +alll=qwertyuiopasdfghjklzxcvbnm +nl=' +' +me=`basename "$0"` +curdir=`pwd` srcdir=`dirname "$0" 2>/dev/null` +case x$srcdir in +x) srcdir=. ;; +*"'"*) echo Source directory must not contain single quotes.; exit 1 ;; +esac + +die() { + if test -n "$1"; then + echo >&2 "E: $*" + echo >&2 "E: in '$srcfile': '$line'" + else + echo >&2 "E: invalid input in '$srcfile': '$line'" + fi + rm -f "$bn.gen" + exit 1 +} + +soptc() { + optc=`echo "$line" | sed 's/^[<>]\(.\).*$/\1/'` + test x"$optc" = x'|' && return + optclo=`echo "$optc" | tr $allu $alll` + if test x"$optc" = x"$optclo"; then + islo=1 + else + islo=0 + fi + sym=`echo "$line" | sed 's/^[<>]/|/'` + o_str=$o_str$nl"<$optclo$islo$sym" +} + +for srcfile +do + bn=`basename "$srcfile" | sed 's/.opt$//'` + o_gen= + o_str= + o_sym= + ddefs= + state=0 + while IFS= read -r line; do + case $state:$line in + 2:'|'*) + # end of input + o_sym=`echo "$line" | sed 's/^.//'` + o_gen=$o_gen$nl"#undef F0" + o_gen=$o_gen$nl"#undef FN" + for sym in $ddefs; do + o_gen=$o_gen$nl"#undef $sym" + done + state=3 + ;; + 1:@@) + # begin of data block + o_gen=$o_gen$nl"#endif" + o_gen=$o_gen$nl"#ifndef F0" + o_gen=$o_gen$nl"#define F0 FN" + o_gen=$o_gen$nl"#endif" + state=2 + ;; + *:@@*) + die ;; + 0:@*|1:@*) + # begin of a definition block + sym=`echo "$line" | sed 's/^@//'` + if test $state = 0; then + o_gen=$o_gen$nl"#if defined($sym)" + else + o_gen=$o_gen$nl"#elif defined($sym)" + fi + ddefs="$ddefs $sym" + state=1 + ;; + 0:*|3:*) + die ;; + 1:*) + # definition line + o_gen=$o_gen$nl$line + ;; + 2:'<'*'|'*) + soptc + ;; + 2:'>'*'|'*) + soptc + cond=`echo "$line" | sed 's/^[^|]*|//'` + case x$cond in + x) cond= ;; + x*' '*) cond="#if $cond" ;; + x*) cond="#ifdef $cond" ;; + esac + case $optc in + '|') optc=0 ;; + *) optc=\'$optc\' ;; + esac + IFS= read -r line || die Unexpected EOF + test -n "$cond" && o_gen=$o_gen$nl"$cond" + o_gen=$o_gen$nl"$line, $optc)" + test -n "$cond" && o_gen=$o_gen$nl"#endif" + ;; + esac + done <"$srcfile" + case $state:$o_sym in + 3:) die Expected optc sym at EOF ;; + 3:*) ;; + *) die Missing EOF marker ;; + esac + echo "$o_str" | sort | while IFS='|' read -r x opts cond; do + test -n "$x" || continue + case x$cond in + x) cond= ;; + x*' '*) cond="#if $cond" ;; + x*) cond="#ifdef $cond" ;; + esac + test -n "$cond" && echo "$cond" + echo "\"$opts\"" + test -n "$cond" && echo "#endif" + done | { + echo "#ifndef $o_sym$o_gen" + echo "#else" + cat + echo "#undef $o_sym" + echo "#endif" + } >"$bn.gen" +done +exit 0 diff --git a/rlimits.opt b/rlimits.opt new file mode 100644 index 0000000..d8042ba --- /dev/null +++ b/rlimits.opt @@ -0,0 +1,105 @@ +@RLIMITS_DEFNS +__RCSID("$MirOS: src/bin/mksh/rlimits.opt,v 1.1 2013/11/17 22:21:18 tg Exp $"); +struct limits { + /* limit resource */ + int resource; + /* multiply by to get rlim_{cur,max} values */ + unsigned int factor; + /* getopts char */ + char optchar; + /* limit name */ + char name[1]; +}; +#define FN(lname,lid,lfac,lopt) \ + static const struct { \ + int resource; \ + unsigned int factor; \ + char optchar; \ + char name[sizeof(lname)]; \ + } rlimits_ ## lid = { \ + lid, lfac, lopt, lname \ + }; +@RLIMITS_ITEMS +#define FN(lname,lid,lfac,lopt) \ + (const struct limits *)(&rlimits_ ## lid), +@@ + +/* generic options for the ulimit builtin */ + +t|RLIMIT_CPU +FN("time(cpu-seconds)", RLIMIT_CPU, 1 + +>f|RLIMIT_FSIZE +FN("file(blocks)", RLIMIT_FSIZE, 512 + +>c|RLIMIT_CORE +FN("coredump(blocks)", RLIMIT_CORE, 512 + +>d|RLIMIT_DATA +FN("data(KiB)", RLIMIT_DATA, 1024 + +>s|RLIMIT_STACK +FN("stack(KiB)", RLIMIT_STACK, 1024 + +>l|RLIMIT_MEMLOCK +FN("lockedmem(KiB)", RLIMIT_MEMLOCK, 1024 + +>n|RLIMIT_NOFILE +FN("nofiles(descriptors)", RLIMIT_NOFILE, 1 + +>p|RLIMIT_NPROC +FN("processes", RLIMIT_NPROC, 1 + +>w|RLIMIT_SWAP +FN("swap(KiB)", RLIMIT_SWAP, 1024 + +>T|RLIMIT_TIME +FN("humantime(seconds)", RLIMIT_TIME, 1 + +>V|RLIMIT_NOVMON +FN("vnodemonitors", RLIMIT_NOVMON, 1 + +>i|RLIMIT_SIGPENDING +FN("sigpending", RLIMIT_SIGPENDING, 1 + +>q|RLIMIT_MSGQUEUE +FN("msgqueue(bytes)", RLIMIT_MSGQUEUE, 1 + +>M|RLIMIT_AIO_MEM +FN("AIOlockedmem(KiB)", RLIMIT_AIO_MEM, 1024 + +>O|RLIMIT_AIO_OPS +FN("AIOoperations", RLIMIT_AIO_OPS, 1 + +>C|RLIMIT_TCACHE +FN("cachedthreads", RLIMIT_TCACHE, 1 + +>B|RLIMIT_SBSIZE +FN("sockbufsiz(KiB)", RLIMIT_SBSIZE, 1024 + +>P|RLIMIT_PTHREAD +FN("threadsperprocess", RLIMIT_PTHREAD, 1 + +>e|RLIMIT_NICE +FN("maxnice", RLIMIT_NICE, 1 + +>r|RLIMIT_RTPRIO +FN("maxrtprio", RLIMIT_RTPRIO, 1 + +>m|ULIMIT_M_IS_RSS +FN("resident-set(KiB)", RLIMIT_RSS, 1024 +>m|ULIMIT_M_IS_VMEM +FN("memory(KiB)", RLIMIT_VMEM, 1024 + +>v|ULIMIT_V_IS_VMEM +FN("virtual-memory(KiB)", RLIMIT_VMEM, 1024 +>v|ULIMIT_V_IS_AS +FN("address-space(KiB)", RLIMIT_AS, 1024 + +|RLIMITS_OPTCS