From owner-cvs-bin Sun Sep 1 03:22:58 1996 Return-Path: owner-cvs-bin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id DAA19213 for cvs-bin-outgoing; Sun, 1 Sep 1996 03:22:58 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id DAA19192; Sun, 1 Sep 1996 03:22:43 -0700 (PDT) Date: Sun, 1 Sep 1996 03:22:43 -0700 (PDT) From: Peter Wemm Message-Id: <199609011022.DAA19192@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh Makefile TOUR alias.c alias.h arith.h arith.y arith_lex.l builtins.def cd.c error.c error.h eval.c eval.h exec.c exec.h expand.c expand.h histedit.c init.h input.c input.h jobs.c jobs.h machdep.h mail.c mail.h main.c main.h memalloc.c memalloc.h miscbltin.c mkbuiltins mkinit.c mknodes.c mksyntax.c mktokens myhistedit.h mystring.c mystring.h nodes.c.pat nodetypes options.c options.h output.c output.h parser.c parser.h redir.c redir.h sh.1 shell.h show.c show.h trap.c trap.h var.c var.h builtins errmsg.c errmsg.h mksignames.c src/bin/sh/bltin bltin.h echo.1 echo.c src/bin/sh/funcs cmv dirs kill login newgrp popd pushd suspend Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/09/01 03:22:40 Modified: bin/sh Makefile TOUR alias.c alias.h arith.h arith.y arith_lex.l builtins.def cd.c error.c error.h eval.c eval.h exec.c exec.h expand.c expand.h histedit.c init.h input.c input.h jobs.c jobs.h machdep.h mail.c mail.h main.c main.h memalloc.c memalloc.h miscbltin.c mkbuiltins mkinit.c mknodes.c mksyntax.c mktokens myhistedit.h mystring.c mystring.h nodes.c.pat nodetypes options.c options.h output.c output.h parser.c parser.h redir.c redir.h sh.1 shell.h show.c show.h trap.c trap.h var.c var.h bin/sh/bltin bltin.h echo.1 echo.c bin/sh/funcs cmv dirs kill login newgrp popd pushd suspend Removed: bin/sh builtins errmsg.c errmsg.h mksignames.c Log: Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a merge of parallel duplicate work by Steve Price and myself. :-] There are some changes to the build that are my fault... mkinit.c was trying (poorly) to duplicate some of the work that make(1) is designed to do. The Makefile hackery is my fault too, the depend list was incomplete because of some explicit OBJS+= entries, so mkdep wasn't picking up their source file #includes. This closes a pile of /bin/sh PR's, but not all of them.. Submitted by: Steve Price , peter Revision Changes Path 1.13 +26 -38 src/bin/sh/Makefile 1.3 +2 -2 src/bin/sh/TOUR 1.4 +17 -8 src/bin/sh/alias.c 1.3 +6 -3 src/bin/sh/alias.h 1.2 +1 -0 src/bin/sh/arith.h 1.3 +41 -26 src/bin/sh/arith.y 1.5 +28 -30 src/bin/sh/arith_lex.l 1.2 +1 -0 src/bin/sh/builtins.def 1.6 +31 -27 src/bin/sh/cd.c 1.4 +53 -46 src/bin/sh/error.c 1.3 +8 -16 src/bin/sh/error.h 1.5 +144 -76 src/bin/sh/eval.c 1.3 +12 -12 src/bin/sh/eval.h 1.5 +48 -41 src/bin/sh/exec.c 1.3 +14 -21 src/bin/sh/exec.h 1.7 +280 -108 src/bin/sh/expand.c 1.3 +8 -15 src/bin/sh/expand.h 1.5 +42 -10 src/bin/sh/histedit.c 1.3 +5 -11 src/bin/sh/init.h 1.5 +20 -15 src/bin/sh/input.c 1.3 +14 -28 src/bin/sh/input.h 1.5 +86 -55 src/bin/sh/jobs.c 1.3 +14 -18 src/bin/sh/jobs.h 1.3 +3 -3 src/bin/sh/machdep.h 1.3 +5 -3 src/bin/sh/mail.c 1.3 +3 -7 src/bin/sh/mail.h 1.5 +75 -23 src/bin/sh/main.c 1.3 +6 -9 src/bin/sh/main.h 1.3 +17 -10 src/bin/sh/memalloc.c 1.3 +15 -32 src/bin/sh/memalloc.h 1.5 +218 -210 src/bin/sh/miscbltin.c 1.5 +13 -15 src/bin/sh/mkbuiltins 1.6 +37 -81 src/bin/sh/mkinit.c 1.3 +94 -50 src/bin/sh/mknodes.c 1.6 +67 -45 src/bin/sh/mksyntax.c 1.3 +2 -2 src/bin/sh/mktokens 1.3 +9 -2 src/bin/sh/myhistedit.h 1.3 +3 -2 src/bin/sh/mystring.c 1.3 +6 -13 src/bin/sh/mystring.h 1.3 +65 -75 src/bin/sh/nodes.c.pat 1.3 +4 -2 src/bin/sh/nodetypes 1.7 +39 -20 src/bin/sh/options.c 1.3 +25 -29 src/bin/sh/options.h 1.3 +23 -12 src/bin/sh/output.c 1.3 +23 -34 src/bin/sh/output.h 1.12 +166 -81 src/bin/sh/parser.c 1.3 +19 -19 src/bin/sh/parser.h 1.5 +18 -18 src/bin/sh/redir.c 1.3 +8 -15 src/bin/sh/redir.h 1.7 +10 -8 src/bin/sh/sh.1 1.4 +6 -4 src/bin/sh/shell.h 1.3 +95 -32 src/bin/sh/show.c 1.2 +2 -1 src/bin/sh/show.h 1.4 +58 -29 src/bin/sh/trap.c 1.3 +10 -17 src/bin/sh/trap.h 1.6 +48 -15 src/bin/sh/var.c 1.3 +17 -26 src/bin/sh/var.h 1.5 +2 -2 src/bin/sh/bltin/bltin.h 1.3 +3 -3 src/bin/sh/bltin/echo.1 1.4 +7 -3 src/bin/sh/bltin/echo.c 1.3 +2 -2 src/bin/sh/funcs/cmv 1.3 +2 -2 src/bin/sh/funcs/dirs 1.3 +2 -2 src/bin/sh/funcs/kill 1.3 +2 -2 src/bin/sh/funcs/login 1.3 +2 -2 src/bin/sh/funcs/newgrp 1.3 +2 -2 src/bin/sh/funcs/popd 1.3 +2 -2 src/bin/sh/funcs/pushd 1.3 +2 -2 src/bin/sh/funcs/suspend From owner-cvs-bin Sun Sep 1 03:28:22 1996 Return-Path: owner-cvs-bin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id DAA19434 for cvs-bin-outgoing; Sun, 1 Sep 1996 03:28:22 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id DAA19393; Sun, 1 Sep 1996 03:27:59 -0700 (PDT) Date: Sun, 1 Sep 1996 03:27:59 -0700 (PDT) From: Peter Wemm Message-Id: <199609011027.DAA19393@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh shell.h Makefile Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/09/01 03:27:57 Modified: bin/sh shell.h Makefile Log: oops, I didn't mean for the unconditional DEBUG code to go in, it's been off in FreeBSD for some time. I realised this a few seconds after the commit started.. Revision Changes Path 1.5 +2 -4 src/bin/sh/shell.h 1.14 +3 -1 src/bin/sh/Makefile From owner-cvs-bin Tue Sep 3 06:35:20 1996 Return-Path: owner-cvs-bin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id GAA29150 for cvs-bin-outgoing; Tue, 3 Sep 1996 06:35:20 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id GAA29135; Tue, 3 Sep 1996 06:35:13 -0700 (PDT) Date: Tue, 3 Sep 1996 06:35:13 -0700 (PDT) From: Peter Wemm Message-Id: <199609031335.GAA29135@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh histedit.c jobs.c miscbltin.c mknodes.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/09/03 06:35:13 Modified: bin/sh histedit.c jobs.c miscbltin.c mknodes.c Log: Misc cleanups and fixes from Bruce: - don't put \n on error() calls, error adds it already. - don't prepend "ulimit" on error() calls in miscbltin.c. - getopt typo on ulimit -p -> -u conversion - get/setrlimit() calls were not being error checked ulimit formatting cleanup from me, use same wording as bash on Bruce's suggestion. Add ulimit arg to output on Joerg's suggestion. Revision Changes Path 1.6 +2 -2 src/bin/sh/histedit.c 1.6 +3 -3 src/bin/sh/jobs.c 1.6 +33 -22 src/bin/sh/miscbltin.c 1.4 +2 -2 src/bin/sh/mknodes.c From owner-cvs-bin Tue Sep 3 07:16:19 1996 Return-Path: owner-cvs-bin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id HAA01085 for cvs-bin-outgoing; Tue, 3 Sep 1996 07:16:19 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id HAA01069; Tue, 3 Sep 1996 07:16:07 -0700 (PDT) Date: Tue, 3 Sep 1996 07:16:07 -0700 (PDT) From: Peter Wemm Message-Id: <199609031416.HAA01069@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh error.c error.h exec.c input.c jobs.c memalloc.c miscbltin.c mystring.c output.c parser.c sh.1 show.c src/bin/sh/bltin echo.1 Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/09/03 07:16:07 Modified: bin/sh error.c error.h exec.c input.c jobs.c memalloc.c miscbltin.c mystring.c output.c parser.c sh.1 show.c bin/sh/bltin echo.1 Log: Fix for PR#1287. This makes sh behave sensibly in case statements in the face of aliases. Note, bash doesn't do aliases while running scripts, but "real" ksh does.. Also: Reduce redundant .Nm macros in (unused) bltin/echo.1 nuke error2, it's hardly used. More -Wall cleanups dont do certain history operations if NO_HISTORY defined handle quad_t's from resource limits Submitted by: Steve Price (minor tweaks by me) Revision Changes Path 1.5 +1 -9 src/bin/sh/error.c 1.4 +1 -2 src/bin/sh/error.h 1.6 +2 -2 src/bin/sh/exec.c 1.6 +4 -5 src/bin/sh/input.c 1.7 +2 -1 src/bin/sh/jobs.c 1.4 +3 -3 src/bin/sh/memalloc.c 1.7 +5 -4 src/bin/sh/miscbltin.c 1.4 +2 -2 src/bin/sh/mystring.c 1.4 +15 -5 src/bin/sh/output.c 1.13 +9 -4 src/bin/sh/parser.c 1.8 +2 -2 src/bin/sh/sh.1 1.4 +4 -4 src/bin/sh/show.c 1.4 +6 -6 src/bin/sh/bltin/echo.1 From owner-cvs-bin Tue Sep 3 07:24:59 1996 Return-Path: owner-cvs-bin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id HAA01667 for cvs-bin-outgoing; Tue, 3 Sep 1996 07:24:59 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id HAA01643; Tue, 3 Sep 1996 07:24:46 -0700 (PDT) Date: Tue, 3 Sep 1996 07:24:46 -0700 (PDT) From: Peter Wemm Message-Id: <199609031424.HAA01643@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh miscbltin.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/09/03 07:24:46 Modified: bin/sh miscbltin.c Log: eek, how did that happen? I must have committed something left over from when I was experimenting looking for an alternate format. *blush* Revision Changes Path 1.8 +4 -4 src/bin/sh/miscbltin.c From owner-cvs-bin Sat Sep 7 20:12:49 1996 Return-Path: owner-cvs-bin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id UAA14092 for cvs-bin-outgoing; Sat, 7 Sep 1996 20:12:49 -0700 (PDT) Received: (from adam@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id UAA14046; Sat, 7 Sep 1996 20:12:28 -0700 (PDT) Date: Sat, 7 Sep 1996 20:12:28 -0700 (PDT) From: Adam David Message-Id: <199609080312.UAA14046@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh main.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk adam 96/09/07 20:12:26 Modified: bin/sh main.c Log: let the "exit" command return status when it is implicit Revision Changes Path 1.6 +4 -2 src/bin/sh/main.c