aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2005-07-16 01:57:20 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2005-07-16 01:57:20 +0000
commit267b925bb46d53472d28e88edc7d837c5918612b (patch)
treeb219f617bf73025768aaa495df36018d07d9efe9
parentaad0c53aa2fb77c9c37ed92ab3af842b569f55e8 (diff)
downloadbusybox-0_60_stable.tar.gz
busybox-0_60_stable.tar.bz2
Clone the busybox_0_60_stable branch from the old busybox.stable CVS tree0_60_stable
-rw-r--r--.cvsignore (renamed from busybox/.cvsignore)0
-rw-r--r--.indent.pro (renamed from busybox/.indent.pro)0
-rw-r--r--AUTHORS (renamed from busybox/AUTHORS)30
-rw-r--r--Changelog (renamed from busybox/Changelog)218
-rw-r--r--Changelog.full138
-rw-r--r--Config.h (renamed from busybox/Config.h)41
-rw-r--r--INSTALL (renamed from busybox/INSTALL)0
-rw-r--r--LICENSE (renamed from busybox/LICENSE)9
-rw-r--r--Makefile (renamed from busybox/Makefile)144
-rw-r--r--README (renamed from busybox/README)28
-rw-r--r--TODO (renamed from busybox/TODO)5
-rw-r--r--adjtimex.c (renamed from busybox/adjtimex.c)0
-rw-r--r--applets.c (renamed from busybox/applets.c)0
-rw-r--r--applets.h (renamed from busybox/applets.h)9
-rw-r--r--ar.c (renamed from busybox/ar.c)0
-rw-r--r--ash.c (renamed from busybox/ash.c)13990
-rw-r--r--basename.c (renamed from busybox/basename.c)4
-rw-r--r--busybox.c (renamed from busybox/busybox.c)29
-rw-r--r--busybox.h (renamed from busybox/busybox.h)8
-rwxr-xr-xbusybox.mkll (renamed from busybox/applets/busybox.mkll)0
-rwxr-xr-xbusybox.sh (renamed from busybox/applets/busybox.sh)0
-rw-r--r--busybox.spec (renamed from busybox/examples/busybox.spec)8
-rw-r--r--busybox/applets/applets.c116
-rw-r--r--busybox/applets/busybox.c181
-rw-r--r--busybox/archival/ar.c89
-rw-r--r--busybox/archival/gunzip.c183
-rw-r--r--busybox/archival/gzip.c2550
-rw-r--r--busybox/archival/libunarchive/decompress_unzip.c1026
-rwxr-xr-xbusybox/busybox.mkll24
-rwxr-xr-xbusybox/busybox.sh16
-rw-r--r--busybox/busybox.spec44
-rw-r--r--busybox/chown.c113
-rw-r--r--busybox/clear.c34
-rw-r--r--busybox/cmdedit.h6
-rw-r--r--busybox/console-tools/chvt.c43
-rw-r--r--busybox/console-tools/setkeycodes.c72
-rw-r--r--busybox/coreutils/cat.c53
-rw-r--r--busybox/coreutils/chgrp.c91
-rw-r--r--busybox/coreutils/chmod.c85
-rw-r--r--busybox/coreutils/chroot.c75
-rw-r--r--busybox/coreutils/cmp.c80
-rw-r--r--busybox/coreutils/cp.c114
-rw-r--r--busybox/coreutils/cut.c356
-rw-r--r--busybox/coreutils/dirname.c40
-rw-r--r--busybox/coreutils/du.c257
-rw-r--r--busybox/coreutils/ls.c937
-rw-r--r--busybox/coreutils/sleep.c38
-rw-r--r--busybox/coreutils/tee.c68
-rw-r--r--busybox/coreutils/touch.c75
-rw-r--r--busybox/coreutils/uniq.c89
-rw-r--r--busybox/coreutils/uudecode.c353
-rw-r--r--busybox/cpio.c95
-rw-r--r--busybox/date.c247
-rw-r--r--busybox/dd.c154
-rw-r--r--busybox/deallocvt.c43
-rw-r--r--busybox/df.c158
-rw-r--r--busybox/docs/busybox.net/.cvsignore1
-rw-r--r--busybox/docs/busybox.net/busybox-growth.ps404
-rw-r--r--busybox/docs/busybox.net/images/busybox.jpegbin9023 -> 0 bytes
-rw-r--r--busybox/docs/busybox.net/images/busybox2.jpgbin8204 -> 0 bytes
-rw-r--r--busybox/docs/busybox.net/images/fm.mini.pngbin7708 -> 0 bytes
-rw-r--r--busybox/docs/busybox.net/images/gfx_by_gimp.pngbin3955 -> 0 bytes
-rw-r--r--busybox/docs/busybox.net/images/ltbutton2.pngbin6799 -> 0 bytes
-rw-r--r--busybox/docs/busybox.net/images/sdsmall.pngbin1593 -> 0 bytes
-rw-r--r--busybox/docs/busybox.net/images/written.in.vi.pngbin4394 -> 0 bytes
-rw-r--r--busybox/docs/busybox.net/index.html394
-rw-r--r--busybox/docs/busybox.net/oldnews.html465
-rw-r--r--busybox/docs/busybox.net/screenshot.html54
-rw-r--r--busybox/dos2unix.c195
-rw-r--r--busybox/dpkg.c1445
-rw-r--r--busybox/dpkg_deb.c130
-rw-r--r--busybox/dumpkmap.c95
-rw-r--r--busybox/echo.c152
-rw-r--r--busybox/editors/sed.c850
-rw-r--r--busybox/env.c106
-rw-r--r--busybox/examples/bootfloppy/bootfloppy.txt185
-rw-r--r--busybox/examples/bootfloppy/display.txt4
-rw-r--r--busybox/examples/bootfloppy/etc/fstab2
-rwxr-xr-xbusybox/examples/bootfloppy/etc/init.d/rcS3
-rw-r--r--busybox/examples/bootfloppy/etc/inittab5
-rw-r--r--busybox/examples/bootfloppy/etc/profile8
-rwxr-xr-xbusybox/examples/bootfloppy/mkdevs.sh62
-rwxr-xr-xbusybox/examples/bootfloppy/mkrootfs.sh106
-rwxr-xr-xbusybox/examples/bootfloppy/mksyslinux.sh48
-rw-r--r--busybox/examples/bootfloppy/quickstart.txt15
-rw-r--r--busybox/examples/bootfloppy/syslinux.cfg7
-rw-r--r--busybox/examples/inittab86
-rw-r--r--busybox/expr.c535
-rw-r--r--busybox/findutils/find.c200
-rw-r--r--busybox/findutils/xargs.c105
-rw-r--r--busybox/free.c69
-rw-r--r--busybox/grep.c359
-rw-r--r--busybox/halt.c41
-rw-r--r--busybox/head.c97
-rw-r--r--busybox/hostid.c32
-rw-r--r--busybox/hush.c2692
-rw-r--r--busybox/id.c97
-rw-r--r--busybox/include/applets.h478
-rw-r--r--busybox/include/busybox.h106
-rw-r--r--busybox/include/usage.h1826
-rw-r--r--busybox/init.c1031
-rw-r--r--busybox/init/reboot.c49
-rwxr-xr-xbusybox/install.sh52
-rw-r--r--busybox/length.c13
-rw-r--r--busybox/libbb/arith.c263
-rw-r--r--busybox/libbb/concat_path_file.c26
-rw-r--r--busybox/libbb/fgets_str.c64
-rw-r--r--busybox/libbb/get_last_path_component.c71
-rw-r--r--busybox/libbb/gz_open.c35
-rw-r--r--busybox/libbb/libbb.h326
-rw-r--r--busybox/libbb/unzip.c1026
-rw-r--r--busybox/ln.c131
-rw-r--r--busybox/loadacm.c357
-rw-r--r--busybox/loadfont.c209
-rw-r--r--busybox/loadkmap.c89
-rw-r--r--busybox/logname.c41
-rw-r--r--busybox/makedevs.c95
-rw-r--r--busybox/md5sum.c1074
-rw-r--r--busybox/miscutils/adjtimex.c176
-rw-r--r--busybox/miscutils/dc.c182
-rw-r--r--busybox/miscutils/dutmp.c64
-rwxr-xr-xbusybox/mk_loop_h.sh37
-rw-r--r--busybox/mkdir.c64
-rw-r--r--busybox/mkfifo.c60
-rw-r--r--busybox/mknod.c92
-rw-r--r--busybox/mkswap.c422
-rw-r--r--busybox/mktemp.c40
-rw-r--r--busybox/modprobe.c121
-rw-r--r--busybox/modutils/insmod.c3481
-rw-r--r--busybox/modutils/lsmod.c166
-rw-r--r--busybox/modutils/modprobe.c121
-rw-r--r--busybox/more.c217
-rw-r--r--busybox/mount.c498
-rw-r--r--busybox/mt.c121
-rw-r--r--busybox/mv.c168
-rw-r--r--busybox/networking/hostname.c128
-rw-r--r--busybox/networking/ifconfig.c492
-rw-r--r--busybox/networking/nc.c137
-rw-r--r--busybox/networking/nslookup.c183
-rw-r--r--busybox/networking/ping.c555
-rw-r--r--busybox/networking/tftp.c383
-rw-r--r--busybox/pidof.c79
-rw-r--r--busybox/poweroff.c41
-rw-r--r--busybox/printf.c455
-rw-r--r--busybox/procps/kill.c142
-rw-r--r--busybox/ps.c266
-rw-r--r--busybox/readlink.c48
-rw-r--r--busybox/reboot.c49
-rw-r--r--busybox/renice.c54
-rw-r--r--busybox/reset.c35
-rw-r--r--busybox/rm.c77
-rw-r--r--busybox/rmdir.c97
-rw-r--r--busybox/rmmod.c62
-rw-r--r--busybox/route.c450
-rw-r--r--busybox/rpm2cpio.c91
-rwxr-xr-xbusybox/scripts/depmod.pl227
-rwxr-xr-xbusybox/scripts/mk2knr.pl84
-rw-r--r--busybox/scripts/undeb53
-rw-r--r--busybox/scripts/unrpm48
-rw-r--r--busybox/sed.c850
-rw-r--r--busybox/shell/ash.c12888
-rw-r--r--busybox/shell/cmdedit.c1521
-rw-r--r--busybox/shell/cmdedit.h6
-rw-r--r--busybox/shell/lash.c1638
-rw-r--r--busybox/shell/msh.c4868
-rw-r--r--busybox/sort.c106
-rw-r--r--busybox/stty.c1376
-rw-r--r--busybox/sync.c35
-rw-r--r--busybox/sysklogd/klogd.c153
-rw-r--r--busybox/sysklogd/logger.c200
-rw-r--r--busybox/sysklogd/logread.c144
-rw-r--r--busybox/syslogd.c641
-rw-r--r--busybox/tail.c251
-rw-r--r--busybox/tar.c1150
-rw-r--r--busybox/telnet.c711
-rw-r--r--busybox/test.c579
-rw-r--r--busybox/tr.c248
-rw-r--r--busybox/traceroute.c652
-rw-r--r--busybox/tty.c44
-rw-r--r--busybox/uname.c156
-rw-r--r--busybox/update.c112
-rw-r--r--busybox/uptime.c77
-rw-r--r--busybox/usage.c10
-rw-r--r--busybox/usage.h1826
-rw-r--r--busybox/usleep.c38
-rw-r--r--busybox/util-linux/dmesg.c95
-rw-r--r--busybox/util-linux/fbset.c424
-rw-r--r--busybox/util-linux/fdflush.c47
-rw-r--r--busybox/util-linux/freeramdisk.c65
-rw-r--r--busybox/util-linux/fsck_minix.c1478
-rw-r--r--busybox/util-linux/getopt.c402
-rw-r--r--busybox/util-linux/mkfs_minix.c847
-rw-r--r--busybox/util-linux/nfsmount.c977
-rw-r--r--busybox/util-linux/nfsmount.h242
-rw-r--r--busybox/util-linux/pivot_root.c35
-rw-r--r--busybox/util-linux/rdate.c116
-rw-r--r--busybox/util-linux/swaponoff.c115
-rw-r--r--busybox/util-linux/umount.c298
-rw-r--r--busybox/uuencode.c180
-rw-r--r--busybox/vi.c3947
-rw-r--r--busybox/wc.c156
-rw-r--r--busybox/wget.c834
-rw-r--r--busybox/which.c80
-rw-r--r--busybox/whoami.c44
-rw-r--r--busybox/yes.c53
-rw-r--r--cat.c (renamed from busybox/cat.c)4
-rw-r--r--chgrp.c (renamed from busybox/chgrp.c)4
-rw-r--r--chmod.c (renamed from busybox/chmod.c)18
-rw-r--r--chown.c (renamed from busybox/coreutils/chown.c)4
-rw-r--r--chroot.c (renamed from busybox/chroot.c)4
-rw-r--r--chvt.c (renamed from busybox/chvt.c)2
-rw-r--r--clear.c (renamed from busybox/console-tools/clear.c)4
-rw-r--r--cmdedit.c (renamed from busybox/cmdedit.c)630
-rw-r--r--cmdedit.h11
-rw-r--r--cmp.c (renamed from busybox/cmp.c)4
-rw-r--r--cp.c (renamed from busybox/cp.c)5
-rw-r--r--cpio.c (renamed from busybox/archival/cpio.c)0
-rw-r--r--cut.c (renamed from busybox/cut.c)4
-rw-r--r--date.c (renamed from busybox/coreutils/date.c)4
-rw-r--r--dc.c (renamed from busybox/dc.c)0
-rw-r--r--dd.c (renamed from busybox/coreutils/dd.c)27
-rw-r--r--deallocvt.c (renamed from busybox/console-tools/deallocvt.c)2
-rw-r--r--debian/Config.h-deb (renamed from busybox/debian/Config.h-deb)74
-rw-r--r--debian/Config.h-static (renamed from busybox/debian/Config.h-static)62
-rw-r--r--debian/Config.h-udeb (renamed from busybox/debian/Config.h-udeb)64
-rw-r--r--debian/README.debian (renamed from busybox/debian/README.debian)2
-rw-r--r--debian/changelog (renamed from busybox/debian/changelog)138
-rw-r--r--debian/control (renamed from busybox/debian/control)5
-rw-r--r--debian/copyright (renamed from busybox/debian/copyright)0
-rwxr-xr-xdebian/rules (renamed from busybox/debian/rules)13
-rw-r--r--df.c (renamed from busybox/coreutils/df.c)4
-rw-r--r--dirname.c (renamed from busybox/dirname.c)4
-rw-r--r--dmesg.c (renamed from busybox/dmesg.c)0
-rw-r--r--docs/.cvsignore (renamed from busybox/docs/.cvsignore)0
-rwxr-xr-xdocs/autodocifier.pl (renamed from busybox/docs/autodocifier.pl)8
-rw-r--r--docs/busybox.sgml (renamed from busybox/docs/busybox.sgml)6
-rw-r--r--docs/busybox_footer.pod (renamed from busybox/docs/busybox_footer.pod)10
-rw-r--r--docs/busybox_header.pod (renamed from busybox/docs/busybox_header.pod)1
-rw-r--r--docs/contributing.txt (renamed from busybox/docs/contributing.txt)4
-rw-r--r--docs/new-applet-HOWTO.txt (renamed from busybox/docs/new-applet-HOWTO.txt)2
-rw-r--r--docs/style-guide.txt (renamed from busybox/docs/style-guide.txt)0
-rw-r--r--dos2unix.c (renamed from busybox/coreutils/dos2unix.c)4
-rw-r--r--dpkg.c (renamed from busybox/archival/dpkg.c)4
-rw-r--r--dpkg_deb.c (renamed from busybox/archival/dpkg_deb.c)0
-rw-r--r--du.c (renamed from busybox/du.c)91
-rw-r--r--dumpkmap.c (renamed from busybox/console-tools/dumpkmap.c)0
-rw-r--r--dutmp.c (renamed from busybox/dutmp.c)6
-rw-r--r--echo.c (renamed from busybox/coreutils/echo.c)0
-rw-r--r--env.c (renamed from busybox/coreutils/env.c)2
-rw-r--r--expr.c (renamed from busybox/coreutils/expr.c)0
-rw-r--r--fbset.c (renamed from busybox/fbset.c)3
-rw-r--r--fdflush.c (renamed from busybox/fdflush.c)0
-rw-r--r--find.c (renamed from busybox/find.c)34
-rw-r--r--free.c (renamed from busybox/procps/free.c)40
-rw-r--r--freeramdisk.c (renamed from busybox/freeramdisk.c)0
-rw-r--r--fsck_minix.c (renamed from busybox/fsck_minix.c)0
-rw-r--r--getopt.c (renamed from busybox/getopt.c)0
-rw-r--r--grep.c (renamed from busybox/findutils/grep.c)35
-rw-r--r--gunzip.c (renamed from busybox/gunzip.c)148
-rw-r--r--gzip.c (renamed from busybox/gzip.c)134
-rw-r--r--halt.c (renamed from busybox/init/halt.c)4
-rw-r--r--head.c (renamed from busybox/coreutils/head.c)13
-rw-r--r--hostid.c (renamed from busybox/coreutils/hostid.c)0
-rw-r--r--hostname.c (renamed from busybox/hostname.c)114
-rw-r--r--hush.c (renamed from busybox/shell/hush.c)375
-rw-r--r--id.c (renamed from busybox/coreutils/id.c)0
-rw-r--r--ifconfig.c (renamed from busybox/ifconfig.c)7
-rw-r--r--init.c (renamed from busybox/init/init.c)781
-rw-r--r--insmod.c (renamed from busybox/insmod.c)1052
-rwxr-xr-xinstall.sh (renamed from busybox/applets/install.sh)0
-rw-r--r--kernel-patches/Will_devps_GoIntoTheKernel (renamed from busybox/examples/kernel-patches/Will_devps_GoIntoTheKernel)2
-rw-r--r--kernel-patches/devps.patch.9_25_2000 (renamed from busybox/examples/kernel-patches/devps.patch.9_25_2000)0
-rw-r--r--kill.c (renamed from busybox/kill.c)108
-rw-r--r--klogd.c (renamed from busybox/klogd.c)19
-rw-r--r--lash.c (renamed from busybox/lash.c)40
-rw-r--r--length.c (renamed from busybox/coreutils/length.c)0
-rw-r--r--libbb/.cvsignore (renamed from busybox/libbb/.cvsignore)0
-rw-r--r--libbb/Makefile (renamed from busybox/libbb/Makefile)2
-rw-r--r--libbb/README (renamed from busybox/libbb/README)5
-rw-r--r--libbb/arith.c376
-rw-r--r--libbb/ask_confirmation.c (renamed from busybox/libbb/ask_confirmation.c)16
-rw-r--r--libbb/chomp.c (renamed from busybox/libbb/chomp.c)16
-rw-r--r--libbb/concat_path_file.c45
-rw-r--r--libbb/copy_file.c (renamed from busybox/libbb/copy_file.c)100
-rw-r--r--libbb/copy_file_chunk.c (renamed from busybox/libbb/copy_file_chunk.c)16
-rw-r--r--libbb/copyfd.c (renamed from busybox/libbb/copyfd.c)0
-rw-r--r--libbb/create_icmp_socket.c (renamed from busybox/libbb/create_icmp_socket.c)0
-rw-r--r--libbb/device_open.c (renamed from busybox/libbb/device_open.c)8
-rw-r--r--libbb/dirname.c (renamed from busybox/libbb/dirname.c)2
-rw-r--r--libbb/error_msg.c (renamed from busybox/libbb/error_msg.c)8
-rw-r--r--libbb/error_msg_and_die.c (renamed from busybox/libbb/error_msg_and_die.c)8
-rw-r--r--libbb/fgets_str.c67
-rw-r--r--libbb/find_mount_point.c (renamed from busybox/libbb/find_mount_point.c)8
-rw-r--r--libbb/find_pid_by_name.c (renamed from busybox/libbb/find_pid_by_name.c)44
-rw-r--r--libbb/find_root_device.c (renamed from busybox/libbb/find_root_device.c)13
-rw-r--r--libbb/full_read.c (renamed from busybox/libbb/full_read.c)21
-rw-r--r--libbb/full_write.c (renamed from busybox/libbb/full_write.c)20
-rw-r--r--libbb/get_console.c (renamed from busybox/libbb/get_console.c)21
-rw-r--r--libbb/get_last_path_component.c (renamed from busybox/watchdog.c)45
-rw-r--r--libbb/get_line_from_file.c (renamed from busybox/libbb/get_line_from_file.c)56
-rw-r--r--libbb/gz_open.c62
-rw-r--r--libbb/herror_msg.c (renamed from busybox/libbb/herror_msg.c)8
-rw-r--r--libbb/herror_msg_and_die.c (renamed from busybox/libbb/herror_msg_and_die.c)8
-rw-r--r--libbb/human_readable.c (renamed from busybox/libbb/human_readable.c)0
-rw-r--r--libbb/inode_hash.c (renamed from busybox/libbb/inode_hash.c)23
-rw-r--r--libbb/interface.c (renamed from busybox/libbb/interface.c)14
-rw-r--r--libbb/isdirectory.c (renamed from busybox/libbb/isdirectory.c)9
-rw-r--r--libbb/kernel_version.c (renamed from busybox/libbb/kernel_version.c)8
-rw-r--r--libbb/last_char_is.c (renamed from busybox/libbb/last_char_is.c)0
-rw-r--r--libbb/libbb.h (renamed from busybox/include/libbb.h)40
-rw-r--r--libbb/libc5.c (renamed from busybox/libbb/libc5.c)7
-rw-r--r--libbb/loop.c (renamed from busybox/libbb/loop.c)11
-rw-r--r--libbb/make_directory.c (renamed from busybox/libbb/make_directory.c)0
-rw-r--r--libbb/messages.c (renamed from busybox/libbb/messages.c)4
-rw-r--r--libbb/mode_string.c (renamed from busybox/libbb/mode_string.c)16
-rw-r--r--libbb/module_syscalls.c (renamed from busybox/libbb/module_syscalls.c)45
-rw-r--r--libbb/mtab.c (renamed from busybox/libbb/mtab.c)20
-rw-r--r--libbb/mtab_file.c (renamed from busybox/libbb/mtab_file.c)8
-rw-r--r--libbb/my_getgrgid.c (renamed from busybox/libbb/my_getgrgid.c)8
-rw-r--r--libbb/my_getgrnam.c (renamed from busybox/libbb/my_getgrnam.c)8
-rw-r--r--libbb/my_getpwnam.c (renamed from busybox/libbb/my_getpwnam.c)8
-rw-r--r--libbb/my_getpwnamegid.c (renamed from busybox/libbb/my_getpwnamegid.c)8
-rw-r--r--libbb/my_getpwuid.c (renamed from busybox/libbb/my_getpwuid.c)8
-rw-r--r--libbb/parse_mode.c (renamed from busybox/libbb/parse_mode.c)16
-rw-r--r--libbb/parse_number.c (renamed from busybox/libbb/parse_number.c)16
-rw-r--r--libbb/perror_msg.c (renamed from busybox/libbb/perror_msg.c)8
-rw-r--r--libbb/perror_msg_and_die.c (renamed from busybox/libbb/perror_msg_and_die.c)8
-rw-r--r--libbb/print_file.c (renamed from busybox/libbb/print_file.c)0
-rw-r--r--libbb/process_escape_sequence.c (renamed from busybox/libbb/process_escape_sequence.c)0
-rw-r--r--libbb/read_package_field.c (renamed from busybox/libbb/read_package_field.c)23
-rw-r--r--libbb/real_loop.h (renamed from busybox/libbb/real_loop.h)0
-rw-r--r--libbb/recursive_action.c (renamed from busybox/libbb/recursive_action.c)8
-rw-r--r--libbb/remove_file.c (renamed from busybox/libbb/remove_file.c)3
-rw-r--r--libbb/safe_read.c (renamed from busybox/libbb/safe_read.c)8
-rw-r--r--libbb/safe_strncpy.c (renamed from busybox/libbb/safe_strncpy.c)8
-rw-r--r--libbb/safe_write.c (renamed from busybox/coreutils/pwd.c)42
-rw-r--r--libbb/simplify_path.c (renamed from busybox/libbb/simplify_path.c)2
-rw-r--r--libbb/syscalls.c (renamed from busybox/libbb/syscalls.c)78
-rw-r--r--libbb/syslog_msg_with_name.c (renamed from busybox/libbb/syslog_msg_with_name.c)8
-rw-r--r--libbb/time_string.c (renamed from busybox/libbb/time_string.c)8
-rw-r--r--libbb/trim.c (renamed from busybox/libbb/trim.c)16
-rw-r--r--libbb/u_signal_names.c (renamed from busybox/libbb/u_signal_names.c)23
-rw-r--r--libbb/unarchive.c (renamed from busybox/libbb/unarchive.c)2
-rw-r--r--libbb/unzip.c (renamed from busybox/archival/libunarchive/unzip.c)117
-rw-r--r--libbb/vdprintf.c (renamed from busybox/libbb/vdprintf.c)10
-rw-r--r--libbb/verror_msg.c (renamed from busybox/libbb/verror_msg.c)8
-rw-r--r--libbb/vherror_msg.c (renamed from busybox/libbb/vherror_msg.c)10
-rw-r--r--libbb/vperror_msg.c (renamed from busybox/libbb/vperror_msg.c)8
-rw-r--r--libbb/wfopen.c (renamed from busybox/libbb/wfopen.c)8
-rw-r--r--libbb/xfuncs.c (renamed from busybox/libbb/xfuncs.c)36
-rw-r--r--libbb/xgetcwd.c (renamed from busybox/libbb/xgetcwd.c)0
-rw-r--r--libbb/xgethostbyname.c (renamed from busybox/libbb/xgethostbyname.c)3
-rw-r--r--libbb/xreadlink.c (renamed from busybox/libbb/xreadlink.c)0
-rw-r--r--libbb/xregcomp.c (renamed from busybox/libbb/xregcomp.c)16
-rw-r--r--ln.c (renamed from busybox/coreutils/ln.c)4
-rw-r--r--loadacm.c (renamed from busybox/console-tools/loadacm.c)0
-rw-r--r--loadfont.c (renamed from busybox/console-tools/loadfont.c)0
-rw-r--r--loadkmap.c (renamed from busybox/console-tools/loadkmap.c)0
-rw-r--r--logger.c (renamed from busybox/logger.c)4
-rw-r--r--logname.c (renamed from busybox/coreutils/logname.c)0
-rw-r--r--logread.c (renamed from busybox/logread.c)0
-rw-r--r--losetup.c (renamed from busybox/coreutils/basename.c)62
-rw-r--r--ls.c (renamed from busybox/ls.c)82
-rw-r--r--lsmod.c (renamed from busybox/lsmod.c)53
-rw-r--r--makedevs.c (renamed from busybox/miscutils/makedevs.c)53
-rw-r--r--md5sum.c (renamed from busybox/coreutils/md5sum.c)26
-rwxr-xr-xmk_loop_h.sh (renamed from busybox/libbb/mk_loop_h.sh)4
-rw-r--r--mkdir.c (renamed from busybox/coreutils/mkdir.c)0
-rw-r--r--mkfifo.c (renamed from busybox/coreutils/mkfifo.c)0
-rw-r--r--mkfs_minix.c (renamed from busybox/mkfs_minix.c)0
-rw-r--r--mknod.c (renamed from busybox/coreutils/mknod.c)1
-rw-r--r--mkswap.c (renamed from busybox/util-linux/mkswap.c)8
-rw-r--r--mktemp.c (renamed from busybox/miscutils/mktemp.c)0
-rw-r--r--modprobe.c366
-rw-r--r--more.c (renamed from busybox/util-linux/more.c)13
-rw-r--r--mount.c (renamed from busybox/util-linux/mount.c)101
-rw-r--r--msh.c (renamed from busybox/msh.c)3245
-rw-r--r--mt.c (renamed from busybox/miscutils/mt.c)0
-rw-r--r--mv.c (renamed from busybox/coreutils/mv.c)0
-rw-r--r--nc.c (renamed from busybox/nc.c)38
-rw-r--r--nfsmount.c (renamed from busybox/nfsmount.c)0
-rw-r--r--nfsmount.h (renamed from busybox/nfsmount.h)0
-rw-r--r--nslookup.c (renamed from busybox/nslookup.c)29
-rw-r--r--pidof.c (renamed from busybox/procps/pidof.c)10
-rw-r--r--ping.c (renamed from busybox/ping.c)4
-rw-r--r--pivot_root.c (renamed from busybox/pivot_root.c)0
-rw-r--r--poweroff.c (renamed from busybox/init/poweroff.c)4
-rw-r--r--printf.c (renamed from busybox/coreutils/printf.c)0
-rwxr-xr-xpristine_setup.sh (renamed from busybox/pristine_setup.sh)5
-rw-r--r--ps.c (renamed from busybox/procps/ps.c)142
-rw-r--r--pwd.c (renamed from busybox/pwd.c)1
-rw-r--r--pwd_grp/.indent.pro33
-rw-r--r--pwd_grp/__getgrent.c162
-rw-r--r--pwd_grp/__getpwent.c113
-rw-r--r--pwd_grp/config.h65
-rw-r--r--pwd_grp/fgetgrent.c33
-rw-r--r--pwd_grp/fgetpwent.c33
-rw-r--r--pwd_grp/getgrgid.c42
-rw-r--r--pwd_grp/getgrnam.c48
-rw-r--r--pwd_grp/getpw.c45
-rw-r--r--pwd_grp/getpwnam.c49
-rw-r--r--pwd_grp/getpwuid.c42
-rw-r--r--pwd_grp/grent.c52
-rw-r--r--pwd_grp/grp.h (renamed from busybox/include/grp.h)0
-rw-r--r--pwd_grp/initgroups.c74
-rw-r--r--pwd_grp/putpwent.c37
-rw-r--r--pwd_grp/pwd.h (renamed from busybox/include/pwd.h)0
-rw-r--r--pwd_grp/pwent.c56
-rw-r--r--pwd_grp/setgroups.c43
-rw-r--r--rdate.c (renamed from busybox/rdate.c)0
-rw-r--r--readlink.c (renamed from busybox/miscutils/readlink.c)4
-rw-r--r--reboot.c116
-rw-r--r--renice.c (renamed from busybox/procps/renice.c)0
-rw-r--r--reset.c (renamed from busybox/console-tools/reset.c)6
-rw-r--r--rm.c (renamed from busybox/coreutils/rm.c)0
-rw-r--r--rmdir.c (renamed from busybox/coreutils/rmdir.c)4
-rw-r--r--rmmod.c (renamed from busybox/modutils/rmmod.c)4
-rw-r--r--route.c (renamed from busybox/networking/route.c)15
-rw-r--r--rpm2cpio.c (renamed from busybox/archival/rpm2cpio.c)0
-rwxr-xr-xscripts/depmod.pl (renamed from busybox/examples/depmod.pl)6
-rw-r--r--scripts/inittab (renamed from busybox/scripts/inittab)11
-rwxr-xr-xscripts/mk2knr.pl (renamed from busybox/examples/mk2knr.pl)0
-rw-r--r--scripts/undeb (renamed from busybox/examples/undeb)0
-rw-r--r--scripts/unrpm (renamed from busybox/examples/unrpm)0
-rw-r--r--sed.c1215
-rw-r--r--setkeycodes.c (renamed from busybox/setkeycodes.c)2
-rw-r--r--sleep.c (renamed from busybox/sleep.c)1
-rw-r--r--sort.c (renamed from busybox/coreutils/sort.c)0
-rw-r--r--stty.c (renamed from busybox/coreutils/stty.c)25
-rw-r--r--swaponoff.c (renamed from busybox/swaponoff.c)37
-rw-r--r--sync.c (renamed from busybox/coreutils/sync.c)0
-rw-r--r--syslogd.c (renamed from busybox/sysklogd/syslogd.c)205
-rw-r--r--tail.c (renamed from busybox/coreutils/tail.c)8
-rw-r--r--tar.c (renamed from busybox/archival/tar.c)8
-rw-r--r--tee.c (renamed from busybox/tee.c)3
-rw-r--r--telnet.c (renamed from busybox/networking/telnet.c)120
-rw-r--r--test.c (renamed from busybox/coreutils/test.c)0
-rw-r--r--tests/.cvsignore (renamed from busybox/tests/.cvsignore)0
-rw-r--r--tests/Makefile (renamed from busybox/tests/Makefile)0
-rw-r--r--tests/cp_tests.mk (renamed from busybox/tests/cp_tests.mk)0
-rw-r--r--tests/ln_tests.mk (renamed from busybox/tests/ln_tests.mk)0
-rwxr-xr-xtests/multibuild.pl (renamed from busybox/tests/multibuild.pl)0
-rwxr-xr-xtests/multifeat.pl (renamed from busybox/tests/multifeat.pl)0
-rw-r--r--tests/mv_tests.mk (renamed from busybox/tests/mv_tests.mk)0
-rw-r--r--tests/sh.testcases (renamed from busybox/tests/sh.testcases)10
-rw-r--r--tests/syslog_test.c (renamed from busybox/tests/syslog_test.c)0
-rw-r--r--tests/testcases (renamed from busybox/tests/testcases)0
-rwxr-xr-xtests/tester.sh (renamed from busybox/tests/tester.sh)0
-rw-r--r--tests/tst-syslogd.c (renamed from busybox/tests/tst-syslogd.c)0
-rw-r--r--tftp.c (renamed from busybox/tftp.c)312
-rw-r--r--time.c502
-rw-r--r--top.c739
-rw-r--r--touch.c (renamed from busybox/touch.c)4
-rw-r--r--tr.c (renamed from busybox/coreutils/tr.c)0
-rw-r--r--traceroute.c (renamed from busybox/networking/traceroute.c)19
-rw-r--r--true_false.c (renamed from busybox/true_false.c)4
-rw-r--r--tty.c (renamed from busybox/coreutils/tty.c)0
-rw-r--r--umount.c (renamed from busybox/umount.c)4
-rw-r--r--uname.c (renamed from busybox/coreutils/uname.c)0
-rw-r--r--uniq.c (renamed from busybox/uniq.c)6
-rw-r--r--update.c (renamed from busybox/miscutils/update.c)0
-rw-r--r--uptime.c (renamed from busybox/procps/uptime.c)4
-rw-r--r--usage.c (renamed from busybox/applets/usage.c)0
-rw-r--r--usage.h (renamed from busybox/applets/usage.h)153
-rw-r--r--usleep.c (renamed from busybox/coreutils/usleep.c)0
-rw-r--r--uudecode.c (renamed from busybox/uudecode.c)2
-rw-r--r--uuencode.c (renamed from busybox/coreutils/uuencode.c)0
-rw-r--r--vi.c (renamed from busybox/editors/vi.c)41
-rw-r--r--watchdog.c (renamed from busybox/miscutils/watchdog.c)0
-rw-r--r--wc.c (renamed from busybox/coreutils/wc.c)117
-rw-r--r--wget.c (renamed from busybox/networking/wget.c)41
-rw-r--r--which.c (renamed from busybox/findutils/which.c)64
-rw-r--r--whoami.c (renamed from busybox/coreutils/whoami.c)0
-rw-r--r--xargs.c (renamed from busybox/xargs.c)43
-rw-r--r--yes.c (renamed from busybox/coreutils/yes.c)0
475 files changed, 18368 insertions, 86480 deletions
diff --git a/busybox/.cvsignore b/.cvsignore
index 71269c542..71269c542 100644
--- a/busybox/.cvsignore
+++ b/.cvsignore
diff --git a/busybox/.indent.pro b/.indent.pro
index 492ecf1c7..492ecf1c7 100644
--- a/busybox/.indent.pro
+++ b/.indent.pro
diff --git a/busybox/AUTHORS b/AUTHORS
index 4258e5aa5..9cee03792 100644
--- a/busybox/AUTHORS
+++ b/AUTHORS
@@ -8,14 +8,14 @@ incorect, _please_ let me know.
-----------
-Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+Erik Andersen <andersen@codepoet.org>, <andersee@debian.org>
Tons of new stuff, major rewrite of most of the
core apps, tons of new apps as noted in header files.
Edward Betts <edward@debian.org>
expr, hostid, logname, tty, wc, whoami, yes
-John Beppu <beppu@lineo.com>
+John Beppu <beppu@codepoet.org>
du, head, nslookup, sort, tee, uniq
Brian Candler <B.Candler@pobox.com>
@@ -28,9 +28,17 @@ Dave Cinege <dcinege@psychosis.com>
more(v2), makedevs, dutmp, modularization, auto links file,
various fixes, Linux Router Project maintenance
+Magnus Damm <damm@opensource.se>
+ tftp client
+ insmod powerpc support
+
Larry Doolittle <ldoolitt@recycle.lbl.gov>
pristine source directory compilation, lots of patches and fixes.
+Gennady Feldman <gfeldman@cachier.com>
+ Sysklogd (single threaded syslogd, IPC Circular buffer support,
+ logread), various fixes.
+
Karl M. Hegbloom <karlheg@debian.org>
cp_mv.c, the test suite, various fixes to utility.c, &c.
@@ -38,7 +46,7 @@ Daniel Jacobowitz <dan@debian.org>
mktemp.c
Matt Kraai <kraai@alumni.carnegiemellon.edu>
- documentation, bugfixes
+ documentation, bugfixes, test suite
John Lombardo <john@deltanet.com>
dirname, tr
@@ -46,9 +54,16 @@ John Lombardo <john@deltanet.com>
Glenn McGrath <bug1@optushome.com.au>
ar, dpkg, dpkg-deb
+Vladimir Oleynik <dzo@simtreas.ru>
+ cmdedit; ports: ash, stty, traceroute; locale, various fixes
+ and irreconcilable critic of everything not perfect.
+
Bruce Perens <bruce@pixar.com>
Original author of BusyBox. His code is still in many apps.
+Tim Riker <Tim@Rikers.org>
+ bug fixes, member of fan club
+
Kent Robotti <robotti@metconnect.com>
reset, tons and tons of bug reports and patchs.
@@ -64,7 +79,7 @@ Gyepi Sam <gyepi@praxis-sw.com>
Linus Torvalds <torvalds@transmeta.com>
mkswap, fsck.minix, mkfs.minix
-Mark Whitley <markw@lineo.com> <markw@codepoet.org>
+Mark Whitley <markw@codepoet.org>
grep, sed, cut, xargs, style-guide, new-applet-HOWTO, bug fixes, etc.
Charles P. Wright <cpwright@villagenet.com>
@@ -73,9 +88,6 @@ Charles P. Wright <cpwright@villagenet.com>
Enrique Zanardi <ezanardi@ull.es>
tarcat (since removed), loadkmap, various fixes, Debian maintenance
-Vladimir Oleynik <dzo@simtreas.ru>
- cmdedit; ports: ash, stty, traceroute; locale, various fixes
- and irreconcilable critic of everything not perfect.
+Emanuele Aina <emanuele.aina@tiscali.it>
+ run-parts
-Tim Riker <Tim@Rikers.org>
- bug fixes, member of fan club
diff --git a/busybox/Changelog b/Changelog
index 314bc8ab7..46590b595 100644
--- a/busybox/Changelog
+++ b/Changelog
@@ -1,18 +1,198 @@
-0.60.2.pre
+0.60.5
Stable Release
+ Bugfixes:
+ * Fixed a race that could cause init to hang
+ * Fixed init orphan process reaping
+ * Fixed init to always attempt to provide a controlling tty.
+ This should fix most cases where ash would print
+ "job control disabled" -- the other cases are user error.
+ * Fixed 'gunzip -c' to not delete the source source file
+ * Fixed a silly math problem in the time applet
+ * Fixed 'cp -a' so it will once again copy symlinks properly
+ * Fixed a long standing problem in tftp with freeing memory
+ * Fixed Makefile largefile settings
+ * Fixed a buffer overflow in vi
+ * Cosmetic cleanups in lsmod, lash, init, swapon/off, and hostname
+ * Set the close-on-exec flag on files opened by init
+ * The updated top applet was backported from unstable
+ * Several ash bugfixes were backported from unstable
+ * Several warnings in ash, md5sum, and ifconfig
+
+ -Erik Andersen, 26 October 2002
+
+
+
+0.60.4
+
+ Stable Release
New Applets & New Features:
- none. :)
+ * Added new a 'top' applet (by special request)
+ * Lots of small uClinux adjustments
- Known Problems (to be fixed in 0.60.2)
- * msh can segfault on constructs such as
+ Bugfixes:
+ * This release has _lots_ of bugfixes. See Changelog.full
+ for the complete list of what was changed.
+
+ -Erik Andersen, 18 September 2002
+
+
+
+0.60.3
+
+ Stable Release
+
+ New Applets & New Features:
+ * Added new a 'time' applet (by special request)
+ * Added new a 'losetup' applet
+ * The tftp has been fixed to work
+ * Default shell is now ash.
+ * msh shell should work properly on mmu-less systems again
+ * ls can now do color
+
+ Bugfixes:
+ * Erik Andersen
+ -- Hacked together a new time applet
+ -- Fixed dangling comma in init.c (s390 arch only)
+ -- Fixed more so when it is run on files in the procfs that
+ claim 0 length, it will not do weird things i.e. more /proc/pci
+ -- Copyright message cleanups. Fixed sash attributions.
+ -- Backporting of fixes and general maintenance.
+ -- Fixed several cases where reboot, halt, and poweroff would fail
+ to function properly when Linux is booted into an initrd.
+ -- Fixed a silly compile bug in cpio
+ -- nslookup now works properly with uClibc, remove old workaround
+ -- Added conv=noerror support to dd
+ -- Fixed ash and msh cmdedit to properly account for the current
+ PATH setting
+ -- Document netcat options and add -e support
+ -- Fixed insanely broken insmod endianness handling
+ -- Update init.c for better syle conformance, properly detach from
+ terminal when necessary, better code reuse, FIFO inittab file
+ reading/executing, allow init to be halted and restarted, etc.
+ -- Allow gunzip to work on multiple archives, add -v option
+ -- Updated x86 optimizations to save over 10k.
+ * Edward Betts
+ -- added -x switch to du.c
+ * Cliff L. Biffle
+ -- Added memory usage to the ps listings
+ * Przemyslaw Czerpak
+ -- Made telnet 8-bit clean, handle screen size, and is now RFC
+ compliant. Works nicely now.
+ * Wolfgang Denk
+ -- hush now supports shell loops (for, while, until) and control
+ operators (||, &&)
+ * Russ Dill
+ -- Added an 'restart' inittab action, allowing init to re-exec
+ itself (or call a script which calls pivot_root then exec...)
+ * Larry Doolittle
+ -- Made syslogd not give up when errno is EINTR
+ * Geoffrey Espin
+ -- support find -newer <file>
+ * Robert Griebl
+ -- Reworked modprobe so it now reads and uses modules.dep
+ * Karl M. Hegbloom
+ -- Fixed a silly bug where CONTEXT and EGREP_ALIAS were coupled.
+ * Kevin Hilman
+ -- Fixed memory corruption from long pathnames in /etc/fstab
+ * J.W.Janssen
+ -- color ls support!
+ * Matt Kraai
+ -- Fixed get_line_from_file() so that NULL is treated as end of
+ line, thereby fixing cut, grep, sed, etc. when working on binary
+ files or anything that might contain a NULL.
+ -- Fixed wget to do DNS initial DNS lookups, and do that only once
+ to avoid skipping to a different server when round-robin DNS is
+ in use (bug found by Mike Coleman <mkc@mathdogs.com>)
+ -- Several sed fixes
+ -- Added new losetup applet
+ * Ben Low
+ -- allow tftp to work with stdin as well as stdout.
+ * Frank P. MacLachlan <fpm-plutus@tgs.indyme.com> avoid a potential
+ NULL pointer problem in mount.
+ * Glenn McGrath
+ -- gunzip was incorrectly reporting a failed crc and length
+ (Discovered by Change, Shu-Hao). The problem was the bitbuffer
+ needs to be unwound after decompression as it was eating into the
+ crc/size field.
+ -- Reworked wc.c to fix severe efficiency problems and make it
+ smaller. When just counting file chars, simply stat the file
+ instead of reading the whole thing. (Fixes Debian bug #103302)
+ -- Updated dmalloc options
+ * Manuel Novoa III
+ -- rewrote get_last_path_component() so it would not be so
+ horrible, and would behave correctly in several important corner
+ cases.
+ * Vladimir Oleynik
+ -- Fixed ash problem where ^C could be blocked
+ -- Several command line editing updates (cmdedit now supports
+ CTRL-K and CTRL-L, fixed a segfault, etc)
+ -- Fixed ash problem where ^C could be blocked
+ -- Several size optimizations for various applets
+ * Tim Riker
+ -- make ash prompt the same as other shells if cmdedit and
+ fancyprompt are enabled.
+ * Jeff Studer
+ -- tftp now generates default values for localfilename and
+ remotefilename based on provided file names when possible.
+ * Stefan Soucek and Miles Bader
+ -- Re-add mmu-less support to msh
+ * Jim Treadway
+ -- Fixed a buffer overflow in the local group handling code.
+ -- Fixed a missing "\" in usage.h
+ -- Made pidof not add trailing spaces
+ -- Fixed msh bugs so things like "A = 1; B = `eval $A`; echo $B"
+ can now work.
+ * Mike Voytovich
+ -- insmod big endian ARM support
+
+
+ -Erik Andersen, 27 April 2002
+
+
+
+
+
+0.60.2
+
+ Stable Release
+
+ * Please support busybox and help us buy busybox.net. See the
+ (current) busybox webpage for details.
+
+ New Applets & New Features:
+ * msh was reworked by Vladimir Oleynik's so it can handle things like
for i in `ls *.c` ; do echo $i ; done
- due to a memory allocation problem. This only seems to cause
- problems when the backtick expands to be several k in size.
+ unfortunately, this also means that msh is no-longer uClinux safe,
+ and will require some surgery to make it use vfork() again.
+ * Charles Steinkuehler <charles@steinkuehler.net> -- reworked hostname
+ so it behaves as expected (backport from busybox unstable)
+
+ Known Problems
+ none. :)
Bugfixes:
+ * Erik Andersen
+ -- Fixed grep -E and egrep so they actually behave as expected
+ -- init cleanups and (theoretical) uClinux support
+ -- Fixed large file (>2Gig) support (enable in the Makefile)
+ -- Always enable test when a shell is enabled (least surprise)
+ -- Made 'mount -a' use proc to avoid a static noauto list
+ -- lots of source tree cleanups
+ * Laurence Anderson
+ -- Removed some traces of no-longer existant rpmunpack (which
+ has been obsoleted by the rpm2cpio applet).
+ -- Fixed unarchive.c to use the correct buffer when calling
+ dirname, improve an error message, and plug some memory leaks.
+ -- Fixed rpm2cpio.c mkfs_minix.c fsck_minix.c fbset.c to use
+ standard types (s/u16/u_int16_t/g s/u32/u_int32_t/g etc)
+ * ASA <llb@udm.net.ru> -- fixed ash handling of command line args
+ when sourcing ('.') commands.
+ * Ethan Benson <erbenson@alaska.net>
+ -- Fix mount's noauto option to not automount as "usbdevfs"
+ * David Kimdon <dwhedon@instant802.com> -- fixed md5sum binary sums
* Matt Kraai
-- Fix sed s/[/]// handling (noted by Dumas Patrice).
-- Fix dirname(3) improper consts, allow libc version to override.
@@ -22,23 +202,19 @@
-- Fixed basename to be SUSv2 compliant (which specifies that the
extension should stay if it is identical to the basename.
-- Fixed rmdir, since SuS2 says rmdir must provide -p
- * Ethan Benson <erbenson@alaska.net>
- -- Fix mount's noauto option to not automount as "usbdevfs"
+ -- Fixed sed empty line substitutions (noted by Joshua Hudson).
+ * Steve Merrifield <steve@labyrinth.net.au> -- make vi use xmalloc
+ * Glenn McGrath
+ -- dpkg cleanups, various bugfixes
* Vladimir Oleynik
-- Add support for `busybox --help APPLET'
-- Fixed route so it properly displays all route entries
-- Fix for ash leading redirections (i.e. '2>/dev/null ls rubbish')
- * Laurence Anderson
- -- Removed some traces of no-longer existant rpmunpack (which
- has been obsoleted by the rpm2cpio applet).
- -- Fixed unarchive.c to use the correct buffer when calling
- dirname, improve an error message, and plug some memory leaks.
- -- Fixed rpm2cpio.c mkfs_minix.c fsck_minix.c fbset.c to use
- standard types (s/u16/u_int16_t/g s/u32/u_int32_t/g etc)
-
+ * Andrew Tipton <andrew@cadre5.com> -- enable vi cursor keys when in
+ edit mode as vim does.
- -Erik Andersen, --not yet released--
+ -Erik Andersen, 20 November 2001
@@ -608,7 +784,7 @@
Arne Bernin <arne@matrix.loopback.org>
* Fixed NFS so it supports 2.4.x kernels and NFSv3.
* Brand, new versions of grep and sed which use libc regex routines,
- thanks to Mark Whitley <markw@lineo.com>. The hand-tooled
+ thanks to Mark Whitley <markw@codepoet.org>. The hand-tooled
"regexp.[ch]" files have been removed. Much help on these from
Matt Kraai as well.
@@ -631,7 +807,7 @@
* Added a mini ar archive utility, especially written for BusyBox by
Glenn McGrath <bug1@netconnect.com.au>
* Added mktemp, contributed by Daniel Jacobowitz <dan@debian.org>
- * Added setkeycodes, for those that have wierd keyboard buttons.
+ * Added setkeycodes, for those that have weird keyboard buttons.
* Added md5sum, uuencode and uudecode -- thanks to Alfred M. Szmidt
<ams@trillian.itslinux.org> for contributing these.
* Added 'grep -v' option (inverted search) and updated
@@ -1002,7 +1178,7 @@
init is not at PID 1 (like when running in an initrd).
* Added a prelinary du implementation. Some parameter parsing
stuff still needs to be added. -beppu (John Beppu
- <beppu@lineo.com>)
+ <beppu@codepoet.org>)
* Implemented tee. -beppu Implemented head. -beppu
-Erik Andersen, Dec 10, 1999
@@ -1145,7 +1321,7 @@
0.32
* More changes -- many thanks to Lineo for paying me to work on
busybox. If you have any problems please let me know ASAP at
- andersen@lineo.com or andersee@debian.org
+ andersee@debian.org
* usage() now prints the BusyBox version. This will help folks
realize that they are not in Kansas anymore.
* Fixed mkdir -m option so that it works. kill segfaulted w/o any
diff --git a/Changelog.full b/Changelog.full
new file mode 100644
index 000000000..490283135
--- /dev/null
+++ b/Changelog.full
@@ -0,0 +1,138 @@
+2002-10-27 Erik Andersen <andersen@dillweed>
+
+ * Makefile: Increment version number
+
+ * debian/control, debian/changelog: Update packaging info
+
+2002-10-26 Erik Andersen <andersen@dillweed>
+
+ * debian/Config.h-udeb:
+ Don't support init being run as /linux in the debian installer
+ -Erik
+
+ * swaponoff.c: last_patch64 from vodz:
+
+ The following usage from original user:
+ $ ./busybox swapon -a
+ Have typo problem:
+ swapon: swapon: Operation not permitted
+
+ But regular version:
+ swapon: /dev/hda5: Operation not permitted
+
+ Patch attached, reduced 9 bytes and advanced
+ exit code also.
+
+ * vi.c:
+ A patch from Jouni Malinen to avoid some buffer overflows in vi,
+ closing bug #1270
+
+ * Makefile: Ivan Popov noticed that handling of PREFIX was bad.
+ -Erik
+
+2002-10-25 Erik Andersen <andersen@dillweed>
+
+ * tftp.c: This patch from Magnus Damm fixed a long standing problem
+ with freeing memory.
+
+2002-10-23 Erik Andersen <andersen@dillweed>
+
+ * top.c: Backport vodz' reworked top applet from unstable
+
+2002-10-22 Erik Andersen <andersen@dillweed>
+
+ * ash.c, ifconfig.c: Fix warnings
+
+ * md5sum.c: Fix undefined operation (temp = temp = <stuff>) and remove
+ double definition.
+ -Erik
+
+ * init.c: I committed the fflush in the wrong spot. I should go to bed
+ earlier so I don't screw up such easy stuff.
+ -Erik
+
+ * ash.c: Apply last_patch51_3 from vodz
+
+ * init.c: Be absurdly careful about flushing stdout.
+
+2002-10-18 Erik Andersen <andersen@dillweed>
+
+ * tests/sh.testcases: Missed a spot
+
+ * tests/sh.testcases: disambiguate a test
+
+ * lsmod.c: Fixup some needless formatting differences vs modutils
+
+ * hostname.c:
+ Fixup slight difference in 'hostname -d' behavior vs GNU hostname
+
+2002-10-12 Erik Andersen <andersen@dillweed>
+
+ * init.c:
+ After thinking about it, I think this patch from Matt Kraai is probably the
+ best way to go. Sysvinit does not provide a controlling tty since it doesn't
+ even try to open ttys for apps. We do. We we should _try_ to provide a
+ controlling tty if possible, but we needn't freak out if it doesn't work. So
+ we won't need to use openvt or similar, we'll just have init do the Right
+ Thing(tm).
+
+2002-10-08 Erik Andersen <andersen@dillweed>
+
+ * docs/.cvsignore: oops
+
+ * docs/.cvsignore, Makefile: Remove docs/busybox.pod on 'make clean'
+
+ * init.c:
+ Patch from Ben Gamsa <ben@somanetworks.com> to handle it when orphaned
+ processes are created faster than busybox init reaps them.
+
+ * lsmod.c: Fix missing \n noticed by Robert Schwebel
+
+ * debian/Config.h-udeb: Enable pidof
+
+ * libbb/copy_file.c:
+ Doh! It turns out I broke 'cp -a' symlink handling. Oops. This fix, from
+ Tollef Fog Heen <tollef@add.no> fixes my stupid thinko so that 'cp -a' once
+ again copies symlinks properly.
+
+2002-09-30 Erik Andersen <andersen@dillweed>
+
+ * usage.h: Fix docs
+
+ * lash.c:
+ Use %m, not strerror (changing since strerror(err) was broken anyways)
+
+ * init.c: Set the close-on-exec flag, just to be safe
+
+ * time.c: Doh. We divide microseconds by 60?
+
+2002-09-27 Erik Andersen <andersen@dillweed>
+
+ * time.c: Bug fix from Nitin Gupta <gupta@equator.com>
+
+2002-09-26 Erik Andersen <andersen@dillweed>
+
+ * lash.c: Avoid calling exit() from within fork/vfork'ed processes.
+ -Erik
+
+2002-09-25 Erik Andersen <andersen@dillweed>
+
+ * init.c:
+ Ignoring SIGCHLD causes a race leading to the occasional hang of init
+ when init will wait() on itself in waitfor() when the child exits before
+ init is scheduled to run. Letting init hang is very seriously bad.
+ -Erik
+
+2002-09-22 Erik Andersen <andersen@dillweed>
+
+ * Makefile: Fixup largefile settings.
+ -Erik
+
+2002-09-20 Erik Andersen <andersen@dillweed>
+
+ * gunzip.c: Doh! As noted by K.-P. Kirchdörfer" <kapeka@epost.de>,
+ gunzip -c deletes the source source file! This fixes it.
+ -Erik
+
+ * top.c: Don't leak FILEs
+
diff --git a/busybox/Config.h b/Config.h
index e832eae7a..c5ece5939 100644
--- a/busybox/Config.h
+++ b/Config.h
@@ -9,7 +9,7 @@
// BusyBox Applications
//#define BB_ADJTIMEX
//#define BB_AR
-//#define BB_ASH
+#define BB_ASH
#define BB_BASENAME
#define BB_CAT
#define BB_CHGRP
@@ -68,6 +68,7 @@
//#define BB_LOADKMAP
#define BB_LOGGER
//#define BB_LOGNAME
+//#define BB_LOSETUP
#define BB_LS
#define BB_LSMOD
//#define BB_MAKEDEVS
@@ -81,7 +82,7 @@
#define BB_MODPROBE
#define BB_MORE
#define BB_MOUNT
-#define BB_MSH
+//#define BB_MSH
//#define BB_MT
#define BB_MV
//#define BB_NC
@@ -117,6 +118,8 @@
//#define BB_TEST
//#define BB_TELNET
//#define BB_TFTP
+//#define BB_TIME
+//#define BB_TOP
#define BB_TOUCH
//#define BB_TR
//#define BB_TRACEROUTE
@@ -151,10 +154,10 @@
//
// If you enabled one or more of the shells, you may select which one
// should be run when sh is invoked:
-//#define BB_FEATURE_SH_IS_ASH
+#define BB_FEATURE_SH_IS_ASH
//#define BB_FEATURE_SH_IS_HUSH
//#define BB_FEATURE_SH_IS_LASH
-#define BB_FEATURE_SH_IS_MSH
+//#define BB_FEATURE_SH_IS_MSH
//
// BusyBox will, by default, malloc space for its buffers. This costs code
// size for the call to xmalloc. You can use the following feature to have
@@ -179,12 +182,12 @@
//#define BB_FEATURE_USE_DEVPS_PATCH
//
// show verbose usage messages
-//#define BB_FEATURE_VERBOSE_USAGE
+#define BB_FEATURE_VERBOSE_USAGE
//
// Use termios to manipulate the screen ('more' is prettier with this on)
//#define BB_FEATURE_USE_TERMIOS
//
-// calculate terminal & column widths (for more and ls)
+// calculate terminal & column widths (for more, ls, and telnet)
#define BB_FEATURE_AUTOWIDTH
//
// show username/groupnames for ls
@@ -205,6 +208,9 @@
// enable ls -L
#define BB_FEATURE_LS_FOLLOWLINKS
//
+// Use color to identify different file types
+#define BB_FEATURE_LS_COLOR
+//
// Disable for a smaller (but less functional) ping
#define BB_FEATURE_FANCY_PING
//
@@ -295,6 +301,13 @@
// Only relevant if a shell is enabled.
//#define BB_FEATURE_SH_FANCY_PROMPT
//
+// Uncomment this option to disable job control. Job control lets you
+// run jobs in the background (which completely useless for is all you
+// are doing is running scripts). Disabing this is bad for interactive
+// use, since when you hit ^C in an application, it will also kill the
+// shell. This adds about 2.5k on an x86 system.
+#define BB_FEATURE_ASH_JOB_CONTROL
+//
//Turn on extra fbset options
//#define BB_FEATURE_FBSET_FANCY
//
@@ -302,7 +315,7 @@
//#define BB_FEATURE_FBSET_READMODE
//
// Support insmod/lsmod/rmmod for post 2.1 kernels
-//#define BB_FEATURE_NEW_MODULE_INTERFACE
+#define BB_FEATURE_NEW_MODULE_INTERFACE
//
// Support insmod/lsmod/rmmod for pre 2.1 kernels
//#define BB_FEATURE_OLD_MODULE_INTERFACE
@@ -360,9 +373,12 @@
// Support for the find -perm option.
#define BB_FEATURE_FIND_PERM
//
-// Support for the find -mtine option.
+// Support for the find -mtime option.
#define BB_FEATURE_FIND_MTIME
//
+//// Support for the find -newer option.
+#define BB_FEATURE_FIND_NEWER
+//
// Support for the -A -B and -C context flags in grep
//#define BB_FEATURE_GREP_CONTEXT
//
@@ -405,16 +421,11 @@
// mere mortals so leave this stuff alone.
//
#include <features.h>
-#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
+#if defined(__uClinux__)
+ #undef BB_ASH /* Not even a chance it will work */
#undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */
#undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */
- #undef BB_ASH /* Uses fork() */
- #undef BB_HUSH /* Uses fork() */
- #undef BB_LASH /* Uses fork() */
- #undef BB_INIT /* Uses fork() */
#undef BB_FEATURE_TAR_GZIP /* Uses fork() */
- #undef BB_SYSLOGD /* Uses daemon() */
- #undef BB_KLOGD /* Uses daemon() */
#undef BB_UPDATE /* Uses daemon() */
#endif
#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
diff --git a/busybox/INSTALL b/INSTALL
index e17bd80d3..e17bd80d3 100644
--- a/busybox/INSTALL
+++ b/INSTALL
diff --git a/busybox/LICENSE b/LICENSE
index 8e5a143d0..3f792d018 100644
--- a/busybox/LICENSE
+++ b/LICENSE
@@ -17,15 +17,14 @@ Copyright 1998 Dave Cinege <dcinege@psychosis.com>
mini-gzip(gzip), mini-netcat(mnc)
Copyright 1998 Charles P. Wright <cpwright@villagenet.com>
-Tons of new stuff as noted in header files
-Copyright (C) 1999,2000,2001 by Lineo, inc. and written by
-Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
-
+Tons of new stuff as noted in header files
+Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
+Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
Please feed suggestions, bug reports, insults, and bribes back to:
Erik Andersen
- <andersen@lineo.com>
+ <andersen@codepoet.org>
<andersee@debian.org>
diff --git a/busybox/Makefile b/Makefile
index d231f69e7..331929365 100644
--- a/busybox/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Makefile for busybox
#
-# Copyright (C) 1999,2000,2001 Erik Andersen <andersee@debian.org>
+# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
#
PROG := busybox
-VERSION := 0.60.2.pre
+VERSION := 0.60.5
BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
export VERSION
@@ -39,23 +39,31 @@ DOSTATIC = false
# Leave this set to `false' for production use.
DODEBUG = false
-# Setting this to `true' will cause busybox to directly use the system's
-# password and group functions. Assuming you use GNU libc, when this is
-# `true', you will need to install the /etc/nsswitch.conf configuration file
-# and the required libnss_* libraries. This generally makes your embedded
-# system quite a bit larger... If you leave this off, busybox will directly use
-# the /etc/password, /etc/group files (and your system will be smaller, and I
-# will get fewer emails asking about how glibc NSS works). Enabling this adds
-# just 1.4k to the binary size (which is a _lot_ less then glibc NSS costs).
-# Note that if you want hostname resolution to work with glibc, you still need
-# the libnss_* libraries.
+# If you enable this option, busybox will use the system's password
+# and group functions. And if you are using the GNU C library
+# (glibc), you will then need to install the /etc/nsswitch.conf
+# configuration file and the required /lib/libnss_* libraries in
+# order for the password and group functions to work. This generally
+# makes your embedded system quite a bit larger.
+# Disabling this option will cause busybox to directly access the
+# system's /etc/password, /etc/group files (and your system will be
+# smaller, and I will get fewer emails asking about how glibc NSS
+# works). When this option is disabled, you will not be able to use
+# PAM to access remote LDAP password servers and whatnot. And if you
+# want hostname resolution to work with glibc, you still need the
+# /lib/libnss_* libraries.
+# If you disable this option, it will add about 1.5k to busybox.
USE_SYSTEM_PWD_GRP = true
# This enables compiling with dmalloc ( http://dmalloc.com/ )
# which is an excellent public domain mem leak and malloc problem
# detector. To enable dmalloc, before running busybox you will
# want to first set up your environment.
-# eg: `export DMALLOC_OPTIONS=debug=0x14f47d83,inter=100,log=logfile`
+# eg: `export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile`
+# The debug= value is generated using the following command
+# dmalloc -p log-stats -p log-non-free -p log-bad-space -p log-elapsed-time \
+# -p check-fence -p check-heap -p check-lists -p check-blank \
+# -p check-funcs -p realloc-copy -p allow-free-null
# Do not enable this for production builds...
DODMALLOC = false
@@ -74,7 +82,7 @@ DOLFS = false
# If you have a "pristine" source directory, point BB_SRC_DIR to it.
# Experimental and incomplete; tell the mailing list
-# <busybox@opensource.lineo.com> if you do or don't like it so far.
+# <busybox@busybox.net> if you do or don't like it so far.
BB_SRC_DIR =
# If you are running a cross compiler, you may want to set this
@@ -82,11 +90,11 @@ BB_SRC_DIR =
CROSS =
CC = $(CROSS)gcc
AR = $(CROSS)ar
-STRIPTOOL = $(CROSS)strip
+STRIP = $(CROSS)strip
# To compile vs uClibc, just use the compiler wrapper built by uClibc...
# Everything should compile and work as expected these days...
-#CC = ../uClibc/extra/gcc-uClibc/i386-uclibc-gcc
+#CC=/usr/i386-linux-uclibc/bin/i386-uclibc-gcc
# To compile vs some other alternative libc, you may need to use/adjust
# the following lines to meet your needs...
@@ -106,15 +114,48 @@ STRIPTOOL = $(CROSS)strip
#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
-# use '-Os' optimization if available, else use -O2
-OPTIMIZATION := $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
- then echo "-Os"; else echo "-O2" ; fi)
-
WARNINGS = -Wall -Wshadow
ARFLAGS = -r
-#
+
+TARGET_ARCH:=${shell $(CC) -dumpmachine | sed -e s'/-.*//' \
+ -e 's/i.86/i386/' \
+ -e 's/sparc.*/sparc/' \
+ -e 's/arm.*/arm/g' \
+ -e 's/m68k.*/m68k/' \
+ -e 's/ppc/powerpc/g' \
+ -e 's/v850.*/v850/g' \
+ -e 's/sh[234]/sh/' \
+ -e 's/mips.*/mips/' \
+ }
+
+#--------------------------------------------------------
+# Arch specific compiler optimization stuff should go here.
+# Unless you want to override the defaults, do not set anything
+# for OPTIMIZATION...
+
+# use '-Os' optimization if available, else use -O2
+OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
+ then echo "-Os"; else echo "-O2" ; fi}
+
+# Some nice architecture specific optimizations
+ifeq ($(strip $(TARGET_ARCH)),arm)
+ OPTIMIZATION+=-fstrict-aliasing
+endif
+ifeq ($(strip $(TARGET_ARCH)),i386)
+ OPTIMIZATION+=-march=i386
+ OPTIMIZATION+=${shell if $(CC) -mpreferred-stack-boundary=2 -S -o /dev/null -xc \
+ /dev/null >/dev/null 2>&1; then echo "-mpreferred-stack-boundary=2"; fi}
+ OPTIMIZATION+=${shell if $(CC) -falign-functions=1 -falign-jumps=0 -falign-loops=0 \
+ -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo \
+ "-falign-functions=1 -falign-jumps=0 -falign-loops=0"; else \
+ if $(CC) -malign-functions=0 -malign-jumps=0 -S -o /dev/null -xc \
+ /dev/null >/dev/null 2>&1; then echo "-malign-functions=0 -malign-jumps=0"; fi; fi}
+endif
+OPTIMIZATIONS:=$(OPTIMIZATION) -fomit-frame-pointer
+
+
#--------------------------------------------------------
# If you're going to do a lot of builds with a non-vanilla configuration,
# it makes sense to adjust parameters above, so you can type "make"
@@ -122,10 +163,9 @@ ARFLAGS = -r
# every time. The stuff below, on the other hand, is probably less
# prone to casual user adjustment.
#
-
ifeq ($(strip $(DOLFS)),true)
- # For large file summit support
- CFLAGS+=-D_FILE_OFFSET_BITS=64
+ # For large file support
+ CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
endif
ifeq ($(strip $(DODMALLOC)),true)
# For testing mem leaks with dmalloc
@@ -143,11 +183,11 @@ endif
ifeq ($(strip $(DODEBUG)),true)
CFLAGS += $(WARNINGS) -g -D_GNU_SOURCE
LDFLAGS += -Wl,-warn-common
- STRIP =
+ STRIPCMD = /bin/true -Since_we_are_debugging
else
- CFLAGS += $(WARNINGS) $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
+ CFLAGS += $(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE
LDFLAGS += -s -Wl,-warn-common
- STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
+ STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
ifeq ($(strip $(DOSTATIC)),true)
LDFLAGS += --static
@@ -164,7 +204,7 @@ ifeq ($(strip $(DOSTATIC)),true)
#endif
endif
-ifndef $(PREFIX)
+ifeq ($(strip $(PREFIX)),)
PREFIX = `pwd`/_install
endif
@@ -237,7 +277,7 @@ endif
LIBBB = libbb
LIBBB_LIB = libbb.a
LIBBB_CSRC= ask_confirmation.c chomp.c concat_path_file.c copy_file.c \
-copy_file_chunk.c libc5.c device_open.c error_msg.c \
+copy_file_chunk.c libc5.c device_open.c error_msg.c inode_hash.c \
error_msg_and_die.c fgets_str.c find_mount_point.c find_pid_by_name.c \
find_root_device.c full_read.c full_write.c get_console.c \
get_last_path_component.c get_line_from_file.c gz_open.c human_readable.c \
@@ -245,7 +285,7 @@ isdirectory.c kernel_version.c loop.c mode_string.c module_syscalls.c mtab.c \
mtab_file.c my_getgrnam.c my_getgrgid.c my_getpwnam.c my_getpwnamegid.c \
my_getpwuid.c parse_mode.c parse_number.c perror_msg.c perror_msg_and_die.c \
print_file.c process_escape_sequence.c read_package_field.c recursive_action.c \
-safe_read.c safe_strncpy.c syscalls.c syslog_msg_with_name.c time_string.c \
+safe_read.c safe_write.c safe_strncpy.c syscalls.c syslog_msg_with_name.c time_string.c \
trim.c unzip.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \
xgetcwd.c xreadlink.c xregcomp.c interface.c remove_file.c last_char_is.c \
copyfd.c vherror_msg.c herror_msg.c herror_msg_and_die.c xgethostbyname.c \
@@ -303,15 +343,9 @@ docs/BusyBox.1: docs/busybox.pod
- pod2man --center=BusyBox --release="version $(VERSION)" \
$< > $@
-docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
- - mkdir -p docs
- -@ rm -f docs/BusyBox.html
- -@ ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
-
-docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod
- -@ mkdir -p docs/busybox.lineo.com
- - pod2html --noindex $< > \
- docs/busybox.lineo.com/BusyBox.html
+docs/BusyBox.html: docs/busybox.pod
+ -@ mkdir -p docs
+ - pod2html --noindex $< > docs/BusyBox.html
-@ rm -f pod2htm*
@@ -339,12 +373,12 @@ docs/busybox.pdf: docs/busybox.ps
docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
- mkdir -p docs
- (cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
+ (cd docs; sgmltools -b html ../busybox.sgml)
busybox: $(PWD_LIB) $(LIBBB_LIB) $(OBJECTS)
$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBBB_LIB) $(PWD_LIB) $(LIBRARIES)
- $(STRIP)
+ $(STRIPCMD) $(PROG)
# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
# but with VPATH, some or all of those file names are resolved to the
@@ -362,19 +396,27 @@ else
endif
$(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile
- - mkdir -p $(PWD_GRP)
+ifneq ($(strip $(BB_SRC_DIR)),)
+ -mkdir -p $(PWD_GRP)
+endif
$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
$(LIBBB_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile libbb/libbb.h
- - mkdir -p $(LIBBB)
+ifneq ($(strip $(BB_SRC_DIR)),)
+ -mkdir -p $(LIBBB)
+endif
$(CC) $(CFLAGS) $(LIBBB_CFLAGS) -c $< -o $*.o
$(LIBBB_MOBJ): $(LIBBB_MSRC)
- - mkdir -p $(LIBBB)
+ifneq ($(strip $(BB_SRC_DIR)),)
+ -mkdir -p $(LIBBB)
+endif
$(CC) $(CFLAGS) $(LIBBB_CFLAGS) -DL_$(patsubst libbb/%,%,$*) -c $< -o $*.o
$(LIBBB_AROBJS): $(LIBBB_ARCSRC)
- - mkdir -p $(LIBBB)
+ifneq ($(strip $(BB_SRC_DIR)),)
+ -mkdir -p $(LIBBB)
+endif
$(CC) $(CFLAGS) $(LIBBB_CFLAGS) -DL_$(patsubst libbb/%,%,$*) -c $< -o $*.o
libpwd.a: $(PWD_OBJS)
@@ -398,14 +440,13 @@ test tests:
clean:
- cd tests && $(MAKE) clean
- - rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
- docs/busybox.lineo.com/BusyBox.html
+ - rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html docs/BusyBox.html
- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
- docs/busybox.pdf docs/busybox.lineo.com/busybox.html
+ docs/busybox.pdf docs/busybox.html docs/busybox.pod
- rm -f multibuild.log Config.h.orig *.gdb *.elf
- rm -rf docs/busybox _install libpwd.a libbb.a pod2htm*
- - rm -f busybox.links libbb/loop.h *~ slist.mk core applet_source_list
- - find -name \*.o -exec rm -f {} \;
+ - rm -f busybox busybox.links libbb/loop.h *~ slist.mk core applet_source_list
+ - find . -name \*.o -exec rm -f {} \;
distclean: clean
- cd tests && $(MAKE) distclean
@@ -414,6 +455,9 @@ distclean: clean
install: install.sh busybox busybox.links
$(SHELL) $< $(PREFIX)
+uninstall: busybox busybox.links
+ for i in `cat busybox.links` ; do rm -f $$PREFIX$$i; done
+
install-hardlinks: install.sh busybox busybox.links
$(SHELL) $< $(PREFIX) --hardlinks
diff --git a/busybox/README b/README
index b45ef57f4..7e978b632 100644
--- a/busybox/README
+++ b/README
@@ -39,8 +39,9 @@ Supported architectures:
Supported libcs:
- glibc-2.0.x, glibc-2.1.x, Linux-libc5, uClibc. People are looking at
- newlib and diet-libc, but consider them unsupported, untested, or worse.
+ glibc-2.0.x, glibc-2.1.x, glibc-2.2.x, Linux-libc5, uClibc. People
+ are looking at newlib and diet-libc, but consider them unsupported,
+ untested, or worse.
Supported kernels:
@@ -82,7 +83,7 @@ top of ash.c as well, so check those out if you want to tweak things.
Getting help:
When you find you need help, you can check out the BusyBox mailing list
-archives at http://opensource.lineo.com/lists/busybox/ or even join
+archives at http://busybox.net/lists/busybox/ or even join
the mailing list if you are interested.
----------------
@@ -90,12 +91,12 @@ the mailing list if you are interested.
Bugs:
If you find bugs, please submit a bug report. Full instructions on how to
-report a bug are found at http://bugs.lineo.com/Reporting.html.
+report a bug are found at http://bugs.busybox.net/Reporting.html.
For the impatient: To submit a bug, simply send an email describing the problem
-to submit@bugs.lineo.com. Bug reports should look something like this:
+to submit@bugs.busybox.net. Bug reports should look something like this:
- To: submit@bugs.lineo.com
+ To: submit@bugs.busybox.net
From: diligent@testing.linux.org
Subject: /bin/true doesn't work
@@ -123,30 +124,25 @@ understanding.
FTP:
Source for the latest released version can always be downloaded from
- ftp://ftp.lineo.com/pub/busybox.
+ http://busybox.net/downloads/
----------------
CVS:
BusyBox now has its own publicly browsable CVS tree at:
- http://opensource.lineo.com/cgi-bin/cvsweb/busybox/
+ http://busybox.net/cgi-bin/cvsweb/busybox/
Anonymous CVS access is available. For instructions, check out:
- http://opensource.lineo.com/cvs_anon.html
+ http://busybox.net/cvs_anon.html
For those that are actively contributing there is even CVS write access:
- http://opensource.lineo.com/cvs_write.html
+ http://busybox.net/cvs_write.html
----------------
Please feed suggestions, bug reports, insults, and bribes back to:
Erik Andersen
- <andersen@lineo.com>
+ <andersen@codepoet.org>
<andersee@debian.org>
- <andersee@codepoet.org>
-
-<blatant plug>
-Many thanks to go to Lineo for paying me to work on busybox.
-</blatant plug>
diff --git a/busybox/TODO b/TODO
index 3d9af20a7..1e6388576 100644
--- a/busybox/TODO
+++ b/TODO
@@ -18,7 +18,6 @@ around to it some time. If you have any good ideas, please let me know.
Possible apps to include some time:
* hwclock
-* start-stop-daemon
* group/commonize strings, remove dups (for i18n, l10n)
-----------
@@ -48,10 +47,6 @@ and then start with the biggest things and make them smaller...
-----------------------
- du.c probably ought to have an -x switch like GNU du does...
-
------------------------
-
xargs could use a -l option
------------------------------------------------------------------
diff --git a/busybox/adjtimex.c b/adjtimex.c
index e3c160d87..e3c160d87 100644
--- a/busybox/adjtimex.c
+++ b/adjtimex.c
diff --git a/busybox/applets.c b/applets.c
index f3e56a9f3..f3e56a9f3 100644
--- a/busybox/applets.c
+++ b/applets.c
diff --git a/busybox/applets.h b/applets.h
index 7d7517385..403c06ee7 100644
--- a/busybox/applets.h
+++ b/applets.h
@@ -242,6 +242,9 @@
#ifdef BB_LOGREAD
APPLET(logread, logread_main, _BB_DIR_SBIN)
#endif
+#ifdef BB_LOSETUP
+ APPLET(losetup, losetup_main, _BB_DIR_SBIN)
+#endif
#ifdef BB_LS
APPLET(ls, ls_main, _BB_DIR_BIN)
#endif
@@ -401,6 +404,12 @@
#ifdef BB_TFTP
APPLET(tftp, tftp_main, _BB_DIR_USR_BIN)
#endif
+#ifdef BB_TIME
+ APPLET(time, time_main, _BB_DIR_USR_BIN)
+#endif
+#ifdef BB_TOP
+ APPLET(top, top_main, _BB_DIR_USR_BIN)
+#endif
#ifdef BB_TOUCH
APPLET(touch, touch_main, _BB_DIR_BIN)
#endif
diff --git a/busybox/ar.c b/ar.c
index 7f3396c8c..7f3396c8c 100644
--- a/busybox/ar.c
+++ b/ar.c
diff --git a/busybox/ash.c b/ash.c
index c0d47559d..6db0c887f 100644
--- a/busybox/ash.c
+++ b/ash.c
@@ -5,6 +5,10 @@
* Copyright (c) 1989, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
+ * Copyright (c) 1997-2003 Herbert Xu <herbert@debian.org>
+ * was re-ported from NetBSD and debianized.
+ *
+ *
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
*
@@ -22,65 +26,89 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * This version of ash is adapted from the source in Debian's ash 0.3.8-5
- * package.
- *
- * Modified by Erik Andersen <andersee@debian.org> and
- * Vladimir Oleynik <dzo@simtreas.ru> to be used in busybox
+ * Original BSD copyright notice is retained at the end of this file.
+ */
+
+/*
+ * rewrite arith.y to micro stack based cryptic algorithm by
+ * Copyright (c) 2001 Aaron Lehmann <aaronl@vitelus.com>
*
+ * Modified by Vladimir Oleynik <dzo@simtreas.ru> (c) 2001-2003 to be
+ * used in busybox and size optimizations,
+ * support locale, rewrited arith (see notes to this)
*
- * Original copyright notice is retained at the end of this file.
*/
-/* These defines allow you to adjust the feature set to be compiled
- * into the ash shell. As a rule, enabling these options will make
- * ash get bigger... With all of these options off, ash adds about
- * 60k to busybox on an x86 system.*/
-
-
-/* Enable job control. This allows you to run jobs in the background,
- * which is great when ash is being used as an interactive shell, but
- * it completely useless for is all you are doing is running scripts.
- * This adds about 2.5k on an x86 system. */
-#undef JOBS
+/*
+ * The follow should be set to reflect the type of system you have:
+ * JOBS -> 1 if you have Berkeley job control, 0 otherwise.
+ * define SYSV if you are running under System V.
+ * define DEBUG=1 to compile in debugging ('set -o debug' to turn on)
+ * define DEBUG=2 to compile in and turn on debugging.
+ *
+ * When debugging is on, debugging info will be written to ./trace and
+ * a quit signal will generate a core dump.
+ */
/* This enables alias support in ash. If you want to support things
* like "alias ls='ls -l'" with ash, enable this. This is only useful
* when ash is used as an intractive shell. This adds about 1.5k */
-#define ASH_ALIAS
+#define BB_ASH_ALIAS
/* If you need ash to act as a full Posix shell, with full math
* support, enable this. This adds a bit over 2k an x86 system. */
-//#undef ASH_MATH_SUPPORT
-#define ASH_MATH_SUPPORT
+#define BB_ASH_MATH_SUPPORT
/* Getopts is used by shell procedures to parse positional parameters.
* You probably want to leave this disabled, and use the busybox getopt
* applet if you want to do this sort of thing. There are some scripts
* out there that use it, so if you need it, enable it. Most people will
* leave this disabled. This adds 1k on an x86 system. */
-#undef ASH_GETOPTS
+#undef BB_ASH_GETOPTS
/* This allows you to override shell builtins and use whatever is on
* the filesystem. This is most useful when ash is acting as a
* standalone shell. Adds about 272 bytes. */
-#undef ASH_CMDCMD
+#undef BB_ASH_CMDCMD
+/* Check for mail */
+#undef BB_ASH_MAIL
/* Optimize size vs speed as size */
-#define ASH_OPTIMIZE_FOR_SIZE
+#define BB_ASH_OPTIMIZE_FOR_SIZE
/* Enable this to compile in extra debugging noise. When debugging is
* on, debugging info will be written to $HOME/trace and a quit signal
* will generate a core dump. */
#undef DEBUG
-/* These are here to work with glibc -- Don't change these... */
-#undef FNMATCH_BROKEN
-#undef GLOB_BROKEN
+
+
#define IFS_BROKEN
+#define PROFILE 0
+
+#ifdef DEBUG
+#define _GNU_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <stdarg.h>
+#include <stddef.h>
#include <assert.h>
#include <ctype.h>
#include <dirent.h>
@@ -88,190 +116,122 @@
#include <fcntl.h>
#include <limits.h>
#include <paths.h>
-#include <pwd.h>
#include <setjmp.h>
#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdint.h>
#include <sysexits.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/cdefs.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/resource.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#if !defined(FNMATCH_BROKEN)
#include <fnmatch.h>
-#endif
-#if !defined(GLOB_BROKEN)
-#include <glob.h>
+
+
+#include "busybox.h"
+#include "pwd_grp/pwd.h"
+
+#ifdef BB_ASH_JOB_CONTROL
+#define JOBS 1
+#else
+#undef JOBS
#endif
-#ifdef JOBS
+#if JOBS
#include <termios.h>
#endif
-#include "busybox.h"
#include "cmdedit.h"
-/*
- * This file was generated by the mksyntax program.
- */
-
-/* Syntax classes */
-#define CWORD 0 /* character is nothing special */
-#define CNL 1 /* newline character */
-#define CBACK 2 /* a backslash character */
-#define CSQUOTE 3 /* single quote */
-#define CDQUOTE 4 /* double quote */
-#define CENDQUOTE 5 /* a terminating quote */
-#define CBQUOTE 6 /* backwards single quote */
-#define CVAR 7 /* a dollar sign */
-#define CENDVAR 8 /* a '}' character */
-#define CLP 9 /* a left paren in arithmetic */
-#define CRP 10 /* a right paren in arithmetic */
-#define CENDFILE 11 /* end of file */
-#define CCTL 12 /* like CWORD, except it must be escaped */
-#define CSPCL 13 /* these terminate a word */
-#define CIGN 14 /* character should be ignored */
+#ifdef __GLIBC__
+/* glibc sucks */
+static int *dash_errno;
+#undef errno
+#define errno (*dash_errno)
+#endif
-/* Syntax classes for is_ functions */
-#define ISDIGIT 01 /* a digit */
-#define ISUPPER 02 /* an upper case letter */
-#define ISLOWER 04 /* a lower case letter */
-#define ISUNDER 010 /* an underscore */
-#define ISSPECL 020 /* the name of a special parameter */
+#if defined(__uClinux__)
+#error "Do not even bother, ash will not run on uClinux"
+#endif
-#define SYNBASE 130
-#define PEOF -130
+#ifdef DEBUG
+#define _DIAGASSERT(assert_expr) assert(assert_expr)
+#else
+#define _DIAGASSERT(assert_expr)
+#endif
-#define PEOA -129
-#define TEOF 0
-#define TNL 1
-#define TSEMI 2
-#define TBACKGND 3
-#define TAND 4
-#define TOR 5
-#define TPIPE 6
-#define TLP 7
-#define TRP 8
-#define TENDCASE 9
-#define TENDBQUOTE 10
-#define TREDIR 11
-#define TWORD 12
-#define TASSIGN 13
-#define TNOT 14
-#define TCASE 15
-#define TDO 16
-#define TDONE 17
-#define TELIF 18
-#define TELSE 19
-#define TESAC 20
-#define TFI 21
-#define TFOR 22
-#define TIF 23
-#define TIN 24
-#define TTHEN 25
-#define TUNTIL 26
-#define TWHILE 27
-#define TBEGIN 28
-#define TEND 29
-
-
-#define BASESYNTAX (basesyntax + SYNBASE)
-#define DQSYNTAX (dqsyntax + SYNBASE)
-#define SQSYNTAX (sqsyntax + SYNBASE)
-#define ARISYNTAX (arisyntax + SYNBASE)
+#ifdef BB_ASH_ALIAS
+/* $NetBSD: alias.h,v 1.5 2002/11/24 22:35:38 christos Exp $ */
-/* control characters in argument strings */
-#define CTLESC '\201'
-#define CTLVAR '\202'
-#define CTLENDVAR '\203'
-#define CTLBACKQ '\204'
-#define CTLQUOTE 01 /* ored with CTLBACKQ code if in quotes */
-/* CTLBACKQ | CTLQUOTE == '\205' */
-#define CTLARI '\206'
-#define CTLENDARI '\207'
-#define CTLQUOTEMARK '\210'
+#define ALIASINUSE 1
+#define ALIASDEAD 2
-#define is_digit(c) ((c)>='0' && (c)<='9')
-#define is_alpha(c) (((c) < CTLESC || (c) > CTLENDARI) && isalpha((unsigned char) (c)))
-#define is_name(c) (((c) < CTLESC || (c) > CTLENDARI) && ((c) == '_' || isalpha((unsigned char) (c))))
-#define is_in_name(c) (((c) < CTLESC || (c) > CTLENDARI) && ((c) == '_' || isalnum((unsigned char) (c))))
-#define is_special(c) ((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT))
-#define digit_val(c) ((c) - '0')
+struct alias {
+ struct alias *next;
+ char *name;
+ char *val;
+ int flag;
+};
+static struct alias *lookupalias(const char *, int);
+static int aliascmd(int, char **);
+static int unaliascmd(int, char **);
+static void rmaliases(void);
+static int unalias(const char *);
+static void printalias(const struct alias *);
+#endif
-#define _DIAGASSERT(x)
+/* $NetBSD: cd.h,v 1.3 2002/11/24 22:35:39 christos Exp $ */
+static void setpwd(const char *, int);
-#define S_DFL 1 /* default signal handling (SIG_DFL) */
-#define S_CATCH 2 /* signal is caught */
-#define S_IGN 3 /* signal is ignored (SIG_IGN) */
-#define S_HARD_IGN 4 /* signal is ignored permenantly */
-#define S_RESET 5 /* temporary - to reset a hard ignored sig */
+/* $NetBSD: error.h,v 1.15 2002/11/24 22:35:39 christos Exp $ */
-/* variable substitution byte (follows CTLVAR) */
-#define VSTYPE 0x0f /* type of variable substitution */
-#define VSNUL 0x10 /* colon--treat the empty string as unset */
-#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */
+/*
+ * Types of operations (passed to the errmsg routine).
+ */
-/* values of VSTYPE field */
-#define VSNORMAL 0x1 /* normal variable: $var or ${var} */
-#define VSMINUS 0x2 /* ${var-text} */
-#define VSPLUS 0x3 /* ${var+text} */
-#define VSQUESTION 0x4 /* ${var?message} */
-#define VSASSIGN 0x5 /* ${var=text} */
-#define VSTRIMLEFT 0x6 /* ${var#pattern} */
-#define VSTRIMLEFTMAX 0x7 /* ${var##pattern} */
-#define VSTRIMRIGHT 0x8 /* ${var%pattern} */
-#define VSTRIMRIGHTMAX 0x9 /* ${var%%pattern} */
-#define VSLENGTH 0xa /* ${#var} */
-/* flags passed to redirect */
-#define REDIR_PUSH 01 /* save previous values of file descriptors */
-#define REDIR_BACKQ 02 /* save the command output to pipe */
+static const char not_found_msg[] = "%s: not found";
-/*
- * BSD setjmp saves the signal mask, which violates ANSI C and takes time,
- * so we use _setjmp instead.
- */
-#if defined(BSD)
-#define setjmp(jmploc) _setjmp(jmploc)
-#define longjmp(jmploc, val) _longjmp(jmploc, val)
-#endif
+#define E_OPEN "No such file" /* opening a file */
+#define E_CREAT "Directory nonexistent" /* creating a file */
+#define E_EXEC not_found_msg+4 /* executing a program */
/*
- * Most machines require the value returned from malloc to be aligned
- * in some way. The following macro will get this right on many machines.
+ * We enclose jmp_buf in a structure so that we can declare pointers to
+ * jump locations. The global variable handler contains the location to
+ * jump to when an exception occurs, and the global variable exception
+ * contains a code identifying the exeception. To implement nested
+ * exception handlers, the user should save the value of handler on entry
+ * to an inner scope, set handler to point to a jmploc structure for the
+ * inner scope, and restore handler on exit from the scope.
*/
-#ifndef ALIGN
-union align {
- int i;
- char *cp;
+struct jmploc {
+ jmp_buf loc;
};
-#define ALIGN(nbytes) (((nbytes) + sizeof(union align) - 1) & ~(sizeof(union align) - 1))
-#endif
+static struct jmploc *handler;
+static int exception;
+static volatile int suppressint;
+static volatile sig_atomic_t intpending;
-#ifdef BB_LOCALE_SUPPORT
-#include <locale.h>
-static void change_lc_all(const char *value);
-static void change_lc_ctype(const char *value);
-#endif
+static int exerrno; /* Last exec error, error for EXEXEC */
+
+/* exceptions */
+#define EXINT 0 /* SIGINT received */
+#define EXERROR 1 /* a generic error */
+#define EXSHELLPROC 2 /* execute a shell procedure */
+#define EXEXEC 3 /* command execution failed */
+#define EXEXIT 4 /* exit the shell */
+#define EXSIG 5 /* trapped signal in wait(1) */
+
+
+/* do we generate EXSIG events */
+static int exsig;
+/* last pending signal */
+static volatile sig_atomic_t pendingsigs;
/*
* These macros allow the user to suspend the handling of interrupt signals
@@ -280,105 +240,144 @@ static void change_lc_ctype(const char *value);
* more fun than worrying about efficiency and portability. :-))
*/
-static void onint (void);
-static volatile int suppressint;
-static volatile int intpending;
-
-#define INTOFF suppressint++
-#ifndef ASH_OPTIMIZE_FOR_SIZE
-#define INTON { if (--suppressint == 0 && intpending) onint(); }
-#define FORCEINTON {suppressint = 0; if (intpending) onint();}
-#else
-static void __inton (void);
-static void forceinton (void);
-#define INTON __inton()
+#define barrier() ({ __asm__ __volatile__ ("": : :"memory"); })
+#define INTOFF \
+ ({ \
+ suppressint++; \
+ barrier(); \
+ 0; \
+ })
+#define SAVEINT(v) ((v) = suppressint)
+#define RESTOREINT(v) \
+ ({ \
+ barrier(); \
+ if ((suppressint = (v)) == 0 && intpending) onint(); \
+ 0; \
+ })
+#define EXSIGON() \
+ ({ \
+ exsig++; \
+ barrier(); \
+ if (pendingsigs) \
+ exraise(EXSIG); \
+ 0; \
+ })
+/* EXSIG is turned off by evalbltin(). */
+
+
+static void exraise(int) __attribute__((__noreturn__));
+static void onint(void) __attribute__((__noreturn__));
+
+static void error(const char *, ...) __attribute__((__noreturn__));
+static void exerror(int, const char *, ...) __attribute__((__noreturn__));
+
+static void sh_warnx(const char *, ...);
+
+#ifdef BB_ASH_OPTIMIZE_FOR_SIZE
+static void
+inton(void) {
+ if (--suppressint == 0 && intpending) {
+ onint();
+ }
+}
+#define INTON inton()
+static void forceinton(void)
+{
+ suppressint = 0;
+ if (intpending)
+ onint();
+}
#define FORCEINTON forceinton()
-#endif
-
-#define CLEAR_PENDING_INT intpending = 0
-#define int_pending() intpending
-
-
-typedef void *pointer;
-#ifndef NULL
-#define NULL (void *)0
-#endif
-
-static inline pointer ckmalloc (int sz) { return xmalloc(sz); }
-static inline pointer ckrealloc(void *p, int sz) { return xrealloc(p, sz); }
-static inline char * savestr (const char *s) { return xstrdup(s); }
-
-static pointer stalloc (int);
-static void stunalloc (pointer);
-static void ungrabstackstr (char *, char *);
-static char * growstackstr(void);
-static char * makestrspace(size_t newlen);
-static char *sstrdup (const char *);
+#else
+#define INTON \
+ ({ \
+ barrier(); \
+ if (--suppressint == 0 && intpending) onint(); \
+ 0; \
+ })
+#define FORCEINTON \
+ ({ \
+ barrier(); \
+ suppressint = 0; \
+ if (intpending) onint(); \
+ 0; \
+ })
+#endif /* BB_ASH_OPTIMIZE_FOR_SIZE */
/*
- * Parse trees for commands are allocated in lifo order, so we use a stack
- * to make this more efficient, and also to avoid all sorts of exception
- * handling code to handle interrupts in the middle of a parse.
- *
- * The size 504 was chosen because the Ultrix malloc handles that size
- * well.
+ * BSD setjmp saves the signal mask, which violates ANSI C and takes time,
+ * so we use _setjmp instead.
*/
-#define MINSIZE 504 /* minimum size of a block */
+#if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__)
+#define setjmp(jmploc) _setjmp(jmploc)
+#define longjmp(jmploc, val) _longjmp(jmploc, val)
+#endif
+/* $NetBSD: expand.h,v 1.13 2002/11/24 22:35:40 christos Exp $ */
-struct stack_block {
- struct stack_block *prev;
- char space[MINSIZE];
+struct strlist {
+ struct strlist *next;
+ char *text;
};
-static struct stack_block stackbase;
-static struct stack_block *stackp = &stackbase;
-static struct stackmark *markp;
-static char *stacknxt = stackbase.space;
-static int stacknleft = MINSIZE;
+struct arglist {
+ struct strlist *list;
+ struct strlist **lastp;
+};
-#define equal(s1, s2) (strcmp(s1, s2) == 0)
+/*
+ * expandarg() flags
+ */
+#define EXP_FULL 0x1 /* perform word splitting & file globbing */
+#define EXP_TILDE 0x2 /* do normal tilde expansion */
+#define EXP_VARTILDE 0x4 /* expand tildes in an assignment */
+#define EXP_REDIR 0x8 /* file glob for a redirection (1 match only) */
+#define EXP_CASE 0x10 /* keeps quotes around for CASE pattern */
+#define EXP_RECORD 0x20 /* need to record arguments for ifs breakup */
+#define EXP_VARTILDE2 0x40 /* expand tildes after colons only */
+#define EXP_WORD 0x80 /* expand word in parameter expansion */
+#define EXP_QWORD 0x100 /* expand word in quoted parameter expansion */
-#define stackblock() stacknxt
-#define stackblocksize() stacknleft
-#define STARTSTACKSTR(p) p = stackblock(), sstrnleft = stackblocksize()
-#define STPUTC(c, p) (--sstrnleft >= 0? (*p++ = (c)) : (p = growstackstr(), *p++ = (c)))
-#define CHECKSTRSPACE(n, p) { if (sstrnleft < n) p = makestrspace(n); }
-#define STACKSTRNUL(p) (sstrnleft == 0? (p = growstackstr(), *p = '\0') : (*p = '\0'))
+union node;
+static void expandarg(union node *, struct arglist *, int);
+#define rmescapes(p) _rmescapes((p), 0)
+static char *_rmescapes(char *, int);
+static int casematch(union node *, char *);
+#ifdef BB_ASH_MATH_SUPPORT
+static void expari(int);
+#endif
-#define USTPUTC(c, p) (--sstrnleft, *p++ = (c))
-#define STUNPUTC(p) (++sstrnleft, --p)
-#define STTOPC(p) p[-1]
-#define STADJUST(amount, p) (p += (amount), sstrnleft -= (amount))
-#define grabstackstr(p) stalloc(stackblocksize() - sstrnleft)
+/* $NetBSD: eval.h,v 1.13 2002/11/24 22:35:39 christos Exp $ */
-#define ckfree(p) free((pointer)(p))
+static char *commandname; /* currently executing command */
+static struct strlist *cmdenviron; /* environment for builtin command */
+static int exitstatus; /* exit status of last command */
+static int back_exitstatus; /* exit status of backquoted command */
-#ifdef DEBUG
-#define TRACE(param) trace param
-static void trace (const char *, ...);
-static void trargs (char **);
-static void showtree (union node *);
-static void trputc (int);
-static void trputs (const char *);
-static void opentrace (void);
-#else
-#define TRACE(param)
-#endif
+struct backcmd { /* result of evalbackcmd */
+ int fd; /* file descriptor to read from */
+ char *buf; /* buffer */
+ int nleft; /* number of chars in buffer */
+ struct job *jp; /* job structure for command */
+};
-#define NSEMI 0
-#define NCMD 1
-#define NPIPE 2
-#define NREDIR 3
-#define NBACKGND 4
-#define NSUBSHELL 5
-#define NAND 6
-#define NOR 7
+/*
+ * This file was generated by the mknodes program.
+ */
+
+#define NCMD 0
+#define NPIPE 1
+#define NREDIR 2
+#define NBACKGND 3
+#define NSUBSHELL 4
+#define NAND 5
+#define NOR 6
+#define NSEMI 7
#define NIF 8
#define NWHILE 9
#define NUNTIL 10
@@ -388,88 +387,20 @@ static void opentrace (void);
#define NDEFUN 14
#define NARG 15
#define NTO 16
-#define NFROM 17
-#define NFROMTO 18
-#define NAPPEND 19
-#define NTOOV 20
+#define NCLOBBER 17
+#define NFROM 18
+#define NFROMTO 19
+#define NAPPEND 20
#define NTOFD 21
#define NFROMFD 22
#define NHERE 23
#define NXHERE 24
#define NNOT 25
-/*
- * expandarg() flags
- */
-#define EXP_FULL 0x1 /* perform word splitting & file globbing */
-#define EXP_TILDE 0x2 /* do normal tilde expansion */
-#define EXP_VARTILDE 0x4 /* expand tildes in an assignment */
-#define EXP_REDIR 0x8 /* file glob for a redirection (1 match only) */
-#define EXP_CASE 0x10 /* keeps quotes around for CASE pattern */
-#define EXP_RECORD 0x20 /* need to record arguments for ifs breakup */
-
-
-#define NOPTS 16
-
-static char optet_vals[NOPTS];
-
-static const char * const optlist[NOPTS] = {
- "e" "errexit",
- "f" "noglob",
- "I" "ignoreeof",
- "i" "interactive",
- "m" "monitor",
- "n" "noexec",
- "s" "stdin",
- "x" "xtrace",
- "v" "verbose",
- "V" "vi",
- "E" "emacs",
- "C" "noclobber",
- "a" "allexport",
- "b" "notify",
- "u" "nounset",
- "q" "quietprofile"
-};
-
-#define optent_name(optent) (optent+1)
-#define optent_letter(optent) optent[0]
-#define optent_val(optent) optet_vals[optent]
-
-#define eflag optent_val(0)
-#define fflag optent_val(1)
-#define Iflag optent_val(2)
-#define iflag optent_val(3)
-#define mflag optent_val(4)
-#define nflag optent_val(5)
-#define sflag optent_val(6)
-#define xflag optent_val(7)
-#define vflag optent_val(8)
-#define Vflag optent_val(9)
-#define Eflag optent_val(10)
-#define Cflag optent_val(11)
-#define aflag optent_val(12)
-#define bflag optent_val(13)
-#define uflag optent_val(14)
-#define qflag optent_val(15)
-
-
-/* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */
-#define FORK_FG 0
-#define FORK_BG 1
-#define FORK_NOJOB 2
-
-
-struct nbinary {
- int type;
- union node *ch1;
- union node *ch2;
-};
struct ncmd {
int type;
- int backgnd;
union node *assign;
union node *args;
union node *redirect;
@@ -490,6 +421,13 @@ struct nredir {
};
+struct nbinary {
+ int type;
+ union node *ch1;
+ union node *ch2;
+};
+
+
struct nif {
int type;
union node *test;
@@ -563,10 +501,10 @@ struct nnot {
union node {
int type;
- struct nbinary nbinary;
struct ncmd ncmd;
struct npipe npipe;
struct nredir nredir;
+ struct nbinary nbinary;
struct nif nif;
struct nfor nfor;
struct ncase ncase;
@@ -584,38 +522,72 @@ struct nodelist {
union node *n;
};
-struct backcmd { /* result of evalbackcmd */
- int fd; /* file descriptor to read from */
- char *buf; /* buffer */
- int nleft; /* number of chars in buffer */
- struct job *jp; /* job structure for command */
-};
-struct cmdentry {
- int cmdtype;
- union param {
- int index;
- union node *func;
- const struct builtincmd *cmd;
- } u;
+struct funcnode {
+ int count;
+ union node n;
};
-struct strlist {
- struct strlist *next;
- char *text;
-};
+static void freefunc(struct funcnode *);
+/* $NetBSD: parser.h,v 1.15 2002/11/24 22:35:42 christos Exp $ */
-struct arglist {
- struct strlist *list;
- struct strlist **lastp;
-};
+/* control characters in argument strings */
+#define CTL_FIRST '\201' /* first 'special' character */
+#define CTLESC '\201' /* escape next character */
+#define CTLVAR '\202' /* variable defn */
+#define CTLENDVAR '\203'
+#define CTLBACKQ '\204'
+#define CTLQUOTE 01 /* ored with CTLBACKQ code if in quotes */
+/* CTLBACKQ | CTLQUOTE == '\205' */
+#define CTLARI '\206' /* arithmetic expression */
+#define CTLENDARI '\207'
+#define CTLQUOTEMARK '\210'
+#define CTL_LAST '\210' /* last 'special' character */
+
+/* variable substitution byte (follows CTLVAR) */
+#define VSTYPE 0x0f /* type of variable substitution */
+#define VSNUL 0x10 /* colon--treat the empty string as unset */
+#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */
+
+/* values of VSTYPE field */
+#define VSNORMAL 0x1 /* normal variable: $var or ${var} */
+#define VSMINUS 0x2 /* ${var-text} */
+#define VSPLUS 0x3 /* ${var+text} */
+#define VSQUESTION 0x4 /* ${var?message} */
+#define VSASSIGN 0x5 /* ${var=text} */
+#define VSTRIMRIGHT 0x6 /* ${var%pattern} */
+#define VSTRIMRIGHTMAX 0x7 /* ${var%%pattern} */
+#define VSTRIMLEFT 0x8 /* ${var#pattern} */
+#define VSTRIMLEFTMAX 0x9 /* ${var##pattern} */
+#define VSLENGTH 0xa /* ${#var} */
+
+/* values of checkkwd variable */
+#define CHKALIAS 0x1
+#define CHKKWD 0x2
+#define CHKNL 0x4
+
+#define IBUFSIZ (BUFSIZ + 1)
+
+/*
+ * NEOF is returned by parsecmd when it encounters an end of file. It
+ * must be distinct from NULL, so we use the address of a variable that
+ * happens to be handy.
+ */
+static int plinno = 1; /* input line number */
+
+/* number of characters left in input buffer */
+static int parsenleft; /* copy of parsefile->nleft */
+static int parselleft; /* copy of parsefile->lleft */
+
+/* next character in input buffer */
+static char *parsenextc; /* copy of parsefile->nextc */
struct strpush {
struct strpush *prev; /* preceding string on stack */
char *prevstring;
int prevnleft;
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
struct alias *ap; /* if push was associated with an alias */
#endif
char *string; /* remember the string since it may change */
@@ -633,540 +605,657 @@ struct parsefile {
struct strpush basestrpush; /* so pushing one is fast */
};
-struct stackmark {
- struct stack_block *stackp;
- char *stacknxt;
- int stacknleft;
- struct stackmark *marknext;
-};
+static struct parsefile basepf; /* top level input file */
+static char basebuf[IBUFSIZ]; /* buffer for top level input file */
+static struct parsefile *parsefile = &basepf; /* current input file */
-struct shparam {
- int nparam; /* # of positional parameters (without $0) */
- unsigned char malloc; /* if parameter list dynamically allocated */
- char **p; /* parameter list */
- int optind; /* next parameter to be processed by getopts */
- int optoff; /* used by getopts */
-};
-/*
- * When commands are first encountered, they are entered in a hash table.
- * This ensures that a full path search will not have to be done for them
- * on each invocation.
- *
- * We should investigate converting to a linear search, even though that
- * would make the command name "hash" a misnomer.
- */
-#define CMDTABLESIZE 31 /* should be prime */
-#define ARB 1 /* actual size determined at run time */
+static int tokpushback; /* last token pushed back */
+#define NEOF ((union node *)&tokpushback)
+static int parsebackquote; /* nonzero if we are inside backquotes */
+static int doprompt; /* if set, prompt the user */
+static int needprompt; /* true if interactive and at start of line */
+static int lasttoken; /* last token read */
+static char *wordtext; /* text of last word returned by readtoken */
+static int checkkwd;
+static struct nodelist *backquotelist;
+static union node *redirnode;
+static struct heredoc *heredoc;
+static int quoteflag; /* set if (part of) last token was quoted */
+static int startlinno; /* line # where last token started */
+static union node *parsecmd(int);
+static void fixredir(union node *, const char *, int);
+static const char *const *findkwd(const char *);
+static char *endofname(const char *);
+/* $NetBSD: shell.h,v 1.16 2003/01/22 20:36:04 dsl Exp $ */
-struct tblentry {
- struct tblentry *next; /* next entry in hash chain */
- union param param; /* definition of builtin function */
- short cmdtype; /* index identifying command */
- char rehash; /* if set, cd done since entry created */
- char cmdname[ARB]; /* name of command */
+typedef void *pointer;
+
+static char nullstr[1]; /* zero length string */
+static const char spcstr[] = " ";
+static const char snlfmt[] = "%s\n";
+static const char dolatstr[] = { CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0' };
+static const char illnum[] = "Illegal number: %s";
+static const char homestr[] = "HOME";
+
+#ifdef DEBUG
+#define TRACE(param) trace param
+#define TRACEV(param) tracev param
+#else
+#define TRACE(param)
+#define TRACEV(param)
+#endif
+
+#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#define __builtin_expect(x, expected_value) (x)
+#endif
+
+#define likely(x) __builtin_expect((x),1)
+
+
+#define TEOF 0
+#define TNL 1
+#define TREDIR 2
+#define TWORD 3
+#define TSEMI 4
+#define TBACKGND 5
+#define TAND 6
+#define TOR 7
+#define TPIPE 8
+#define TLP 9
+#define TRP 10
+#define TENDCASE 11
+#define TENDBQUOTE 12
+#define TNOT 13
+#define TCASE 14
+#define TDO 15
+#define TDONE 16
+#define TELIF 17
+#define TELSE 18
+#define TESAC 19
+#define TFI 20
+#define TFOR 21
+#define TIF 22
+#define TIN 23
+#define TTHEN 24
+#define TUNTIL 25
+#define TWHILE 26
+#define TBEGIN 27
+#define TEND 28
+
+/* first char is indicating which tokens mark the end of a list */
+static const char *const tokname_array[] = {
+ "\1end of file",
+ "\0newline",
+ "\0redirection",
+ "\0word",
+ "\0;",
+ "\0&",
+ "\0&&",
+ "\0||",
+ "\0|",
+ "\0(",
+ "\1)",
+ "\1;;",
+ "\1`",
+#define KWDOFFSET 13
+ /* the following are keywords */
+ "\0!",
+ "\0case",
+ "\1do",
+ "\1done",
+ "\1elif",
+ "\1else",
+ "\1esac",
+ "\1fi",
+ "\0for",
+ "\0if",
+ "\0in",
+ "\1then",
+ "\0until",
+ "\0while",
+ "\0{",
+ "\1}",
};
+static const char *tokname(int tok)
+{
+ static char buf[16];
-static struct tblentry *cmdtable[CMDTABLESIZE];
-static int builtinloc = -1; /* index in path of %builtin, or -1 */
-static int exerrno = 0; /* Last exec error */
+ if (tok >= TSEMI)
+ buf[0] = '"';
+ sprintf(buf + (tok >= TSEMI), "%s%c",
+ tokname_array[tok] + 1, (tok >= TSEMI ? '"' : 0));
+ return buf;
+}
+/* $NetBSD: machdep.h,v 1.10 2002/10/07 14:26:08 christos Exp $ */
-static void tryexec (char *, char **, char **);
-static void printentry (struct tblentry *, int);
-static void clearcmdentry (int);
-static struct tblentry *cmdlookup (const char *, int);
-static void delete_cmd_entry (void);
-static int path_change (const char *, int *);
+/*
+ * Most machines require the value returned from malloc to be aligned
+ * in some way. The following macro will get this right on many machines.
+ */
+#define SHELL_SIZE (sizeof(union {int i; char *cp; double d; }) - 1)
+/*
+ * It appears that grabstackstr() will barf with such alignments
+ * because stalloc() will return a string allocated in a new stackblock.
+ */
+#define SHELL_ALIGN(nbytes) (((nbytes) + SHELL_SIZE) & ~SHELL_SIZE)
-static void flushall (void);
-static void out2fmt (const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
-static int xwrite (int, const char *, int);
+/*
+ * This file was generated by the mksyntax program.
+ */
-static void outstr (const char *p, FILE *file) { fputs(p, file); }
-static void out1str(const char *p) { outstr(p, stdout); }
-static void out2str(const char *p) { outstr(p, stderr); }
-#ifndef ASH_OPTIMIZE_FOR_SIZE
-#define out2c(c) putc((c), stderr)
+/* Syntax classes */
+#define CWORD 0 /* character is nothing special */
+#define CNL 1 /* newline character */
+#define CBACK 2 /* a backslash character */
+#define CSQUOTE 3 /* single quote */
+#define CDQUOTE 4 /* double quote */
+#define CENDQUOTE 5 /* a terminating quote */
+#define CBQUOTE 6 /* backwards single quote */
+#define CVAR 7 /* a dollar sign */
+#define CENDVAR 8 /* a '}' character */
+#define CLP 9 /* a left paren in arithmetic */
+#define CRP 10 /* a right paren in arithmetic */
+#define CENDFILE 11 /* end of file */
+#define CCTL 12 /* like CWORD, except it must be escaped */
+#define CSPCL 13 /* these terminate a word */
+#define CIGN 14 /* character should be ignored */
+
+#ifdef BB_ASH_ALIAS
+#define SYNBASE 130
+#define PEOF -130
+#define PEOA -129
+#define PEOA_OR_PEOF PEOA
#else
-static void out2c(int c) { putc(c, stderr); }
-#endif
-
-/* syntax table used when not in quotes */
-static const char basesyntax[257] = {
- CENDFILE, CSPCL, CWORD, CCTL,
- CCTL, CCTL, CCTL, CCTL,
- CCTL, CCTL, CCTL, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CSPCL,
- CNL, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CSPCL, CWORD,
- CDQUOTE, CWORD, CVAR, CWORD,
- CSPCL, CSQUOTE, CSPCL, CSPCL,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CSPCL, CSPCL, CWORD,
- CSPCL, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CBACK, CWORD,
- CWORD, CWORD, CBQUOTE, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CSPCL, CENDVAR,
- CWORD
-};
+#define SYNBASE 129
+#define PEOF -129
+#define PEOA_OR_PEOF PEOF
+#endif
-/* syntax table used when in double quotes */
-static const char dqsyntax[257] = {
- CENDFILE, CIGN, CWORD, CCTL,
- CCTL, CCTL, CCTL, CCTL,
- CCTL, CCTL, CCTL, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CNL, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CCTL,
- CENDQUOTE,CWORD, CVAR, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CCTL, CWORD, CWORD, CCTL,
- CWORD, CCTL, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CCTL, CWORD, CWORD, CCTL,
- CWORD, CCTL, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CCTL, CBACK, CCTL,
- CWORD, CWORD, CBQUOTE, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CENDVAR,
- CCTL
-};
+#define is_digit(c) ((unsigned)((c) - '0') <= 9)
+#define is_name(c) ((c) == '_' || isalpha((unsigned char)(c)))
+#define is_in_name(c) ((c) == '_' || isalnum((unsigned char)(c)))
-/* syntax table used when in single quotes */
-static const char sqsyntax[257] = {
- CENDFILE, CIGN, CWORD, CCTL,
- CCTL, CCTL, CCTL, CCTL,
- CCTL, CCTL, CCTL, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CNL, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CCTL,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CENDQUOTE,CWORD, CWORD,
- CCTL, CWORD, CWORD, CCTL,
- CWORD, CCTL, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CCTL, CWORD, CWORD, CCTL,
- CWORD, CCTL, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CCTL, CCTL, CCTL,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CCTL
-};
+/*
+ * is_special(c) evaluates to 1 for c in "!#$*-0123456789?@"; 0 otherwise
+ * (assuming ascii char codes, as the original implementation did)
+ */
+#define is_special(c) \
+ ( (((unsigned int)c) - 33 < 32) \
+ && ((0xc1ff920dUL >> (((unsigned int)c) - 33)) & 1))
-/* syntax table used when in arithmetic */
-static const char arisyntax[257] = {
- CENDFILE, CIGN, CWORD, CCTL,
- CCTL, CCTL, CCTL, CCTL,
- CCTL, CCTL, CCTL, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CNL, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CDQUOTE, CWORD, CVAR, CWORD,
- CWORD, CSQUOTE, CLP, CRP,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CBACK, CWORD,
- CWORD, CWORD, CBQUOTE, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CWORD,
- CWORD, CWORD, CWORD, CENDVAR,
- CWORD
-};
+#define digit_val(c) ((c) - '0')
-/* character classification table */
-static const char is_type[257] = {
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, ISSPECL,
- 0, ISSPECL, ISSPECL, 0,
- 0, 0, 0, 0,
- ISSPECL, 0, 0, ISSPECL,
- 0, 0, ISDIGIT, ISDIGIT,
- ISDIGIT, ISDIGIT, ISDIGIT, ISDIGIT,
- ISDIGIT, ISDIGIT, ISDIGIT, ISDIGIT,
- 0, 0, 0, 0,
- 0, ISSPECL, ISSPECL, ISUPPER,
- ISUPPER, ISUPPER, ISUPPER, ISUPPER,
- ISUPPER, ISUPPER, ISUPPER, ISUPPER,
- ISUPPER, ISUPPER, ISUPPER, ISUPPER,
- ISUPPER, ISUPPER, ISUPPER, ISUPPER,
- ISUPPER, ISUPPER, ISUPPER, ISUPPER,
- ISUPPER, ISUPPER, ISUPPER, ISUPPER,
- ISUPPER, 0, 0, 0,
- 0, ISUNDER, 0, ISLOWER,
- ISLOWER, ISLOWER, ISLOWER, ISLOWER,
- ISLOWER, ISLOWER, ISLOWER, ISLOWER,
- ISLOWER, ISLOWER, ISLOWER, ISLOWER,
- ISLOWER, ISLOWER, ISLOWER, ISLOWER,
- ISLOWER, ISLOWER, ISLOWER, ISLOWER,
- ISLOWER, ISLOWER, ISLOWER, ISLOWER,
- ISLOWER, 0, 0, 0,
- 0
-};
+/*
+ * This file was generated by the mksyntax program.
+ */
-/* Array indicating which tokens mark the end of a list */
-static const char tokendlist[] = {
- 1,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 1,
- 1,
- 1,
- 0,
- 0,
- 0,
- 0,
- 0,
- 1,
- 1,
- 1,
- 1,
- 1,
- 1,
- 0,
- 0,
- 0,
- 1,
- 0,
- 0,
- 0,
- 1,
+#ifdef BB_ASH_OPTIMIZE_FOR_SIZE
+#define USE_SIT_FUNCTION
+#endif
+
+/* number syntax index */
+#define BASESYNTAX 0 /* not in quotes */
+#define DQSYNTAX 1 /* in double quotes */
+#define SQSYNTAX 2 /* in single quotes */
+#define ARISYNTAX 3 /* in arithmetic */
+
+#ifdef BB_ASH_MATH_SUPPORT
+static const char S_I_T[][4] = {
+#ifdef BB_ASH_ALIAS
+ {CSPCL, CIGN, CIGN, CIGN}, /* 0, PEOA */
+#endif
+ {CSPCL, CWORD, CWORD, CWORD}, /* 1, ' ' */
+ {CNL, CNL, CNL, CNL}, /* 2, \n */
+ {CWORD, CCTL, CCTL, CWORD}, /* 3, !*-/:=?[]~ */
+ {CDQUOTE, CENDQUOTE, CWORD, CWORD}, /* 4, '"' */
+ {CVAR, CVAR, CWORD, CVAR}, /* 5, $ */
+ {CSQUOTE, CWORD, CENDQUOTE, CWORD}, /* 6, "'" */
+ {CSPCL, CWORD, CWORD, CLP}, /* 7, ( */
+ {CSPCL, CWORD, CWORD, CRP}, /* 8, ) */
+ {CBACK, CBACK, CCTL, CBACK}, /* 9, \ */
+ {CBQUOTE, CBQUOTE, CWORD, CBQUOTE}, /* 10, ` */
+ {CENDVAR, CENDVAR, CWORD, CENDVAR}, /* 11, } */
+#ifndef USE_SIT_FUNCTION
+ {CENDFILE, CENDFILE, CENDFILE, CENDFILE}, /* 12, PEOF */
+ {CWORD, CWORD, CWORD, CWORD}, /* 13, 0-9A-Za-z */
+ {CCTL, CCTL, CCTL, CCTL} /* 14, CTLESC ... */
+#endif
};
-
-static const char *const tokname[] = {
- "end of file",
- "newline",
- "\";\"",
- "\"&\"",
- "\"&&\"",
- "\"||\"",
- "\"|\"",
- "\"(\"",
- "\")\"",
- "\";;\"",
- "\"`\"",
- "redirection",
- "word",
- "assignment",
- "\"!\"",
- "\"case\"",
- "\"do\"",
- "\"done\"",
- "\"elif\"",
- "\"else\"",
- "\"esac\"",
- "\"fi\"",
- "\"for\"",
- "\"if\"",
- "\"in\"",
- "\"then\"",
- "\"until\"",
- "\"while\"",
- "\"{\"",
- "\"}\"",
+#else
+static const char S_I_T[][3] = {
+#ifdef BB_ASH_ALIAS
+ {CSPCL, CIGN, CIGN}, /* 0, PEOA */
+#endif
+ {CSPCL, CWORD, CWORD}, /* 1, ' ' */
+ {CNL, CNL, CNL}, /* 2, \n */
+ {CWORD, CCTL, CCTL}, /* 3, !*-/:=?[]~ */
+ {CDQUOTE, CENDQUOTE, CWORD}, /* 4, '"' */
+ {CVAR, CVAR, CWORD}, /* 5, $ */
+ {CSQUOTE, CWORD, CENDQUOTE}, /* 6, "'" */
+ {CSPCL, CWORD, CWORD}, /* 7, ( */
+ {CSPCL, CWORD, CWORD}, /* 8, ) */
+ {CBACK, CBACK, CCTL}, /* 9, \ */
+ {CBQUOTE, CBQUOTE, CWORD}, /* 10, ` */
+ {CENDVAR, CENDVAR, CWORD}, /* 11, } */
+#ifndef USE_SIT_FUNCTION
+ {CENDFILE, CENDFILE, CENDFILE}, /* 12, PEOF */
+ {CWORD, CWORD, CWORD}, /* 13, 0-9A-Za-z */
+ {CCTL, CCTL, CCTL} /* 14, CTLESC ... */
+#endif
};
+#endif /* BB_ASH_MATH_SUPPORT */
+
+#ifdef USE_SIT_FUNCTION
+
+#define U_C(c) ((unsigned char)(c))
+
+static int SIT(int c, int syntax)
+{
+ static const char spec_symbls[] = "\t\n !\"$&'()*-/:;<=>?[\\]`|}~";
+#ifdef BB_ASH_ALIAS
+ static const char syntax_index_table[] = {
+ 1, 2, 1, 3, 4, 5, 1, 6, /* "\t\n !\"$&'" */
+ 7, 8, 3, 3, 3, 3, 1, 1, /* "()*-/:;<" */
+ 3, 1, 3, 3, 9, 3, 10, 1, /* "=>?[\\]`|" */
+ 11, 3 /* "}~" */
+ };
+#else
+ static const char syntax_index_table[] = {
+ 0, 1, 0, 2, 3, 4, 0, 5, /* "\t\n !\"$&'" */
+ 6, 7, 2, 2, 2, 2, 0, 0, /* "()*-/:;<" */
+ 2, 0, 2, 2, 8, 2, 9, 0, /* "=>?[\\]`|" */
+ 10, 2 /* "}~" */
+ };
+#endif
+ const char *s;
+ int indx;
-#define KWDOFFSET 14
-
-static const char *const parsekwd[] = {
- "!",
- "case",
- "do",
- "done",
- "elif",
- "else",
- "esac",
- "fi",
- "for",
- "if",
- "in",
- "then",
- "until",
- "while",
- "{",
- "}"
+ if (c == PEOF) /* 2^8+2 */
+ return CENDFILE;
+#ifdef BB_ASH_ALIAS
+ if (c == PEOA) /* 2^8+1 */
+ indx = 0;
+ else
+#endif
+ if (U_C(c) >= U_C(CTLESC) && U_C(c) <= U_C(CTLQUOTEMARK))
+ return CCTL;
+ else {
+ s = strchr(spec_symbls, c);
+ if (s == 0 || *s == 0)
+ return CWORD;
+ indx = syntax_index_table[(s - spec_symbls)];
+ }
+ return S_I_T[indx][syntax];
+}
+
+#else /* USE_SIT_FUNCTION */
+
+#define SIT(c, syntax) S_I_T[(int)syntax_index_table[((int)c)+SYNBASE]][syntax]
+
+#ifdef BB_ASH_ALIAS
+#define CSPCL_CIGN_CIGN_CIGN 0
+#define CSPCL_CWORD_CWORD_CWORD 1
+#define CNL_CNL_CNL_CNL 2
+#define CWORD_CCTL_CCTL_CWORD 3
+#define CDQUOTE_CENDQUOTE_CWORD_CWORD 4
+#define CVAR_CVAR_CWORD_CVAR 5
+#define CSQUOTE_CWORD_CENDQUOTE_CWORD 6
+#define CSPCL_CWORD_CWORD_CLP 7
+#define CSPCL_CWORD_CWORD_CRP 8
+#define CBACK_CBACK_CCTL_CBACK 9
+#define CBQUOTE_CBQUOTE_CWORD_CBQUOTE 10
+#define CENDVAR_CENDVAR_CWORD_CENDVAR 11
+#define CENDFILE_CENDFILE_CENDFILE_CENDFILE 12
+#define CWORD_CWORD_CWORD_CWORD 13
+#define CCTL_CCTL_CCTL_CCTL 14
+#else
+#define CSPCL_CWORD_CWORD_CWORD 0
+#define CNL_CNL_CNL_CNL 1
+#define CWORD_CCTL_CCTL_CWORD 2
+#define CDQUOTE_CENDQUOTE_CWORD_CWORD 3
+#define CVAR_CVAR_CWORD_CVAR 4
+#define CSQUOTE_CWORD_CENDQUOTE_CWORD 5
+#define CSPCL_CWORD_CWORD_CLP 6
+#define CSPCL_CWORD_CWORD_CRP 7
+#define CBACK_CBACK_CCTL_CBACK 8
+#define CBQUOTE_CBQUOTE_CWORD_CBQUOTE 9
+#define CENDVAR_CENDVAR_CWORD_CENDVAR 10
+#define CENDFILE_CENDFILE_CENDFILE_CENDFILE 11
+#define CWORD_CWORD_CWORD_CWORD 12
+#define CCTL_CCTL_CCTL_CCTL 13
+#endif
+
+static const char syntax_index_table[258] = {
+ /* BASESYNTAX_DQSYNTAX_SQSYNTAX_ARISYNTAX */
+ /* 0 PEOF */ CENDFILE_CENDFILE_CENDFILE_CENDFILE,
+#ifdef BB_ASH_ALIAS
+ /* 1 PEOA */ CSPCL_CIGN_CIGN_CIGN,
+#endif
+ /* 2 -128 0x80 */ CWORD_CWORD_CWORD_CWORD,
+ /* 3 -127 CTLESC */ CCTL_CCTL_CCTL_CCTL,
+ /* 4 -126 CTLVAR */ CCTL_CCTL_CCTL_CCTL,
+ /* 5 -125 CTLENDVAR */ CCTL_CCTL_CCTL_CCTL,
+ /* 6 -124 CTLBACKQ */ CCTL_CCTL_CCTL_CCTL,
+ /* 7 -123 CTLQUOTE */ CCTL_CCTL_CCTL_CCTL,
+ /* 8 -122 CTLARI */ CCTL_CCTL_CCTL_CCTL,
+ /* 9 -121 CTLENDARI */ CCTL_CCTL_CCTL_CCTL,
+ /* 10 -120 CTLQUOTEMARK */ CCTL_CCTL_CCTL_CCTL,
+ /* 11 -119 */ CWORD_CWORD_CWORD_CWORD,
+ /* 12 -118 */ CWORD_CWORD_CWORD_CWORD,
+ /* 13 -117 */ CWORD_CWORD_CWORD_CWORD,
+ /* 14 -116 */ CWORD_CWORD_CWORD_CWORD,
+ /* 15 -115 */ CWORD_CWORD_CWORD_CWORD,
+ /* 16 -114 */ CWORD_CWORD_CWORD_CWORD,
+ /* 17 -113 */ CWORD_CWORD_CWORD_CWORD,
+ /* 18 -112 */ CWORD_CWORD_CWORD_CWORD,
+ /* 19 -111 */ CWORD_CWORD_CWORD_CWORD,
+ /* 20 -110 */ CWORD_CWORD_CWORD_CWORD,
+ /* 21 -109 */ CWORD_CWORD_CWORD_CWORD,
+ /* 22 -108 */ CWORD_CWORD_CWORD_CWORD,
+ /* 23 -107 */ CWORD_CWORD_CWORD_CWORD,
+ /* 24 -106 */ CWORD_CWORD_CWORD_CWORD,
+ /* 25 -105 */ CWORD_CWORD_CWORD_CWORD,
+ /* 26 -104 */ CWORD_CWORD_CWORD_CWORD,
+ /* 27 -103 */ CWORD_CWORD_CWORD_CWORD,
+ /* 28 -102 */ CWORD_CWORD_CWORD_CWORD,
+ /* 29 -101 */ CWORD_CWORD_CWORD_CWORD,
+ /* 30 -100 */ CWORD_CWORD_CWORD_CWORD,
+ /* 31 -99 */ CWORD_CWORD_CWORD_CWORD,
+ /* 32 -98 */ CWORD_CWORD_CWORD_CWORD,
+ /* 33 -97 */ CWORD_CWORD_CWORD_CWORD,
+ /* 34 -96 */ CWORD_CWORD_CWORD_CWORD,
+ /* 35 -95 */ CWORD_CWORD_CWORD_CWORD,
+ /* 36 -94 */ CWORD_CWORD_CWORD_CWORD,
+ /* 37 -93 */ CWORD_CWORD_CWORD_CWORD,
+ /* 38 -92 */ CWORD_CWORD_CWORD_CWORD,
+ /* 39 -91 */ CWORD_CWORD_CWORD_CWORD,
+ /* 40 -90 */ CWORD_CWORD_CWORD_CWORD,
+ /* 41 -89 */ CWORD_CWORD_CWORD_CWORD,
+ /* 42 -88 */ CWORD_CWORD_CWORD_CWORD,
+ /* 43 -87 */ CWORD_CWORD_CWORD_CWORD,
+ /* 44 -86 */ CWORD_CWORD_CWORD_CWORD,
+ /* 45 -85 */ CWORD_CWORD_CWORD_CWORD,
+ /* 46 -84 */ CWORD_CWORD_CWORD_CWORD,
+ /* 47 -83 */ CWORD_CWORD_CWORD_CWORD,
+ /* 48 -82 */ CWORD_CWORD_CWORD_CWORD,
+ /* 49 -81 */ CWORD_CWORD_CWORD_CWORD,
+ /* 50 -80 */ CWORD_CWORD_CWORD_CWORD,
+ /* 51 -79 */ CWORD_CWORD_CWORD_CWORD,
+ /* 52 -78 */ CWORD_CWORD_CWORD_CWORD,
+ /* 53 -77 */ CWORD_CWORD_CWORD_CWORD,
+ /* 54 -76 */ CWORD_CWORD_CWORD_CWORD,
+ /* 55 -75 */ CWORD_CWORD_CWORD_CWORD,
+ /* 56 -74 */ CWORD_CWORD_CWORD_CWORD,
+ /* 57 -73 */ CWORD_CWORD_CWORD_CWORD,
+ /* 58 -72 */ CWORD_CWORD_CWORD_CWORD,
+ /* 59 -71 */ CWORD_CWORD_CWORD_CWORD,
+ /* 60 -70 */ CWORD_CWORD_CWORD_CWORD,
+ /* 61 -69 */ CWORD_CWORD_CWORD_CWORD,
+ /* 62 -68 */ CWORD_CWORD_CWORD_CWORD,
+ /* 63 -67 */ CWORD_CWORD_CWORD_CWORD,
+ /* 64 -66 */ CWORD_CWORD_CWORD_CWORD,
+ /* 65 -65 */ CWORD_CWORD_CWORD_CWORD,
+ /* 66 -64 */ CWORD_CWORD_CWORD_CWORD,
+ /* 67 -63 */ CWORD_CWORD_CWORD_CWORD,
+ /* 68 -62 */ CWORD_CWORD_CWORD_CWORD,
+ /* 69 -61 */ CWORD_CWORD_CWORD_CWORD,
+ /* 70 -60 */ CWORD_CWORD_CWORD_CWORD,
+ /* 71 -59 */ CWORD_CWORD_CWORD_CWORD,
+ /* 72 -58 */ CWORD_CWORD_CWORD_CWORD,
+ /* 73 -57 */ CWORD_CWORD_CWORD_CWORD,
+ /* 74 -56 */ CWORD_CWORD_CWORD_CWORD,
+ /* 75 -55 */ CWORD_CWORD_CWORD_CWORD,
+ /* 76 -54 */ CWORD_CWORD_CWORD_CWORD,
+ /* 77 -53 */ CWORD_CWORD_CWORD_CWORD,
+ /* 78 -52 */ CWORD_CWORD_CWORD_CWORD,
+ /* 79 -51 */ CWORD_CWORD_CWORD_CWORD,
+ /* 80 -50 */ CWORD_CWORD_CWORD_CWORD,
+ /* 81 -49 */ CWORD_CWORD_CWORD_CWORD,
+ /* 82 -48 */ CWORD_CWORD_CWORD_CWORD,
+ /* 83 -47 */ CWORD_CWORD_CWORD_CWORD,
+ /* 84 -46 */ CWORD_CWORD_CWORD_CWORD,
+ /* 85 -45 */ CWORD_CWORD_CWORD_CWORD,
+ /* 86 -44 */ CWORD_CWORD_CWORD_CWORD,
+ /* 87 -43 */ CWORD_CWORD_CWORD_CWORD,
+ /* 88 -42 */ CWORD_CWORD_CWORD_CWORD,
+ /* 89 -41 */ CWORD_CWORD_CWORD_CWORD,
+ /* 90 -40 */ CWORD_CWORD_CWORD_CWORD,
+ /* 91 -39 */ CWORD_CWORD_CWORD_CWORD,
+ /* 92 -38 */ CWORD_CWORD_CWORD_CWORD,
+ /* 93 -37 */ CWORD_CWORD_CWORD_CWORD,
+ /* 94 -36 */ CWORD_CWORD_CWORD_CWORD,
+ /* 95 -35 */ CWORD_CWORD_CWORD_CWORD,
+ /* 96 -34 */ CWORD_CWORD_CWORD_CWORD,
+ /* 97 -33 */ CWORD_CWORD_CWORD_CWORD,
+ /* 98 -32 */ CWORD_CWORD_CWORD_CWORD,
+ /* 99 -31 */ CWORD_CWORD_CWORD_CWORD,
+ /* 100 -30 */ CWORD_CWORD_CWORD_CWORD,
+ /* 101 -29 */ CWORD_CWORD_CWORD_CWORD,
+ /* 102 -28 */ CWORD_CWORD_CWORD_CWORD,
+ /* 103 -27 */ CWORD_CWORD_CWORD_CWORD,
+ /* 104 -26 */ CWORD_CWORD_CWORD_CWORD,
+ /* 105 -25 */ CWORD_CWORD_CWORD_CWORD,
+ /* 106 -24 */ CWORD_CWORD_CWORD_CWORD,
+ /* 107 -23 */ CWORD_CWORD_CWORD_CWORD,
+ /* 108 -22 */ CWORD_CWORD_CWORD_CWORD,
+ /* 109 -21 */ CWORD_CWORD_CWORD_CWORD,
+ /* 110 -20 */ CWORD_CWORD_CWORD_CWORD,
+ /* 111 -19 */ CWORD_CWORD_CWORD_CWORD,
+ /* 112 -18 */ CWORD_CWORD_CWORD_CWORD,
+ /* 113 -17 */ CWORD_CWORD_CWORD_CWORD,
+ /* 114 -16 */ CWORD_CWORD_CWORD_CWORD,
+ /* 115 -15 */ CWORD_CWORD_CWORD_CWORD,
+ /* 116 -14 */ CWORD_CWORD_CWORD_CWORD,
+ /* 117 -13 */ CWORD_CWORD_CWORD_CWORD,
+ /* 118 -12 */ CWORD_CWORD_CWORD_CWORD,
+ /* 119 -11 */ CWORD_CWORD_CWORD_CWORD,
+ /* 120 -10 */ CWORD_CWORD_CWORD_CWORD,
+ /* 121 -9 */ CWORD_CWORD_CWORD_CWORD,
+ /* 122 -8 */ CWORD_CWORD_CWORD_CWORD,
+ /* 123 -7 */ CWORD_CWORD_CWORD_CWORD,
+ /* 124 -6 */ CWORD_CWORD_CWORD_CWORD,
+ /* 125 -5 */ CWORD_CWORD_CWORD_CWORD,
+ /* 126 -4 */ CWORD_CWORD_CWORD_CWORD,
+ /* 127 -3 */ CWORD_CWORD_CWORD_CWORD,
+ /* 128 -2 */ CWORD_CWORD_CWORD_CWORD,
+ /* 129 -1 */ CWORD_CWORD_CWORD_CWORD,
+ /* 130 0 */ CWORD_CWORD_CWORD_CWORD,
+ /* 131 1 */ CWORD_CWORD_CWORD_CWORD,
+ /* 132 2 */ CWORD_CWORD_CWORD_CWORD,
+ /* 133 3 */ CWORD_CWORD_CWORD_CWORD,
+ /* 134 4 */ CWORD_CWORD_CWORD_CWORD,
+ /* 135 5 */ CWORD_CWORD_CWORD_CWORD,
+ /* 136 6 */ CWORD_CWORD_CWORD_CWORD,
+ /* 137 7 */ CWORD_CWORD_CWORD_CWORD,
+ /* 138 8 */ CWORD_CWORD_CWORD_CWORD,
+ /* 139 9 "\t" */ CSPCL_CWORD_CWORD_CWORD,
+ /* 140 10 "\n" */ CNL_CNL_CNL_CNL,
+ /* 141 11 */ CWORD_CWORD_CWORD_CWORD,
+ /* 142 12 */ CWORD_CWORD_CWORD_CWORD,
+ /* 143 13 */ CWORD_CWORD_CWORD_CWORD,
+ /* 144 14 */ CWORD_CWORD_CWORD_CWORD,
+ /* 145 15 */ CWORD_CWORD_CWORD_CWORD,
+ /* 146 16 */ CWORD_CWORD_CWORD_CWORD,
+ /* 147 17 */ CWORD_CWORD_CWORD_CWORD,
+ /* 148 18 */ CWORD_CWORD_CWORD_CWORD,
+ /* 149 19 */ CWORD_CWORD_CWORD_CWORD,
+ /* 150 20 */ CWORD_CWORD_CWORD_CWORD,
+ /* 151 21 */ CWORD_CWORD_CWORD_CWORD,
+ /* 152 22 */ CWORD_CWORD_CWORD_CWORD,
+ /* 153 23 */ CWORD_CWORD_CWORD_CWORD,
+ /* 154 24 */ CWORD_CWORD_CWORD_CWORD,
+ /* 155 25 */ CWORD_CWORD_CWORD_CWORD,
+ /* 156 26 */ CWORD_CWORD_CWORD_CWORD,
+ /* 157 27 */ CWORD_CWORD_CWORD_CWORD,
+ /* 158 28 */ CWORD_CWORD_CWORD_CWORD,
+ /* 159 29 */ CWORD_CWORD_CWORD_CWORD,
+ /* 160 30 */ CWORD_CWORD_CWORD_CWORD,
+ /* 161 31 */ CWORD_CWORD_CWORD_CWORD,
+ /* 162 32 " " */ CSPCL_CWORD_CWORD_CWORD,
+ /* 163 33 "!" */ CWORD_CCTL_CCTL_CWORD,
+ /* 164 34 """ */ CDQUOTE_CENDQUOTE_CWORD_CWORD,
+ /* 165 35 "#" */ CWORD_CWORD_CWORD_CWORD,
+ /* 166 36 "$" */ CVAR_CVAR_CWORD_CVAR,
+ /* 167 37 "%" */ CWORD_CWORD_CWORD_CWORD,
+ /* 168 38 "&" */ CSPCL_CWORD_CWORD_CWORD,
+ /* 169 39 "'" */ CSQUOTE_CWORD_CENDQUOTE_CWORD,
+ /* 170 40 "(" */ CSPCL_CWORD_CWORD_CLP,
+ /* 171 41 ")" */ CSPCL_CWORD_CWORD_CRP,
+ /* 172 42 "*" */ CWORD_CCTL_CCTL_CWORD,
+ /* 173 43 "+" */ CWORD_CWORD_CWORD_CWORD,
+ /* 174 44 "," */ CWORD_CWORD_CWORD_CWORD,
+ /* 175 45 "-" */ CWORD_CCTL_CCTL_CWORD,
+ /* 176 46 "." */ CWORD_CWORD_CWORD_CWORD,
+ /* 177 47 "/" */ CWORD_CCTL_CCTL_CWORD,
+ /* 178 48 "0" */ CWORD_CWORD_CWORD_CWORD,
+ /* 179 49 "1" */ CWORD_CWORD_CWORD_CWORD,
+ /* 180 50 "2" */ CWORD_CWORD_CWORD_CWORD,
+ /* 181 51 "3" */ CWORD_CWORD_CWORD_CWORD,
+ /* 182 52 "4" */ CWORD_CWORD_CWORD_CWORD,
+ /* 183 53 "5" */ CWORD_CWORD_CWORD_CWORD,
+ /* 184 54 "6" */ CWORD_CWORD_CWORD_CWORD,
+ /* 185 55 "7" */ CWORD_CWORD_CWORD_CWORD,
+ /* 186 56 "8" */ CWORD_CWORD_CWORD_CWORD,
+ /* 187 57 "9" */ CWORD_CWORD_CWORD_CWORD,
+ /* 188 58 ":" */ CWORD_CCTL_CCTL_CWORD,
+ /* 189 59 ";" */ CSPCL_CWORD_CWORD_CWORD,
+ /* 190 60 "<" */ CSPCL_CWORD_CWORD_CWORD,
+ /* 191 61 "=" */ CWORD_CCTL_CCTL_CWORD,
+ /* 192 62 ">" */ CSPCL_CWORD_CWORD_CWORD,
+ /* 193 63 "?" */ CWORD_CCTL_CCTL_CWORD,
+ /* 194 64 "@" */ CWORD_CWORD_CWORD_CWORD,
+ /* 195 65 "A" */ CWORD_CWORD_CWORD_CWORD,
+ /* 196 66 "B" */ CWORD_CWORD_CWORD_CWORD,
+ /* 197 67 "C" */ CWORD_CWORD_CWORD_CWORD,
+ /* 198 68 "D" */ CWORD_CWORD_CWORD_CWORD,
+ /* 199 69 "E" */ CWORD_CWORD_CWORD_CWORD,
+ /* 200 70 "F" */ CWORD_CWORD_CWORD_CWORD,
+ /* 201 71 "G" */ CWORD_CWORD_CWORD_CWORD,
+ /* 202 72 "H" */ CWORD_CWORD_CWORD_CWORD,
+ /* 203 73 "I" */ CWORD_CWORD_CWORD_CWORD,
+ /* 204 74 "J" */ CWORD_CWORD_CWORD_CWORD,
+ /* 205 75 "K" */ CWORD_CWORD_CWORD_CWORD,
+ /* 206 76 "L" */ CWORD_CWORD_CWORD_CWORD,
+ /* 207 77 "M" */ CWORD_CWORD_CWORD_CWORD,
+ /* 208 78 "N" */ CWORD_CWORD_CWORD_CWORD,
+ /* 209 79 "O" */ CWORD_CWORD_CWORD_CWORD,
+ /* 210 80 "P" */ CWORD_CWORD_CWORD_CWORD,
+ /* 211 81 "Q" */ CWORD_CWORD_CWORD_CWORD,
+ /* 212 82 "R" */ CWORD_CWORD_CWORD_CWORD,
+ /* 213 83 "S" */ CWORD_CWORD_CWORD_CWORD,
+ /* 214 84 "T" */ CWORD_CWORD_CWORD_CWORD,
+ /* 215 85 "U" */ CWORD_CWORD_CWORD_CWORD,
+ /* 216 86 "V" */ CWORD_CWORD_CWORD_CWORD,
+ /* 217 87 "W" */ CWORD_CWORD_CWORD_CWORD,
+ /* 218 88 "X" */ CWORD_CWORD_CWORD_CWORD,
+ /* 219 89 "Y" */ CWORD_CWORD_CWORD_CWORD,
+ /* 220 90 "Z" */ CWORD_CWORD_CWORD_CWORD,
+ /* 221 91 "[" */ CWORD_CCTL_CCTL_CWORD,
+ /* 222 92 "\" */ CBACK_CBACK_CCTL_CBACK,
+ /* 223 93 "]" */ CWORD_CCTL_CCTL_CWORD,
+ /* 224 94 "^" */ CWORD_CWORD_CWORD_CWORD,
+ /* 225 95 "_" */ CWORD_CWORD_CWORD_CWORD,
+ /* 226 96 "`" */ CBQUOTE_CBQUOTE_CWORD_CBQUOTE,
+ /* 227 97 "a" */ CWORD_CWORD_CWORD_CWORD,
+ /* 228 98 "b" */ CWORD_CWORD_CWORD_CWORD,
+ /* 229 99 "c" */ CWORD_CWORD_CWORD_CWORD,
+ /* 230 100 "d" */ CWORD_CWORD_CWORD_CWORD,
+ /* 231 101 "e" */ CWORD_CWORD_CWORD_CWORD,
+ /* 232 102 "f" */ CWORD_CWORD_CWORD_CWORD,
+ /* 233 103 "g" */ CWORD_CWORD_CWORD_CWORD,
+ /* 234 104 "h" */ CWORD_CWORD_CWORD_CWORD,
+ /* 235 105 "i" */ CWORD_CWORD_CWORD_CWORD,
+ /* 236 106 "j" */ CWORD_CWORD_CWORD_CWORD,
+ /* 237 107 "k" */ CWORD_CWORD_CWORD_CWORD,
+ /* 238 108 "l" */ CWORD_CWORD_CWORD_CWORD,
+ /* 239 109 "m" */ CWORD_CWORD_CWORD_CWORD,
+ /* 240 110 "n" */ CWORD_CWORD_CWORD_CWORD,
+ /* 241 111 "o" */ CWORD_CWORD_CWORD_CWORD,
+ /* 242 112 "p" */ CWORD_CWORD_CWORD_CWORD,
+ /* 243 113 "q" */ CWORD_CWORD_CWORD_CWORD,
+ /* 244 114 "r" */ CWORD_CWORD_CWORD_CWORD,
+ /* 245 115 "s" */ CWORD_CWORD_CWORD_CWORD,
+ /* 246 116 "t" */ CWORD_CWORD_CWORD_CWORD,
+ /* 247 117 "u" */ CWORD_CWORD_CWORD_CWORD,
+ /* 248 118 "v" */ CWORD_CWORD_CWORD_CWORD,
+ /* 249 119 "w" */ CWORD_CWORD_CWORD_CWORD,
+ /* 250 120 "x" */ CWORD_CWORD_CWORD_CWORD,
+ /* 251 121 "y" */ CWORD_CWORD_CWORD_CWORD,
+ /* 252 122 "z" */ CWORD_CWORD_CWORD_CWORD,
+ /* 253 123 "{" */ CWORD_CWORD_CWORD_CWORD,
+ /* 254 124 "|" */ CSPCL_CWORD_CWORD_CWORD,
+ /* 255 125 "}" */ CENDVAR_CENDVAR_CWORD_CENDVAR,
+ /* 256 126 "~" */ CWORD_CCTL_CCTL_CWORD,
+ /* 257 127 */ CWORD_CWORD_CWORD_CWORD,
};
+#endif /* USE_SIT_FUNCTION */
-static int plinno = 1; /* input line number */
+/* $NetBSD: alias.c,v 1.11 2002/11/24 22:35:38 christos Exp $ */
-static int parselleft; /* copy of parsefile->lleft */
-static struct parsefile basepf; /* top level input file */
-static char basebuf[BUFSIZ]; /* buffer for top level input file */
-static struct parsefile *parsefile = &basepf; /* current input file */
+#define ATABSIZE 39
-/*
- * NEOF is returned by parsecmd when it encounters an end of file. It
- * must be distinct from NULL, so we use the address of a variable that
- * happens to be handy.
- */
+static int funcblocksize; /* size of structures in function */
+static int funcstringsize; /* size of strings in node */
+static pointer funcblock; /* block to allocate function from */
+static char *funcstring; /* block to allocate strings from */
+
+static const short nodesize[26] = {
+ SHELL_ALIGN(sizeof (struct ncmd)),
+ SHELL_ALIGN(sizeof (struct npipe)),
+ SHELL_ALIGN(sizeof (struct nredir)),
+ SHELL_ALIGN(sizeof (struct nredir)),
+ SHELL_ALIGN(sizeof (struct nredir)),
+ SHELL_ALIGN(sizeof (struct nbinary)),
+ SHELL_ALIGN(sizeof (struct nbinary)),
+ SHELL_ALIGN(sizeof (struct nbinary)),
+ SHELL_ALIGN(sizeof (struct nif)),
+ SHELL_ALIGN(sizeof (struct nbinary)),
+ SHELL_ALIGN(sizeof (struct nbinary)),
+ SHELL_ALIGN(sizeof (struct nfor)),
+ SHELL_ALIGN(sizeof (struct ncase)),
+ SHELL_ALIGN(sizeof (struct nclist)),
+ SHELL_ALIGN(sizeof (struct narg)),
+ SHELL_ALIGN(sizeof (struct narg)),
+ SHELL_ALIGN(sizeof (struct nfile)),
+ SHELL_ALIGN(sizeof (struct nfile)),
+ SHELL_ALIGN(sizeof (struct nfile)),
+ SHELL_ALIGN(sizeof (struct nfile)),
+ SHELL_ALIGN(sizeof (struct nfile)),
+ SHELL_ALIGN(sizeof (struct ndup)),
+ SHELL_ALIGN(sizeof (struct ndup)),
+ SHELL_ALIGN(sizeof (struct nhere)),
+ SHELL_ALIGN(sizeof (struct nhere)),
+ SHELL_ALIGN(sizeof (struct nnot)),
+};
-static int tokpushback; /* last token pushed back */
-#define NEOF ((union node *)&tokpushback)
-static int checkkwd; /* 1 == check for kwds, 2 == also eat newlines */
+static void calcsize(union node *);
+static void sizenodelist(struct nodelist *);
+static union node *copynode(union node *);
+static struct nodelist *copynodelist(struct nodelist *);
+static char *nodesavestr(char *);
-static void error (const char *, ...) __attribute__((__noreturn__));
-static void exerror (int, const char *, ...) __attribute__((__noreturn__));
-static void shellexec (char **, char **, const char *, int)
- __attribute__((noreturn));
-static void exitshell (int) __attribute__((noreturn));
-static int goodname(const char *);
-static void ignoresig (int);
-static void onsig (int);
-static void dotrap (void);
-static int decode_signal (const char *, int);
-static void shprocvar(void);
-static void deletefuncs(void);
-static void setparam (char **);
-static void freeparam (volatile struct shparam *);
+static void evalstring(char *, int);
+union node; /* BLETCH for ansi C */
+static void evaltree(union node *, int);
+static void evalbackcmd(union node *, struct backcmd *);
+
+/* in_function returns nonzero if we are currently evaluating a function */
+#define in_function() funcnest
+static int evalskip; /* set if we are skipping commands */
+static int skipcount; /* number of levels to skip */
+static int funcnest; /* depth of function calls */
/* reasons for skipping commands (see comment on breakcmd routine) */
#define SKIPBREAK 1
@@ -1174,16 +1263,225 @@ static void freeparam (volatile struct shparam *);
#define SKIPFUNC 3
#define SKIPFILE 4
+/*
+ * This file was generated by the mkbuiltins program.
+ */
+
+#ifdef JOBS
+static int bgcmd(int, char **);
+#endif
+static int breakcmd(int, char **);
+static int cdcmd(int, char **);
+#ifdef BB_ASH_CMDCMD
+static int commandcmd(int, char **);
+#endif
+static int dotcmd(int, char **);
+static int evalcmd(int, char **);
+static int execcmd(int, char **);
+static int exitcmd(int, char **);
+static int exportcmd(int, char **);
+static int falsecmd(int, char **);
+#ifdef JOBS
+static int fgcmd(int, char **);
+#endif
+#ifdef BB_ASH_GETOPTS
+static int getoptscmd(int, char **);
+#endif
+static int hashcmd(int, char **);
+#ifndef BB_FEATURE_SH_EXTRA_QUIET
+static int helpcmd(int argc, char **argv);
+#endif
+#ifdef JOBS
+static int jobscmd(int, char **);
+#endif
+#ifdef BB_ASH_MATH_SUPPORT
+static int letcmd(int, char **);
+#endif
+static int localcmd(int, char **);
+static int pwdcmd(int, char **);
+static int readcmd(int, char **);
+static int returncmd(int, char **);
+static int setcmd(int, char **);
+static int shiftcmd(int, char **);
+static int timescmd(int, char **);
+static int trapcmd(int, char **);
+static int truecmd(int, char **);
+static int typecmd(int, char **);
+static int umaskcmd(int, char **);
+static int unsetcmd(int, char **);
+static int waitcmd(int, char **);
+static int ulimitcmd(int, char **);
+#ifdef JOBS
+static int killcmd(int, char **);
+#endif
+
+/* $NetBSD: mail.h,v 1.9 2002/11/24 22:35:40 christos Exp $ */
+
+#ifdef BB_ASH_MAIL
+static void chkmail(void);
+static void changemail(const char *);
+#endif
+
+/* $NetBSD: exec.h,v 1.20 2003/01/22 20:36:04 dsl Exp $ */
+
/* values of cmdtype */
-#define CMDUNKNOWN -1 /* no entry in table for command */
-#define CMDNORMAL 0 /* command is an executable program */
-#define CMDBUILTIN 1 /* command is a shell builtin */
-#define CMDFUNCTION 2 /* command is a shell function */
+#define CMDUNKNOWN -1 /* no entry in table for command */
+#define CMDNORMAL 0 /* command is an executable program */
+#define CMDFUNCTION 1 /* command is a shell function */
+#define CMDBUILTIN 2 /* command is a shell builtin */
+
+struct builtincmd {
+ const char *name;
+ int (*builtin)(int, char **);
+ /* unsigned flags; */
+};
+
+#ifdef BB_ASH_CMDCMD
+# ifdef JOBS
+# ifdef BB_ASH_ALIAS
+# define COMMANDCMD (builtincmd + 7)
+# define EXECCMD (builtincmd + 10)
+# else
+# define COMMANDCMD (builtincmd + 6)
+# define EXECCMD (builtincmd + 9)
+# endif
+# else /* ! JOBS */
+# ifdef BB_ASH_ALIAS
+# define COMMANDCMD (builtincmd + 6)
+# define EXECCMD (builtincmd + 9)
+# else
+# define COMMANDCMD (builtincmd + 5)
+# define EXECCMD (builtincmd + 8)
+# endif
+# endif /* JOBS */
+#else /* ! BB_ASH_CMDCMD */
+# ifdef JOBS
+# ifdef BB_ASH_ALIAS
+# define EXECCMD (builtincmd + 9)
+# else
+# define EXECCMD (builtincmd + 8)
+# endif
+# else /* ! JOBS */
+# ifdef BB_ASH_ALIAS
+# define EXECCMD (builtincmd + 8)
+# else
+# define EXECCMD (builtincmd + 7)
+# endif
+# endif /* JOBS */
+#endif /* BB_ASH_CMDCMD */
+
+#define BUILTIN_NOSPEC "0"
+#define BUILTIN_SPECIAL "1"
+#define BUILTIN_REGULAR "2"
+#define BUILTIN_SPEC_REG "3"
+#define BUILTIN_ASSIGN "4"
+#define BUILTIN_SPEC_ASSG "5"
+#define BUILTIN_REG_ASSG "6"
+#define BUILTIN_SPEC_REG_ASSG "7"
-#define DO_ERR 1 /* find_command prints errors */
-#define DO_ABS 2 /* find_command checks absolute paths */
-#define DO_NOFUN 4 /* find_command ignores functions */
-#define DO_BRUTE 8 /* find_command ignores hash table */
+#define IS_BUILTIN_SPECIAL(builtincmd) ((builtincmd)->name[0] & 1)
+#define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2)
+
+static const struct builtincmd builtincmd[] = {
+ { BUILTIN_SPEC_REG ".", dotcmd },
+ { BUILTIN_SPEC_REG ":", truecmd },
+#ifdef BB_ASH_ALIAS
+ { BUILTIN_REG_ASSG "alias", aliascmd },
+#endif
+#ifdef JOBS
+ { BUILTIN_REGULAR "bg", bgcmd },
+#endif
+ { BUILTIN_SPEC_REG "break", breakcmd },
+ { BUILTIN_REGULAR "cd", cdcmd },
+ { BUILTIN_NOSPEC "chdir", cdcmd },
+#ifdef BB_ASH_CMDCMD
+ { BUILTIN_REGULAR "command", commandcmd },
+#endif
+ { BUILTIN_SPEC_REG "continue", breakcmd },
+ { BUILTIN_SPEC_REG "eval", evalcmd },
+ { BUILTIN_SPEC_REG "exec", execcmd },
+ { BUILTIN_SPEC_REG "exit", exitcmd },
+ { BUILTIN_SPEC_REG_ASSG "export", exportcmd },
+ { BUILTIN_REGULAR "false", falsecmd },
+#ifdef JOBS
+ { BUILTIN_REGULAR "fg", fgcmd },
+#endif
+#ifdef BB_ASH_GETOPTS
+ { BUILTIN_REGULAR "getopts", getoptscmd },
+#endif
+ { BUILTIN_NOSPEC "hash", hashcmd },
+#ifndef BB_FEATURE_SH_EXTRA_QUIET
+ { BUILTIN_NOSPEC "help", helpcmd },
+#endif
+#ifdef JOBS
+ { BUILTIN_REGULAR "jobs", jobscmd },
+ { BUILTIN_REGULAR "kill", killcmd },
+#endif
+#ifdef BB_ASH_MATH_SUPPORT
+ { BUILTIN_NOSPEC "let", letcmd },
+#endif
+ { BUILTIN_ASSIGN "local", localcmd },
+ { BUILTIN_NOSPEC "pwd", pwdcmd },
+ { BUILTIN_REGULAR "read", readcmd },
+ { BUILTIN_SPEC_REG_ASSG "readonly", exportcmd },
+ { BUILTIN_SPEC_REG "return", returncmd },
+ { BUILTIN_SPEC_REG "set", setcmd },
+ { BUILTIN_SPEC_REG "shift", shiftcmd },
+ { BUILTIN_SPEC_REG "times", timescmd },
+ { BUILTIN_SPEC_REG "trap", trapcmd },
+ { BUILTIN_REGULAR "true", truecmd },
+ { BUILTIN_NOSPEC "type", typecmd },
+ { BUILTIN_NOSPEC "ulimit", ulimitcmd },
+ { BUILTIN_REGULAR "umask", umaskcmd },
+#ifdef BB_ASH_ALIAS
+ { BUILTIN_REGULAR "unalias", unaliascmd },
+#endif
+ { BUILTIN_SPEC_REG "unset", unsetcmd },
+ { BUILTIN_REGULAR "wait", waitcmd },
+};
+
+#define NUMBUILTINS (sizeof (builtincmd) / sizeof (struct builtincmd) )
+
+
+
+struct cmdentry {
+ int cmdtype;
+ union param {
+ int index;
+ const struct builtincmd *cmd;
+ struct funcnode *func;
+ } u;
+};
+
+
+/* action to find_command() */
+#define DO_ERR 0x01 /* prints errors */
+#define DO_ABS 0x02 /* checks absolute paths */
+#define DO_NOFUNC 0x04 /* don't return shell functions, for command */
+#define DO_ALTPATH 0x08 /* using alternate path */
+#define DO_ALTBLTIN 0x20 /* %builtin in alt. path */
+
+static const char *pathopt; /* set by padvance */
+
+static void shellexec(char **, const char *, int)
+ __attribute__((__noreturn__));
+static char *padvance(const char **, const char *);
+static void find_command(char *, struct cmdentry *, int, const char *);
+static struct builtincmd *find_builtin(const char *);
+static void hashcd(void);
+static void changepath(const char *);
+static void defun(char *, union node *);
+static void unsetfunc(const char *);
+
+#ifdef BB_ASH_MATH_SUPPORT
+static int dash_arith(const char *);
+#endif
+
+/* $NetBSD: init.h,v 1.9 2002/11/24 22:35:40 christos Exp $ */
+
+static void reset(void);
+
+/* $NetBSD: var.h,v 1.21 2003/01/22 20:36:04 dsl Exp $ */
/*
* Shell variables.
@@ -1192,18 +1490,20 @@ static void freeparam (volatile struct shparam *);
/* flags */
#define VEXPORT 0x01 /* variable is exported */
#define VREADONLY 0x02 /* variable cannot be modified */
-#define VSTRFIXED 0x04 /* variable struct is staticly allocated */
-#define VTEXTFIXED 0x08 /* text is staticly allocated */
+#define VSTRFIXED 0x04 /* variable struct is statically allocated */
+#define VTEXTFIXED 0x08 /* text is statically allocated */
#define VSTACK 0x10 /* text is allocated on the stack */
#define VUNSET 0x20 /* the variable is not set */
#define VNOFUNC 0x40 /* don't call the callback function */
+#define VNOSET 0x80 /* do not set variable - just readonly test */
+#define VNOSAVE 0x100 /* when text is on the heap before setvareq */
struct var {
struct var *next; /* next entry in hash list */
int flags; /* flags are defined above */
- char *text; /* name=value */
- void (*func) (const char *);
+ const char *text; /* name=value */
+ void (*func)(const char *);
/* function to be called when */
/* the variable gets set/unset */
};
@@ -1212,71 +1512,29 @@ struct localvar {
struct localvar *next; /* next local variable in list */
struct var *vp; /* the variable that was made local */
int flags; /* saved flags */
- char *text; /* saved text */
+ const char *text; /* saved text */
};
-#if defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN)
-#define rmescapes(p) _rmescapes((p), 0)
-static char *_rmescapes (char *, int);
-#else
-static void rmescapes (char *);
-#endif
-
-static int casematch (union node *, const char *);
-static void clearredir(void);
-static void popstring(void);
-static void readcmdfile (const char *);
-
-static int number (const char *);
-static int is_number (const char *, int *num);
-static char *single_quote (const char *);
-static int nextopt (const char *);
-
-static void redirect (union node *, int);
-static void popredir (void);
-static int dup_as_newfd (int, int);
-
-static void changepath(const char *newval);
-static void getoptsreset(const char *value);
-
-
-static int parsenleft; /* copy of parsefile->nleft */
-static char *parsenextc; /* copy of parsefile->nextc */
-static int rootpid; /* pid of main shell */
-static int rootshell; /* true if we aren't a child of the main shell */
-
-static const char spcstr[] = " ";
-static const char snlfmt[] = "%s\n";
+static struct localvar *localvars;
-static int sstrnleft;
-static int herefd = -1;
+/*
+ * Shell variables.
+ */
-static struct localvar *localvars;
+#ifdef BB_ASH_GETOPTS
+static void getoptsreset(const char *);
+#endif
-static struct var vifs;
-static struct var vmail;
-static struct var vmpath;
-static struct var vpath;
-static struct var vps1;
-static struct var vps2;
-static struct var voptind;
#ifdef BB_LOCALE_SUPPORT
-static struct var vlc_all;
-static struct var vlc_ctype;
+#include <locale.h>
+static void change_lc_all(const char *value);
+static void change_lc_ctype(const char *value);
#endif
-struct varinit {
- struct var *var;
- int flags;
- const char *text;
- void (*func) (const char *);
-};
-
-static const char defpathvar[] =
- "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
-#define defpath (defpathvar + 5)
+#define VTABSIZE 39
+static const char defpathvar[] = "PATH=/usr/local/bin:/usr/bin:/sbin:/bin";
#ifdef IFS_BROKEN
static const char defifsvar[] = "IFS= \t\n";
#define defifs (defifsvar + 4)
@@ -1284,39 +1542,49 @@ static const char defifsvar[] = "IFS= \t\n";
static const char defifs[] = " \t\n";
#endif
-static const struct varinit varinit[] = {
+
+static struct var varinit[] = {
#ifdef IFS_BROKEN
- { &vifs, VSTRFIXED|VTEXTFIXED, defifsvar,
+ { 0, VSTRFIXED|VTEXTFIXED, defifsvar, 0 },
#else
- { &vifs, VSTRFIXED|VTEXTFIXED|VUNSET, "IFS=",
-#endif
- NULL },
- { &vmail, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL=",
- NULL },
- { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=",
- NULL },
- { &vpath, VSTRFIXED|VTEXTFIXED, defpathvar,
- changepath },
- /*
- * vps1 depends on uid
- */
- { &vps2, VSTRFIXED|VTEXTFIXED, "PS2=> ",
- NULL },
- { &voptind, VSTRFIXED|VTEXTFIXED, "OPTIND=1",
- getoptsreset },
+ { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "IFS\0", 0 },
+#endif
+
+#ifdef BB_ASH_MAIL
+ { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL\0", changemail },
+ { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH\0", changemail },
+#endif
+
+ { 0, VSTRFIXED|VTEXTFIXED, defpathvar, changepath },
+ { 0, VSTRFIXED|VTEXTFIXED, "PS1=$ ", 0 },
+ { 0, VSTRFIXED|VTEXTFIXED, "PS2=> ", 0 },
+ { 0, VSTRFIXED|VTEXTFIXED, "PS4=+ ", 0 },
+#ifdef BB_ASH_GETOPTS
+ { 0, VSTRFIXED|VTEXTFIXED, "OPTIND=1", getoptsreset },
+#endif
#ifdef BB_LOCALE_SUPPORT
- { &vlc_all, VSTRFIXED|VTEXTFIXED|VUNSET, "LC_ALL=",
- change_lc_all },
- { &vlc_ctype, VSTRFIXED|VTEXTFIXED|VUNSET, "LC_CTYPE=",
- change_lc_ctype },
+ {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_ALL=", change_lc_all},
+ {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_CTYPE=", change_lc_ctype},
+#endif
+#ifdef BB_FEATURE_COMMAND_SAVEHISTORY
+ {0, VSTRFIXED | VTEXTFIXED | VUNSET, "HISTFILE=", NULL},
#endif
- { NULL, 0, NULL,
- NULL }
};
-#define VTABSIZE 39
+#define vifs varinit[0]
+#ifdef BB_ASH_MAIL
+#define vmail (&vifs)[1]
+#define vmpath (&vmail)[1]
+#else
+#define vmpath vifs
+#endif
+#define vpath (&vmpath)[1]
+#define vps1 (&vpath)[1]
+#define vps2 (&vps1)[1]
+#define vps4 (&vps2)[1]
+#define voptind (&vps4)[1]
-static struct var *vartab[VTABSIZE];
+#define defpath (defpathvar + 5)
/*
* The following macros access the values of the above variables.
@@ -1331,56 +1599,503 @@ static struct var *vartab[VTABSIZE];
#define pathval() (vpath.text + 5)
#define ps1val() (vps1.text + 4)
#define ps2val() (vps2.text + 4)
+#define ps4val() (vps4.text + 4)
#define optindval() (voptind.text + 7)
#define mpathset() ((vmpath.flags & VUNSET) == 0)
-static void initvar (void);
-static void setvar (const char *, const char *, int);
-static void setvareq (char *, int);
-static void listsetvar (struct strlist *);
-static const char *lookupvar (const char *);
-static const char *bltinlookup (const char *);
-static char **environment (void);
-static int showvarscmd (int, char **);
-static void mklocal (char *);
-static void poplocalvars (void);
-static int unsetvar (const char *);
-static int varequal (const char *, const char *);
+static void setvar(const char *, const char *, int);
+static void setvareq(char *, int);
+static void listsetvar(struct strlist *, int);
+static char *lookupvar(const char *);
+static char *bltinlookup(const char *);
+static char **listvars(int, int, char ***);
+#define environment() listvars(VEXPORT, VUNSET, 0)
+static int showvars(const char *, int, int);
+static void poplocalvars(void);
+static int unsetvar(const char *);
+#ifdef BB_ASH_GETOPTS
+static int setvarsafe(const char *, const char *, int);
+#endif
+static int varcmp(const char *, const char *);
+static struct var **hashvar(const char *);
-static char *arg0; /* value of $0 */
-static struct shparam shellparam; /* current positional parameters */
-static char **argptr; /* argument list for builtin commands */
-static char *optionarg; /* set by nextopt (like getopt) */
-static char *optptr; /* used by nextopt */
-static char *minusc; /* argument to -c option */
+static inline int varequal(const char *a, const char *b) {
+ return !varcmp(a, b);
+}
-#ifdef ASH_ALIAS
+static int loopnest; /* current loop nesting level */
-#define ALIASINUSE 1
-#define ALIASDEAD 2
+/*
+ * The parsefile structure pointed to by the global variable parsefile
+ * contains information about the current file being read.
+ */
-#define ATABSIZE 39
-struct alias {
- struct alias *next;
- char *name;
- char *val;
- int flag;
+struct redirtab {
+ struct redirtab *next;
+ int renamed[10];
+ int nullredirs;
+};
+
+static struct redirtab *redirlist;
+static int nullredirs;
+
+extern char **environ;
+
+/* $NetBSD: output.h,v 1.16 2002/11/24 22:35:42 christos Exp $ */
+
+
+static void outstr(const char *, FILE *);
+static void outcslow(int, FILE *);
+static void flushall(void);
+static void flushout(FILE *);
+static int out1fmt(const char *, ...)
+ __attribute__((__format__(__printf__,1,2)));
+static int fmtstr(char *, size_t, const char *, ...)
+ __attribute__((__format__(__printf__,3,4)));
+static void xwrite(int, const void *, size_t);
+
+static int preverrout_fd; /* save fd2 before print debug if xflag is set. */
+
+
+static void out1str(const char *p)
+{
+ outstr(p, stdout);
+}
+
+static void out2str(const char *p)
+{
+ outstr(p, stderr);
+ flushout(stderr);
+}
+
+/*
+ * Initialization code.
+ */
+
+/*
+ * This routine initializes the builtin variables.
+ */
+
+static inline void
+initvar(void)
+{
+ struct var *vp;
+ struct var *end;
+ struct var **vpp;
+
+ /*
+ * PS1 depends on uid
+ */
+#if defined(BB_FEATURE_COMMAND_EDITING) && defined(BB_FEATURE_SH_FANCY_PROMPT)
+ vps1.text = "PS1=\\w \\$ ";
+#else
+ if (!geteuid())
+ vps1.text = "PS1=# ";
+#endif
+ vp = varinit;
+ end = vp + sizeof(varinit) / sizeof(varinit[0]);
+ do {
+ vpp = hashvar(vp->text);
+ vp->next = *vpp;
+ *vpp = vp;
+ } while (++vp < end);
+}
+
+static inline void
+init(void)
+{
+
+ /* from input.c: */
+ {
+ basepf.nextc = basepf.buf = basebuf;
+ }
+
+ /* from trap.c: */
+ {
+ signal(SIGCHLD, SIG_DFL);
+ }
+
+ /* from var.c: */
+ {
+ char **envp;
+ char ppid[32];
+
+ initvar();
+ for (envp = environ ; *envp ; envp++) {
+ if (strchr(*envp, '=')) {
+ setvareq(*envp, VEXPORT|VTEXTFIXED);
+ }
+ }
+
+ snprintf(ppid, sizeof(ppid), "%d", (int) getppid());
+ setvar("PPID", ppid, 0);
+ setpwd(0, 0);
+ }
+}
+
+/* PEOF (the end of file marker) */
+
+/*
+ * The input line number. Input.c just defines this variable, and saves
+ * and restores it when files are pushed and popped. The user of this
+ * package must set its value.
+ */
+
+static int pgetc(void);
+static int pgetc2(void);
+static int preadbuffer(void);
+static void pungetc(void);
+static void pushstring(char *, void *);
+static void popstring(void);
+static void setinputfile(const char *, int);
+static void setinputfd(int, int);
+static void setinputstring(char *);
+static void popfile(void);
+static void popallfiles(void);
+static void closescript(void);
+
+
+/* $NetBSD: jobs.h,v 1.17 2003/01/22 20:36:04 dsl Exp $ */
+
+
+/* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */
+#define FORK_FG 0
+#define FORK_BG 1
+#define FORK_NOJOB 2
+
+/* mode flags for showjob(s) */
+#define SHOW_PGID 0x01 /* only show pgid - for jobs -p */
+#define SHOW_PID 0x04 /* include process pid */
+#define SHOW_CHANGED 0x08 /* only jobs whose state has changed */
+
+
+/*
+ * A job structure contains information about a job. A job is either a
+ * single process or a set of processes contained in a pipeline. In the
+ * latter case, pidlist will be non-NULL, and will point to a -1 terminated
+ * array of pids.
+ */
+
+struct procstat {
+ pid_t pid; /* process id */
+ int status; /* last process status from wait() */
+ char *cmd; /* text of command being run */
};
+struct job {
+ struct procstat ps0; /* status of process */
+ struct procstat *ps; /* status or processes when more than one */
+#if JOBS
+ int stopstatus; /* status of a stopped job */
+#endif
+ uint32_t
+ nprocs: 16, /* number of processes */
+ state: 8,
+#define JOBRUNNING 0 /* at least one proc running */
+#define JOBSTOPPED 1 /* all procs are stopped */
+#define JOBDONE 2 /* all procs are completed */
+#if JOBS
+ sigint: 1, /* job was killed by SIGINT */
+ jobctl: 1, /* job running under job control */
+#endif
+ waited: 1, /* true if this entry has been waited for */
+ used: 1, /* true if this entry is in used */
+ changed: 1; /* true if status has changed */
+ struct job *prev_job; /* previous job */
+};
+
+static pid_t backgndpid; /* pid of last background process */
+static int job_warning; /* user was warned about stopped jobs */
+#if JOBS
+static int jobctl; /* true if doing job control */
+#endif
+
+static struct job *makejob(union node *, int);
+static int forkshell(struct job *, union node *, int);
+static int waitforjob(struct job *);
+static int stoppedjobs(void);
+
+#if ! JOBS
+#define setjobctl(on) /* do nothing */
+#else
+static void setjobctl(int);
+static void showjobs(FILE *, int);
+#endif
+
+/* $NetBSD: main.h,v 1.9 2002/11/24 22:35:41 christos Exp $ */
+
+
+/* pid of main shell */
+static int rootpid;
+/* true if we aren't a child of the main shell */
+static int rootshell;
+
+static void readcmdfile(char *);
+static void cmdloop(int);
+
+/* $NetBSD: memalloc.h,v 1.13 2003/01/22 20:36:04 dsl Exp $ */
+
+
+struct stackmark {
+ struct stack_block *stackp;
+ char *stacknxt;
+ size_t stacknleft;
+ struct stackmark *marknext;
+};
+
+/* minimum size of a block */
+#define MINSIZE SHELL_ALIGN(504)
+
+struct stack_block {
+ struct stack_block *prev;
+ char space[MINSIZE];
+};
+
+static struct stack_block stackbase;
+static struct stack_block *stackp = &stackbase;
+static struct stackmark *markp;
+static char *stacknxt = stackbase.space;
+static size_t stacknleft = MINSIZE;
+static char *sstrend = stackbase.space + MINSIZE;
+static int herefd = -1;
+
+
+static pointer ckmalloc(size_t);
+static pointer ckrealloc(pointer, size_t);
+static char *savestr(const char *);
+static pointer stalloc(size_t);
+static void stunalloc(pointer);
+static void setstackmark(struct stackmark *);
+static void popstackmark(struct stackmark *);
+static void growstackblock(void);
+static void *growstackstr(void);
+static char *makestrspace(size_t, char *);
+static char *stnputs(const char *, size_t, char *);
+static char *stputs(const char *, char *);
+
+
+static inline char *_STPUTC(char c, char *p) {
+ if (p == sstrend)
+ p = growstackstr();
+ *p++ = c;
+ return p;
+}
+
+#define stackblock() ((void *)stacknxt)
+#define stackblocksize() stacknleft
+#define STARTSTACKSTR(p) ((p) = stackblock())
+#define STPUTC(c, p) ((p) = _STPUTC((c), (p)))
+#define CHECKSTRSPACE(n, p) \
+ ({ \
+ char *q = (p); \
+ size_t l = (n); \
+ size_t m = sstrend - q; \
+ if (l > m) \
+ (p) = makestrspace(l, q); \
+ 0; \
+ })
+#define USTPUTC(c, p) (*p++ = (c))
+#define STACKSTRNUL(p) ((p) == sstrend? (p = growstackstr(), *p = '\0') : (*p = '\0'))
+#define STUNPUTC(p) (--p)
+#define STTOPC(p) p[-1]
+#define STADJUST(amount, p) (p += (amount))
+
+#define grabstackstr(p) stalloc((char *)(p) - (char *)stackblock())
+#define ungrabstackstr(s, p) stunalloc((s))
+#define stackstrend() ((void *)sstrend)
+
+#define ckfree(p) free((pointer)(p))
+
+/* $NetBSD: mystring.h,v 1.10 2002/11/24 22:35:42 christos Exp $ */
+
+
+#define DOLATSTRLEN 4
+
+static char *prefix(const char *, const char *);
+static int number(const char *);
+static int is_number(const char *);
+static char *single_quote(const char *);
+static char *sstrdup(const char *);
+
+#define equal(s1, s2) (strcmp(s1, s2) == 0)
+#define scopy(s1, s2) ((void)strcpy(s2, s1))
+
+/* $NetBSD: options.h,v 1.16 2003/01/22 20:36:04 dsl Exp $ */
+
+struct shparam {
+ int nparam; /* # of positional parameters (without $0) */
+ unsigned char malloc; /* if parameter list dynamically allocated */
+ char **p; /* parameter list */
+#ifdef BB_ASH_GETOPTS
+ int optind; /* next parameter to be processed by getopts */
+ int optoff; /* used by getopts */
+#endif
+};
+
+
+#define eflag optlist[0]
+#define fflag optlist[1]
+#define Iflag optlist[2]
+#define iflag optlist[3]
+#define mflag optlist[4]
+#define nflag optlist[5]
+#define sflag optlist[6]
+#define xflag optlist[7]
+#define vflag optlist[8]
+#define Cflag optlist[9]
+#define aflag optlist[10]
+#define bflag optlist[11]
+#define uflag optlist[12]
+#define qflag optlist[13]
+
+#ifdef DEBUG
+#define nolog optlist[14]
+#define debug optlist[15]
+#define NOPTS 16
+#else
+#define NOPTS 14
+#endif
+
+/* $NetBSD: options.c,v 1.33 2003/01/22 20:36:04 dsl Exp $ */
+
+
+static const char *const optletters_optnames[NOPTS] = {
+ "e" "errexit",
+ "f" "noglob",
+ "I" "ignoreeof",
+ "i" "interactive",
+ "m" "monitor",
+ "n" "noexec",
+ "s" "stdin",
+ "x" "xtrace",
+ "v" "verbose",
+ "C" "noclobber",
+ "a" "allexport",
+ "b" "notify",
+ "u" "nounset",
+ "q" "quietprofile",
+#ifdef DEBUG
+ "\0" "nolog",
+ "\0" "debug",
+#endif
+};
+
+#define optletters(n) optletters_optnames[(n)][0]
+#define optnames(n) (&optletters_optnames[(n)][1])
+
+
+static char optlist[NOPTS];
+
+
+static char *arg0; /* value of $0 */
+static struct shparam shellparam; /* $@ current positional parameters */
+static char **argptr; /* argument list for builtin commands */
+static char *optionarg; /* set by nextopt (like getopt) */
+static char *optptr; /* used by nextopt */
+
+static char *minusc; /* argument to -c option */
+
+
+static void procargs(int, char **);
+static void optschanged(void);
+static void setparam(char **);
+static void freeparam(volatile struct shparam *);
+static int shiftcmd(int, char **);
+static int setcmd(int, char **);
+static int nextopt(const char *);
+
+/* $NetBSD: redir.h,v 1.14 2002/11/24 22:35:43 christos Exp $ */
+
+/* flags passed to redirect */
+#define REDIR_PUSH 01 /* save previous values of file descriptors */
+#define REDIR_SAVEFD2 03 /* set preverrout */
+
+union node;
+static void redirect(union node *, int);
+static void popredir(int);
+static void clearredir(int);
+static int ash_copyfd(int, int);
+static int redirectsafe(union node *, int);
+
+/* $NetBSD: show.h,v 1.6 2003/01/22 20:36:04 dsl Exp $ */
+
+
+#ifdef DEBUG
+static void showtree(union node *);
+static void trace(const char *, ...);
+static void tracev(const char *, va_list);
+static void trargs(char **);
+static void trputc(int);
+static void trputs(const char *);
+static void opentrace(void);
+#endif
+
+/* $NetBSD: trap.h,v 1.16 2002/11/24 22:35:43 christos Exp $ */
+
+
+/* trap handler commands */
+static char *trap[NSIG];
+/* current value of signal */
+static char sigmode[NSIG - 1];
+/* indicates specified signal received */
+static char gotsig[NSIG - 1];
+
+static void clear_traps(void);
+static void setsignal(int);
+static void ignoresig(int);
+static void onsig(int);
+static void dotrap(void);
+static void setinteractive(int);
+static void exitshell(void) __attribute__((__noreturn__));
+static int decode_signal(const char *, int);
+
+/*
+ * This routine is called when an error or an interrupt occurs in an
+ * interactive shell and control is returned to the main command loop.
+ */
+
+static void
+reset(void)
+{
+ /* from eval.c: */
+ {
+ evalskip = 0;
+ loopnest = 0;
+ funcnest = 0;
+ }
+
+ /* from input.c: */
+ {
+ parselleft = parsenleft = 0; /* clear input buffer */
+ popallfiles();
+ }
+
+ /* from parser.c: */
+ {
+ tokpushback = 0;
+ checkkwd = 0;
+ }
+
+ /* from redir.c: */
+ {
+ clearredir(0);
+ }
+
+}
+
+#ifdef BB_ASH_ALIAS
static struct alias *atab[ATABSIZE];
-static void setalias (char *, char *);
-static struct alias **hashalias (const char *);
-static struct alias *freealias (struct alias *);
-static struct alias **__lookupalias (const char *);
+static void setalias(const char *, const char *);
+static struct alias *freealias(struct alias *);
+static struct alias **__lookupalias(const char *);
static void
-setalias(name, val)
- char *name, *val;
+setalias(const char *name, const char *val)
{
struct alias *ap, **app;
@@ -1406,7 +2121,7 @@ setalias(name, val)
}
static int
-unalias(char *name)
+unalias(const char *name)
{
struct alias **app;
@@ -1451,16 +2166,6 @@ lookupalias(const char *name, int check)
return (ap);
}
-static void
-printalias(const struct alias *ap) {
- char *p;
-
- p = single_quote(ap->val);
- printf("alias %s=%s\n", ap->name, p);
- stunalloc(p);
-}
-
-
/*
* TODO - sort output
*/
@@ -1483,12 +2188,11 @@ aliascmd(int argc, char **argv)
while ((n = *++argv) != NULL) {
if ((v = strchr(n+1, '=')) == NULL) { /* n+1: funny ksh stuff */
if ((ap = *__lookupalias(n)) == NULL) {
- out2fmt("%s: %s not found\n", "alias", n);
+ fprintf(stderr, "%s: %s not found\n", "alias", n);
ret = 1;
} else
printalias(ap);
- }
- else {
+ } else {
*v++ = '\0';
setalias(n, v);
}
@@ -1510,7 +2214,7 @@ unaliascmd(int argc, char **argv)
}
for (i = 0; *argptr; argptr++) {
if (unalias(*argptr)) {
- out2fmt("%s: %s not found\n", "unalias", *argptr);
+ fprintf(stderr, "%s: %s not found\n", "unalias", *argptr);
i = 1;
}
}
@@ -1518,18 +2222,6 @@ unaliascmd(int argc, char **argv)
return (i);
}
-static struct alias **
-hashalias(p)
- const char *p;
- {
- unsigned int hashval;
-
- hashval = *p << 4;
- while (*p)
- hashval+= *p++;
- return &atab[hashval % ATABSIZE];
-}
-
static struct alias *
freealias(struct alias *ap) {
struct alias *next;
@@ -1546,10 +2238,27 @@ freealias(struct alias *ap) {
return next;
}
+static void
+printalias(const struct alias *ap) {
+ out1fmt("%s=%s\n", ap->name, single_quote(ap->val));
+}
static struct alias **
__lookupalias(const char *name) {
- struct alias **app = hashalias(name);
+ unsigned int hashval;
+ struct alias **app;
+ const char *p;
+ unsigned int ch;
+
+ p = name;
+
+ ch = (unsigned char)*p;
+ hashval = ch << 4;
+ while (ch) {
+ hashval += ch;
+ ch = (unsigned char)*++p;
+ }
+ app = &atab[hashval % ATABSIZE];
for (; *app; app = &(*app)->next) {
if (equal(name, (*app)->name)) {
@@ -1559,497 +2268,257 @@ __lookupalias(const char *name) {
return app;
}
-#endif
+#endif /* BB_ASH_ALIAS */
-#ifdef ASH_MATH_SUPPORT
-/* The generated file arith.c has been replaced with a custom hand
- * written implementation written by Aaron Lehmann <aaronl@vitelus.com>.
- * This is now part of libbb, so that it can be used by all the shells
- * in busybox. */
-#define ARITH_NUM 257
-#define ARITH_LPAREN 258
-#define ARITH_RPAREN 259
-#define ARITH_OR 260
-#define ARITH_AND 261
-#define ARITH_BOR 262
-#define ARITH_BXOR 263
-#define ARITH_BAND 264
-#define ARITH_EQ 265
-#define ARITH_NE 266
-#define ARITH_LT 267
-#define ARITH_GT 268
-#define ARITH_GE 269
-#define ARITH_LE 270
-#define ARITH_LSHIFT 271
-#define ARITH_RSHIFT 272
-#define ARITH_ADD 273
-#define ARITH_SUB 274
-#define ARITH_MUL 275
-#define ARITH_DIV 276
-#define ARITH_REM 277
-#define ARITH_UNARYMINUS 278
-#define ARITH_UNARYPLUS 279
-#define ARITH_NOT 280
-#define ARITH_BNOT 281
-
-static void expari (int);
-#endif
-
-static char *trap[NSIG]; /* trap handler commands */
-static char sigmode[NSIG - 1]; /* current value of signal */
-static char gotsig[NSIG - 1]; /* indicates specified signal received */
-static int pendingsigs; /* indicates some signal received */
-/*
- * This file was generated by the mkbuiltins program.
- */
-
-#ifdef JOBS
-static int bgcmd (int, char **);
-static int fgcmd (int, char **);
-static int killcmd (int, char **);
-#endif
-static int bltincmd (int, char **);
-static int cdcmd (int, char **);
-static int breakcmd (int, char **);
-#ifdef ASH_CMDCMD
-static int commandcmd (int, char **);
-#endif
-static int dotcmd (int, char **);
-static int evalcmd (int, char **);
-static int execcmd (int, char **);
-static int exitcmd (int, char **);
-static int exportcmd (int, char **);
-static int histcmd (int, char **);
-static int hashcmd (int, char **);
-static int helpcmd (int, char **);
-static int jobscmd (int, char **);
-static int localcmd (int, char **);
-#ifndef BB_PWD
-static int pwdcmd (int, char **);
-#endif
-static int readcmd (int, char **);
-static int returncmd (int, char **);
-static int setcmd (int, char **);
-static int setvarcmd (int, char **);
-static int shiftcmd (int, char **);
-static int trapcmd (int, char **);
-static int umaskcmd (int, char **);
-#ifdef ASH_ALIAS
-static int aliascmd (int, char **);
-static int unaliascmd (int, char **);
-#endif
-static int unsetcmd (int, char **);
-static int waitcmd (int, char **);
-static int ulimitcmd (int, char **);
-static int timescmd (int, char **);
-#ifdef ASH_MATH_SUPPORT
-static int letcmd (int, char **);
-#endif
-static int typecmd (int, char **);
-#ifdef ASH_GETOPTS
-static int getoptscmd (int, char **);
-#endif
-
-#ifndef BB_TRUE_FALSE
-static int true_main (int, char **);
-static int false_main (int, char **);
-#endif
-
-static void setpwd (const char *, int);
-
-
-#define BUILTIN_NOSPEC "0"
-#define BUILTIN_SPECIAL "1"
-#define BUILTIN_REGULAR "2"
-#define BUILTIN_ASSIGN "4"
-#define BUILTIN_SPEC_ASSG "5"
-#define BUILTIN_REG_ASSG "6"
-
-#define IS_BUILTIN_SPECIAL(builtincmd) ((builtincmd)->name[0] & 1)
-#define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2)
-#define IS_BUILTIN_ASSIGN(builtincmd) ((builtincmd)->name[0] & 4)
-
-struct builtincmd {
- const char *name;
- int (*const builtinfunc) (int, char **);
- //unsigned flags;
-};
-
-
-/* It is CRUCIAL that this listing be kept in ascii order, otherwise
- * the binary search in find_builtin() will stop working. If you value
- * your kneecaps, you'll be sure to *make sure* that any changes made
- * to this array result in the listing remaining in ascii order. You
- * have been warned.
- */
-static const struct builtincmd builtincmds[] = {
- { BUILTIN_SPECIAL ".", dotcmd }, /* first, see declare DOTCMD */
- { BUILTIN_SPECIAL ":", true_main },
-#ifdef ASH_ALIAS
- { BUILTIN_REG_ASSG "alias", aliascmd },
-#endif
-#ifdef JOBS
- { BUILTIN_REGULAR "bg", bgcmd },
-#endif
- { BUILTIN_SPECIAL "break", breakcmd },
- { BUILTIN_SPECIAL "builtin", bltincmd },
- { BUILTIN_REGULAR "cd", cdcmd },
- { BUILTIN_NOSPEC "chdir", cdcmd },
-#ifdef ASH_CMDCMD
- { BUILTIN_REGULAR "command", commandcmd },
-#endif
- { BUILTIN_SPECIAL "continue", breakcmd },
- { BUILTIN_SPECIAL "eval", evalcmd },
- { BUILTIN_SPECIAL "exec", execcmd },
- { BUILTIN_SPECIAL "exit", exitcmd },
- { BUILTIN_SPEC_ASSG "export", exportcmd },
- { BUILTIN_REGULAR "false", false_main },
- { BUILTIN_REGULAR "fc", histcmd },
-#ifdef JOBS
- { BUILTIN_REGULAR "fg", fgcmd },
-#endif
-#ifdef ASH_GETOPTS
- { BUILTIN_REGULAR "getopts", getoptscmd },
-#endif
- { BUILTIN_NOSPEC "hash", hashcmd },
- { BUILTIN_NOSPEC "help", helpcmd },
- { BUILTIN_REGULAR "jobs", jobscmd },
-#ifdef JOBS
- { BUILTIN_REGULAR "kill", killcmd },
-#endif
-#ifdef ASH_MATH_SUPPORT
- { BUILTIN_REGULAR "let", letcmd },
-#endif
- { BUILTIN_ASSIGN "local", localcmd },
-#ifndef BB_PWD
- { BUILTIN_NOSPEC "pwd", pwdcmd },
-#endif
- { BUILTIN_REGULAR "read", readcmd },
- { BUILTIN_SPEC_ASSG "readonly", exportcmd },
- { BUILTIN_SPECIAL "return", returncmd },
- { BUILTIN_SPECIAL "set", setcmd },
- { BUILTIN_NOSPEC "setvar", setvarcmd },
- { BUILTIN_SPECIAL "shift", shiftcmd },
- { BUILTIN_SPECIAL "times", timescmd },
- { BUILTIN_SPECIAL "trap", trapcmd },
- { BUILTIN_REGULAR "true", true_main },
- { BUILTIN_NOSPEC "type", typecmd },
- { BUILTIN_NOSPEC "ulimit", ulimitcmd },
- { BUILTIN_REGULAR "umask", umaskcmd },
-#ifdef ASH_ALIAS
- { BUILTIN_REGULAR "unalias", unaliascmd },
-#endif
- { BUILTIN_SPECIAL "unset", unsetcmd },
- { BUILTIN_REGULAR "wait", waitcmd },
-};
-#define NUMBUILTINS (sizeof (builtincmds) / sizeof (struct builtincmd) )
-
-static const struct builtincmd *DOTCMD = &builtincmds[0];
-static struct builtincmd *BLTINCMD;
-static struct builtincmd *EXECCMD;
-static struct builtincmd *EVALCMD;
-
-/* states */
-#define JOBSTOPPED 1 /* all procs are stopped */
-#define JOBDONE 2 /* all procs are completed */
+/* $NetBSD: cd.c,v 1.30 2003/01/22 20:36:03 dsl Exp $ */
/*
- * A job structure contains information about a job. A job is either a
- * single process or a set of processes contained in a pipeline. In the
- * latter case, pidlist will be non-NULL, and will point to a -1 terminated
- * array of pids.
+ * The cd and pwd commands.
*/
-struct procstat {
- pid_t pid; /* process id */
- int status; /* status flags (defined above) */
- char *cmd; /* text of command being run */
-};
-
-
-static int job_warning; /* user was warned about stopped jobs */
-
-#ifdef JOBS
-static void setjobctl(int enable);
-#else
-#define setjobctl(on) /* do nothing */
-#endif
-
-
-struct job {
- struct procstat ps0; /* status of process */
- struct procstat *ps; /* status or processes when more than one */
- short nprocs; /* number of processes */
- short pgrp; /* process group of this job */
- char state; /* true if job is finished */
- char used; /* true if this entry is in used */
- char changed; /* true if status has changed */
-#ifdef JOBS
- char jobctl; /* job running under job control */
-#endif
-};
-
-static struct job *jobtab; /* array of jobs */
-static int njobs; /* size of array */
-static int backgndpid = -1; /* pid of last background process */
-#ifdef JOBS
-static int initialpgrp; /* pgrp of shell on invocation */
-static int curjob; /* current job */
-static int jobctl;
-#endif
-static int intreceived;
-
-static struct job *makejob (const union node *, int);
-static int forkshell (struct job *, const union node *, int);
-static int waitforjob (struct job *);
-
-static int docd (char *, int);
-static char *getcomponent (void);
-static void updatepwd (const char *);
-static void getpwd (void);
+#define CD_PHYSICAL 1
+#define CD_PRINT 2
-static char *padvance (const char **, const char *);
+static int docd(const char *, int);
+static int cdopt(void);
-static char nullstr[1]; /* zero length string */
static char *curdir = nullstr; /* current working directory */
-static char *cdcomppath;
+static char *physdir = nullstr; /* physical working directory */
static int
-cdcmd(argc, argv)
- int argc;
- char **argv;
+cdopt(void)
{
- const char *dest;
- const char *path;
- char *p;
- struct stat statb;
- int print = 0;
+ int flags = 0;
+ int i, j;
- nextopt(nullstr);
- if ((dest = *argptr) == NULL && (dest = bltinlookup("HOME")) == NULL)
- error("HOME not set");
- if (*dest == '\0')
- dest = ".";
- if (dest[0] == '-' && dest[1] == '\0') {
- dest = bltinlookup("OLDPWD");
- if (!dest || !*dest) {
- dest = curdir;
+ j = 'L';
+ while ((i = nextopt("LP"))) {
+ if (i != j) {
+ flags ^= CD_PHYSICAL;
+ j = i;
}
- print = 1;
- if (dest)
- print = 1;
- else
- dest = ".";
}
- if (*dest == '/' || (path = bltinlookup("CDPATH")) == NULL)
- path = nullstr;
- while ((p = padvance(&path, dest)) != NULL) {
- if (stat(p, &statb) >= 0 && S_ISDIR(statb.st_mode)) {
- if (!print) {
- /*
- * XXX - rethink
- */
- if (p[0] == '.' && p[1] == '/' && p[2] != '\0')
- p += 2;
- print = strcmp(p, dest);
- }
- if (docd(p, print) >= 0)
- return 0;
- }
- }
- error("can't cd to %s", dest);
- /* NOTREACHED */
+ return flags;
}
-
-/*
- * Actually do the chdir. In an interactive shell, print the
- * directory name if "print" is nonzero.
- */
-
static int
-docd(dest, print)
- char *dest;
- int print;
+cdcmd(int argc, char **argv)
{
- char *p;
- char *q;
- char *component;
+ const char *dest;
+ const char *path;
+ const char *p;
+ char c;
struct stat statb;
- int first;
- int badstat;
-
- TRACE(("docd(\"%s\", %d) called\n", dest, print));
+ int flags;
- /*
- * Check each component of the path. If we find a symlink or
- * something we can't stat, clear curdir to force a getcwd()
- * next time we get the value of the current directory.
- */
- badstat = 0;
- cdcomppath = sstrdup(dest);
- STARTSTACKSTR(p);
- if (*dest == '/') {
- STPUTC('/', p);
- cdcomppath++;
- }
- first = 1;
- while ((q = getcomponent()) != NULL) {
- if (q[0] == '\0' || (q[0] == '.' && q[1] == '\0'))
- continue;
- if (! first)
- STPUTC('/', p);
- first = 0;
- component = q;
- while (*q)
- STPUTC(*q++, p);
- if (equal(component, ".."))
- continue;
- STACKSTRNUL(p);
- if ((lstat(stackblock(), &statb) < 0)
- || (S_ISLNK(statb.st_mode))) {
- /* print = 1; */
- badstat = 1;
- break;
+ flags = cdopt();
+ dest = *argptr;
+ if (!dest)
+ dest = bltinlookup(homestr);
+ else if (dest[0] == '-' && dest[1] == '\0') {
+ dest = bltinlookup("OLDPWD");
+ flags |= CD_PRINT;
+ goto step7;
+ }
+ if (!dest)
+ dest = nullstr;
+ if (*dest == '/')
+ goto step7;
+ if (*dest == '.') {
+ c = dest[1];
+dotdot:
+ switch (c) {
+ case '\0':
+ case '/':
+ goto step6;
+ case '.':
+ c = dest[2];
+ if (c != '.')
+ goto dotdot;
}
}
-
- INTOFF;
- if (chdir(dest) < 0) {
- INTON;
- return -1;
+ if (!*dest)
+ dest = ".";
+ if (!(path = bltinlookup("CDPATH"))) {
+step6:
+step7:
+ p = dest;
+ goto docd;
}
- updatepwd(badstat ? NULL : dest);
- INTON;
- if (print && iflag)
- printf(snlfmt, curdir);
+ do {
+ c = *path;
+ p = padvance(&path, dest);
+ if (stat(p, &statb) >= 0 && S_ISDIR(statb.st_mode)) {
+ if (c && c != ':')
+ flags |= CD_PRINT;
+docd:
+ if (!docd(p, flags))
+ goto out;
+ break;
+ }
+ } while (path);
+ error("can't cd to %s", dest);
+ /* NOTREACHED */
+out:
+ if (flags & CD_PRINT)
+ out1fmt(snlfmt, curdir);
return 0;
}
/*
- * Get the next component of the path name pointed to by cdcomppath.
- * This routine overwrites the string pointed to by cdcomppath.
- */
-
-static char *
-getcomponent() {
- char *p;
- char *start;
-
- if ((p = cdcomppath) == NULL)
- return NULL;
- start = cdcomppath;
- while (*p != '/' && *p != '\0')
- p++;
- if (*p == '\0') {
- cdcomppath = NULL;
- } else {
- *p++ = '\0';
- cdcomppath = p;
- }
- return start;
-}
-
-
-
-/*
* Update curdir (the name of the current directory) in response to a
- * cd command. We also call hashcd to let the routines in exec.c know
- * that the current directory has changed.
+ * cd command.
*/
-static void hashcd (void);
-
-static void
+static inline const char *
updatepwd(const char *dir)
{
char *new;
char *p;
- size_t len;
+ char *cdcomppath;
+ const char *lim;
- hashcd(); /* update command hash table */
-
- /*
- * If our argument is NULL, we don't know the current directory
- * any more because we traversed a symbolic link or something
- * we couldn't stat().
- */
- if (dir == NULL || curdir == nullstr) {
- setpwd(0, 1);
- return;
- }
- len = strlen(dir);
cdcomppath = sstrdup(dir);
STARTSTACKSTR(new);
if (*dir != '/') {
- p = curdir;
- while (*p)
- STPUTC(*p++, new);
- if (p[-1] == '/')
- STUNPUTC(new);
+ if (curdir == nullstr)
+ return 0;
+ new = stputs(curdir, new);
}
- while ((p = getcomponent()) != NULL) {
- if (equal(p, "..")) {
- while (new > stackblock() && (STUNPUTC(new), *new) != '/');
- } else if (*p != '\0' && ! equal(p, ".")) {
- STPUTC('/', new);
- while (*p)
- STPUTC(*p++, new);
+ new = makestrspace(strlen(dir) + 2, new);
+ lim = stackblock() + 1;
+ if (*dir != '/') {
+ if (new[-1] != '/')
+ USTPUTC('/', new);
+ if (new > lim && *lim == '/')
+ lim++;
+ } else {
+ USTPUTC('/', new);
+ cdcomppath++;
+ if (dir[1] == '/' && dir[2] != '/') {
+ USTPUTC('/', new);
+ cdcomppath++;
+ lim++;
+ }
+ }
+ p = strtok(cdcomppath, "/");
+ while (p) {
+ switch(*p) {
+ case '.':
+ if (p[1] == '.' && p[2] == '\0') {
+ while (new > lim) {
+ STUNPUTC(new);
+ if (new[-1] == '/')
+ break;
+ }
+ break;
+ } else if (p[1] == '\0')
+ break;
+ /* fall through */
+ default:
+ new = stputs(p, new);
+ USTPUTC('/', new);
}
+ p = strtok(0, "/");
}
- if (new == stackblock())
- STPUTC('/', new);
- STACKSTRNUL(new);
- setpwd(stackblock(), 1);
+ if (new > lim)
+ STUNPUTC(new);
+ *new = 0;
+ return stackblock();
}
+/*
+ * Actually do the chdir. We also call hashcd to let the routines in exec.c
+ * know that the current directory has changed.
+ */
-#ifndef BB_PWD
static int
-pwdcmd(argc, argv)
- int argc;
- char **argv;
+docd(const char *dest, int flags)
{
- printf(snlfmt, curdir);
- return 0;
+ const char *dir = 0;
+ int err;
+
+ TRACE(("docd(\"%s\", %d) called\n", dest, flags));
+
+ INTOFF;
+ if (!(flags & CD_PHYSICAL)) {
+ dir = updatepwd(dest);
+ if (dir)
+ dest = dir;
+ }
+ err = chdir(dest);
+ if (err)
+ goto out;
+ setpwd(dir, 1);
+ hashcd();
+out:
+ INTON;
+ return err;
}
-#endif
/*
* Find out what the current directory is. If we already know the current
* directory, this routine returns immediately.
*/
-static void
+static inline char *
getpwd(void)
{
- curdir = xgetcwd(0);
- if(curdir==0)
- curdir = nullstr;
+ char *dir = getcwd(0, 0);
+ return dir ? dir : nullstr;
+}
+
+static int
+pwdcmd(int argc, char **argv)
+{
+ int flags;
+ const char *dir = curdir;
+
+ flags = cdopt();
+ if (flags) {
+ if (physdir == nullstr)
+ setpwd(dir, 0);
+ dir = physdir;
+ }
+ out1fmt(snlfmt, dir);
+ return 0;
}
static void
setpwd(const char *val, int setold)
{
+ char *oldcur, *dir;
+
+ oldcur = dir = curdir;
+
if (setold) {
- setvar("OLDPWD", curdir, VEXPORT);
+ setvar("OLDPWD", oldcur, VEXPORT);
}
INTOFF;
- if (curdir != nullstr) {
- free(curdir);
- curdir = nullstr;
- }
- if (!val) {
- getpwd();
- } else {
- curdir = savestr(val);
+ if (physdir != nullstr) {
+ if (physdir != oldcur)
+ free(physdir);
+ physdir = nullstr;
+ }
+ if (oldcur == val || !val) {
+ char *s = getpwd();
+ physdir = s;
+ if (!val)
+ dir = s;
+ } else
+ dir = savestr(val);
+ if (oldcur != dir && oldcur != nullstr) {
+ free(oldcur);
}
+ curdir = dir;
INTON;
- setvar("PWD", curdir, VEXPORT);
+ setvar("PWD", dir, VEXPORT);
}
+/* $NetBSD: error.c,v 1.30 2003/01/22 20:36:03 dsl Exp $ */
+
/*
* Errors and exceptions.
*/
@@ -2058,30 +2527,9 @@ setpwd(const char *val, int setold)
* Code to handle exceptions in C.
*/
-/*
- * We enclose jmp_buf in a structure so that we can declare pointers to
- * jump locations. The global variable handler contains the location to
- * jump to when an exception occurs, and the global variable exception
- * contains a code identifying the exeception. To implement nested
- * exception handlers, the user should save the value of handler on entry
- * to an inner scope, set handler to point to a jmploc structure for the
- * inner scope, and restore handler on exit from the scope.
- */
-struct jmploc {
- jmp_buf loc;
-};
-/* exceptions */
-#define EXINT 0 /* SIGINT received */
-#define EXERROR 1 /* a generic error */
-#define EXSHELLPROC 2 /* execute a shell procedure */
-#define EXEXEC 3 /* command execution failed */
-
-static struct jmploc *handler;
-static int exception;
-
-static void exverror (int, const char *, va_list)
+static void exverror(int, const char *, va_list)
__attribute__((__noreturn__));
/*
@@ -2090,8 +2538,6 @@ static void exverror (int, const char *, va_list)
* stored in the global variable "exception".
*/
-static void exraise (int) __attribute__((__noreturn__));
-
static void
exraise(int e)
{
@@ -2099,7 +2545,8 @@ exraise(int e)
if (handler == NULL)
abort();
#endif
- flushall();
+ INTOFF;
+
exception = e;
longjmp(handler->loc, 1);
}
@@ -2109,67 +2556,77 @@ exraise(int e)
* Called from trap.c when a SIGINT is received. (If the user specifies
* that SIGINT is to be trapped or ignored using the trap builtin, then
* this routine is not called.) Suppressint is nonzero when interrupts
- * are held using the INTOFF macro. The call to _exit is necessary because
- * there is a short period after a fork before the signal handlers are
- * set to the appropriate value for the child. (The test for iflag is
- * just defensive programming.)
+ * are held using the INTOFF macro. (The test for iflag is just
+ * defensive programming.)
*/
static void
onint(void) {
- sigset_t mysigset;
+ int i;
- if (suppressint) {
- intpending++;
- return;
- }
intpending = 0;
- sigemptyset(&mysigset);
- sigprocmask(SIG_SETMASK, &mysigset, NULL);
- if (rootshell && iflag)
- exraise(EXINT);
- else {
- signal(SIGINT, SIG_DFL);
- raise(SIGINT);
+ sigsetmask(0);
+ i = EXSIG;
+ if (gotsig[SIGINT - 1] && !trap[SIGINT]) {
+ if (!(rootshell && iflag)) {
+ signal(SIGINT, SIG_DFL);
+ raise(SIGINT);
+ }
+ i = EXINT;
}
+ exraise(i);
/* NOTREACHED */
}
+static void
+exvwarning(const char *msg, va_list ap)
+{
+ FILE *errs;
+ const char *name;
+ const char *fmt;
-static char *commandname; /* currently executing command */
+ errs = stderr;
+ name = arg0;
+ fmt = "%s: ";
+ if (commandname) {
+ name = commandname;
+ fmt = "%s: %d: ";
+ }
+ fprintf(errs, fmt, name, startlinno);
+ vfprintf(errs, msg, ap);
+ outcslow('\n', errs);
+}
/*
- * Exverror is called to raise the error exception. If the first argument
+ * Exverror is called to raise the error exception. If the second argument
* is not NULL then error prints an error message using printf style
* formatting. It then raises the error exception.
*/
static void
exverror(int cond, const char *msg, va_list ap)
{
- CLEAR_PENDING_INT;
- INTOFF;
-
#ifdef DEBUG
- if (msg)
- TRACE(("exverror(%d, \"%s\") pid=%d\n", cond, msg, getpid()));
- else
+ if (msg) {
+ TRACE(("exverror(%d, \"", cond));
+ TRACEV((msg, ap));
+ TRACE(("\") pid=%d\n", getpid()));
+ } else
TRACE(("exverror(%d, NULL) pid=%d\n", cond, getpid()));
+ if (msg)
#endif
- if (msg) {
- if (commandname)
- out2fmt("%s: ", commandname);
- vfprintf(stderr, msg, ap);
- out2c('\n');
- }
+ exvwarning(msg, ap);
+
+ flushall();
exraise(cond);
/* NOTREACHED */
}
-static void
+static void
error(const char *msg, ...)
{
va_list ap;
+
va_start(ap, msg);
exverror(EXERROR, msg, ap);
/* NOTREACHED */
@@ -2181,88 +2638,27 @@ static void
exerror(int cond, const char *msg, ...)
{
va_list ap;
+
va_start(ap, msg);
exverror(cond, msg, ap);
/* NOTREACHED */
va_end(ap);
}
-
-
/*
- * Table of error messages.
+ * error/warning routines for external builtins
*/
-struct errname {
- short errcode; /* error number */
- char action; /* operation which encountered the error */
-};
-
-/*
- * Types of operations (passed to the errmsg routine).
- */
-
-#define E_OPEN 01 /* opening a file */
-#define E_CREAT 02 /* creating a file */
-#define E_EXEC 04 /* executing a program */
-
-#define ALL (E_OPEN|E_CREAT|E_EXEC)
+static void
+sh_warnx(const char *fmt, ...)
+{
+ va_list ap;
-static const struct errname errormsg[] = {
- { EINTR, ALL },
- { EACCES, ALL },
- { EIO, ALL },
- { ENOENT, E_OPEN },
- { ENOENT, E_CREAT },
- { ENOENT, E_EXEC },
- { ENOTDIR, E_OPEN },
- { ENOTDIR, E_CREAT },
- { ENOTDIR, E_EXEC },
- { EISDIR, ALL },
- { EEXIST, E_CREAT },
-#ifdef EMFILE
- { EMFILE, ALL },
-#endif
- { ENFILE, ALL },
- { ENOSPC, ALL },
-#ifdef EDQUOT
- { EDQUOT, ALL },
-#endif
-#ifdef ENOSR
- { ENOSR, ALL },
-#endif
- { ENXIO, ALL },
- { EROFS, ALL },
- { ETXTBSY, ALL },
-#ifdef EAGAIN
- { EAGAIN, E_EXEC },
-#endif
- { ENOMEM, ALL },
-#ifdef ENOLINK
- { ENOLINK, ALL },
-#endif
-#ifdef EMULTIHOP
- { EMULTIHOP, ALL },
-#endif
-#ifdef ECOMM
- { ECOMM, ALL },
-#endif
-#ifdef ESTALE
- { ESTALE, ALL },
-#endif
-#ifdef ETIMEDOUT
- { ETIMEDOUT, ALL },
-#endif
-#ifdef ELOOP
- { ELOOP, ALL },
-#endif
- { E2BIG, E_EXEC },
-#ifdef ELIBACC
- { ELIBACC, E_EXEC },
-#endif
-};
+ va_start(ap, fmt);
+ exvwarning(fmt, ap);
+ va_end(ap);
+}
-#define ERRNAME_SIZE (sizeof(errormsg)/sizeof(struct errname))
/*
* Return a string describing an error. The returned string may be a
@@ -2271,56 +2667,46 @@ static const struct errname errormsg[] = {
*/
static const char *
-errmsg(int e, int action)
+errmsg(int e, const char *em)
{
- struct errname const *ep;
- static char buf[12];
+ if(e == ENOENT || e == ENOTDIR) {
- for (ep = errormsg ; ep < errormsg+ERRNAME_SIZE; ep++) {
- if (ep->errcode == e && (ep->action & action) != 0)
- return strerror(e);
+ return em;
}
-
- snprintf(buf, sizeof buf, "error %d", e);
- return buf;
+ return strerror(e);
}
-#ifdef ASH_OPTIMIZE_FOR_SIZE
-static void
-__inton() {
- if (--suppressint == 0 && intpending) {
- onint();
- }
-}
-static void forceinton (void) {
- suppressint = 0;
- if (intpending)
- onint();
-}
-#endif
+/* $NetBSD: eval.c,v 1.71 2003/01/23 03:33:16 rafal Exp $ */
+
+/*
+ * Evaluate a command.
+ */
/* flags in argument to evaltree */
#define EV_EXIT 01 /* exit after evaluating tree */
#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
#define EV_BACKCMD 04 /* command executing within back quotes */
-static int evalskip; /* set if we are skipping commands */
-static int skipcount; /* number of levels to skip */
-static int loopnest; /* current loop nesting level */
-static int funcnest; /* depth of function calls */
+static void evalloop(union node *, int);
+static void evalfor(union node *, int);
+static void evalcase(union node *, int);
+static void evalsubshell(union node *, int);
+static void expredir(union node *);
+static void evalpipe(union node *, int);
+static void evalcommand(union node *, int);
+static int evalbltin(const struct builtincmd *, int, char **);
+static int evalfun(struct funcnode *, int, char **, int);
+static void prehash(union node *);
+static int bltincmd(int, char **);
-static struct strlist *cmdenviron; /* environment for builtin command */
-static int exitstatus; /* exit status of last command */
-static int oexitstatus; /* saved exit status */
-static void evalsubshell (const union node *, int);
-static void expredir (union node *);
-static void prehash (union node *);
-static void eprintlist (struct strlist *);
+static const struct builtincmd bltin = {
+ "\0\0", bltincmd
+};
+
-static union node *parsecmd(int);
/*
* Called to reset things after an exception.
*/
@@ -2328,12 +2714,9 @@ static union node *parsecmd(int);
/*
* The eval commmand.
*/
-static void evalstring (char *, int);
static int
-evalcmd(argc, argv)
- int argc;
- char **argv;
+evalcmd(int argc, char **argv)
{
char *p;
char *concat;
@@ -2345,8 +2728,7 @@ evalcmd(argc, argv)
STARTSTACKSTR(concat);
ap = argv + 2;
for (;;) {
- while (*p)
- STPUTC(*p++, concat);
+ concat = stputs(p, concat);
if ((p = *ap++) == NULL)
break;
STPUTC(' ', concat);
@@ -2359,17 +2741,11 @@ evalcmd(argc, argv)
return exitstatus;
}
+
/*
* Execute a command or commands contained in a string.
*/
-static void evaltree (union node *, int);
-static void setinputstring (char *);
-static void popfile (void);
-static void setstackmark(struct stackmark *mark);
-static void popstackmark(struct stackmark *mark);
-
-
static void
evalstring(char *s, int flag)
{
@@ -2378,82 +2754,150 @@ evalstring(char *s, int flag)
setstackmark(&smark);
setinputstring(s);
+
while ((n = parsecmd(0)) != NEOF) {
evaltree(n, flag);
popstackmark(&smark);
+ if (evalskip)
+ break;
}
popfile();
popstackmark(&smark);
}
-static struct builtincmd *find_builtin (const char *);
-static void expandarg (union node *, struct arglist *, int);
-static void calcsize (const union node *);
-static union node *copynode (const union node *);
-/*
- * Make a copy of a parse tree.
- */
-
-static int funcblocksize; /* size of structures in function */
-static int funcstringsize; /* size of strings in node */
-static pointer funcblock; /* block to allocate function from */
-static char *funcstring; /* block to allocate strings from */
-
-
-static inline union node *
-copyfunc(union node *n)
-{
- if (n == NULL)
- return NULL;
- funcblocksize = 0;
- funcstringsize = 0;
- calcsize(n);
- funcblock = ckmalloc(funcblocksize + funcstringsize);
- funcstring = (char *) funcblock + funcblocksize;
- return copynode(n);
-}
/*
- * Free a parse tree.
+ * Evaluate a parse tree. The value is left in the global variable
+ * exitstatus.
*/
static void
-freefunc(union node *n)
+evaltree(union node *n, int flags)
{
- if (n)
- ckfree(n);
+ int checkexit = 0;
+ void (*evalfn)(union node *, int);
+ unsigned isor;
+ int status;
+ if (n == NULL) {
+ TRACE(("evaltree(NULL) called\n"));
+ goto out;
+ }
+ TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
+ getpid(), n, n->type, flags));
+ switch (n->type) {
+ default:
+#ifdef DEBUG
+ out1fmt("Node type = %d\n", n->type);
+ fflush(stdout);
+ break;
+#endif
+ case NNOT:
+ evaltree(n->nnot.com, EV_TESTED);
+ status = !exitstatus;
+ goto setstatus;
+ case NREDIR:
+ expredir(n->nredir.redirect);
+ status = redirectsafe(n->nredir.redirect, REDIR_PUSH);
+ if (!status) {
+ evaltree(n->nredir.n, flags & EV_TESTED);
+ status = exitstatus;
+ }
+ popredir(0);
+ goto setstatus;
+ case NCMD:
+ evalfn = evalcommand;
+checkexit:
+ if (eflag && !(flags & EV_TESTED))
+ checkexit = ~0;
+ goto calleval;
+ case NFOR:
+ evalfn = evalfor;
+ goto calleval;
+ case NWHILE:
+ case NUNTIL:
+ evalfn = evalloop;
+ goto calleval;
+ case NSUBSHELL:
+ case NBACKGND:
+ evalfn = evalsubshell;
+ goto calleval;
+ case NPIPE:
+ evalfn = evalpipe;
+ goto checkexit;
+ case NCASE:
+ evalfn = evalcase;
+ goto calleval;
+ case NAND:
+ case NOR:
+ case NSEMI:
+#if NAND + 1 != NOR
+#error NAND + 1 != NOR
+#endif
+#if NOR + 1 != NSEMI
+#error NOR + 1 != NSEMI
+#endif
+ isor = n->type - NAND;
+ evaltree(
+ n->nbinary.ch1,
+ (flags | ((isor >> 1) - 1)) & EV_TESTED
+ );
+ if (!exitstatus == isor)
+ break;
+ if (!evalskip) {
+ n = n->nbinary.ch2;
+evaln:
+ evalfn = evaltree;
+calleval:
+ evalfn(n, flags);
+ break;
+ }
+ break;
+ case NIF:
+ evaltree(n->nif.test, EV_TESTED);
+ if (evalskip)
+ break;
+ if (exitstatus == 0) {
+ n = n->nif.ifpart;
+ goto evaln;
+ } else if (n->nif.elsepart) {
+ n = n->nif.elsepart;
+ goto evaln;
+ }
+ goto success;
+ case NDEFUN:
+ defun(n->narg.text, n->narg.next);
+success:
+ status = 0;
+setstatus:
+ exitstatus = status;
+ break;
+ }
+out:
+ if (pendingsigs)
+ dotrap();
+ if (flags & EV_EXIT || checkexit & exitstatus)
+ exraise(EXEXIT);
}
-/*
- * Add a new command entry, replacing any existing command entry for
- * the same name.
- */
-
-static inline void
-addcmdentry(char *name, struct cmdentry *entry)
-{
- struct tblentry *cmdp;
+#if !defined(__alpha__) || (defined(__GNUC__) && __GNUC__ >= 3)
+static
+#endif
+void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
- INTOFF;
- cmdp = cmdlookup(name, 1);
- if (cmdp->cmdtype == CMDFUNCTION) {
- freefunc(cmdp->param.func);
- }
- cmdp->cmdtype = entry->cmdtype;
- cmdp->param = entry->u;
- INTON;
-}
-static inline void
-evalloop(const union node *n, int flags)
+static void
+evalloop(union node *n, int flags)
{
int status;
loopnest++;
status = 0;
+ flags &= EV_TESTED;
for (;;) {
+ int i;
+
evaltree(n->nbinary.ch1, EV_TESTED);
if (evalskip) {
skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
@@ -2464,14 +2908,12 @@ skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
evalskip = 0;
break;
}
- if (n->type == NWHILE) {
- if (exitstatus != 0)
- break;
- } else {
- if (exitstatus == 0)
- break;
- }
- evaltree(n->nbinary.ch2, flags & EV_TESTED);
+ i = exitstatus;
+ if (n->type != NWHILE)
+ i = !i;
+ if (i != 0)
+ break;
+ evaltree(n->nbinary.ch2, flags);
status = exitstatus;
if (evalskip)
goto skipping;
@@ -2480,8 +2922,10 @@ skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
exitstatus = status;
}
+
+
static void
-evalfor(const union node *n, int flags)
+evalfor(union node *n, int flags)
{
struct arglist arglist;
union node *argp;
@@ -2491,8 +2935,8 @@ evalfor(const union node *n, int flags)
setstackmark(&smark);
arglist.lastp = &arglist.list;
for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
- oexitstatus = exitstatus;
expandarg(argp, &arglist, EXP_FULL | EXP_TILDE | EXP_RECORD);
+ /* XXX */
if (evalskip)
goto out;
}
@@ -2500,9 +2944,10 @@ evalfor(const union node *n, int flags)
exitstatus = 0;
loopnest++;
+ flags &= EV_TESTED;
for (sp = arglist.list ; sp ; sp = sp->next) {
setvar(n->nfor.var, sp->text, 0);
- evaltree(n->nfor.body, flags & EV_TESTED);
+ evaltree(n->nfor.body, flags);
if (evalskip) {
if (evalskip == SKIPCONT && --skipcount <= 0) {
evalskip = 0;
@@ -2518,8 +2963,10 @@ out:
popstackmark(&smark);
}
-static inline void
-evalcase(const union node *n, int flags)
+
+
+static void
+evalcase(union node *n, int flags)
{
union node *cp;
union node *patp;
@@ -2528,8 +2975,8 @@ evalcase(const union node *n, int flags)
setstackmark(&smark);
arglist.lastp = &arglist.list;
- oexitstatus = exitstatus;
expandarg(n->ncase.expr, &arglist, EXP_TILDE);
+ exitstatus = 0;
for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) {
for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {
if (casematch(patp, arglist.list->text)) {
@@ -2544,6 +2991,77 @@ out:
popstackmark(&smark);
}
+
+
+/*
+ * Kick off a subshell to evaluate a tree.
+ */
+
+static void
+evalsubshell(union node *n, int flags)
+{
+ struct job *jp;
+ int backgnd = (n->type == NBACKGND);
+ int status;
+
+ expredir(n->nredir.redirect);
+ if (!backgnd && flags & EV_EXIT && !trap[0])
+ goto nofork;
+ INTOFF;
+ jp = makejob(n, 1);
+ if (forkshell(jp, n, backgnd) == 0) {
+ INTON;
+ flags |= EV_EXIT;
+ if (backgnd)
+ flags &=~ EV_TESTED;
+nofork:
+ redirect(n->nredir.redirect, 0);
+ evaltreenr(n->nredir.n, flags);
+ /* never returns */
+ }
+ status = 0;
+ if (! backgnd)
+ status = waitforjob(jp);
+ exitstatus = status;
+ INTON;
+}
+
+
+
+/*
+ * Compute the names of the files in a redirection list.
+ */
+
+static void
+expredir(union node *n)
+{
+ union node *redir;
+
+ for (redir = n ; redir ; redir = redir->nfile.next) {
+ struct arglist fn;
+ fn.lastp = &fn.list;
+ switch (redir->type) {
+ case NFROMTO:
+ case NFROM:
+ case NTO:
+ case NCLOBBER:
+ case NAPPEND:
+ expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
+ redir->nfile.expfname = fn.list->text;
+ break;
+ case NFROMFD:
+ case NTOFD:
+ if (redir->ndup.vname) {
+ expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE);
+ fixredir(redir, fn.list->text, 1);
+ }
+ break;
+ }
+ }
+}
+
+
+
/*
* Evaluate a pipeline. All the processes in the pipeline are children
* of the process creating the pipeline. (This differs from some versions
@@ -2551,9 +3069,8 @@ out:
* of all the rest.)
*/
-static inline void
-evalpipe(n)
- union node *n;
+static void
+evalpipe(union node *n, int flags)
{
struct job *jp;
struct nodelist *lp;
@@ -2565,6 +3082,7 @@ evalpipe(n)
pipelen = 0;
for (lp = n->npipe.cmdlist ; lp ; lp = lp->next)
pipelen++;
+ flags |= EV_EXIT;
INTOFF;
jp = makejob(n, pipelen);
prevfd = -1;
@@ -2579,53 +3097,124 @@ evalpipe(n)
}
if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) {
INTON;
+ if (pip[1] >= 0) {
+ close(pip[0]);
+ }
if (prevfd > 0) {
- close(0);
- dup_as_newfd(prevfd, 0);
+ dup2(prevfd, 0);
close(prevfd);
- if (pip[0] == 0) {
- pip[0] = -1;
- }
}
- if (pip[1] >= 0) {
- if (pip[0] >= 0) {
- close(pip[0]);
- }
- if (pip[1] != 1) {
- close(1);
- dup_as_newfd(pip[1], 1);
- close(pip[1]);
- }
+ if (pip[1] > 1) {
+ dup2(pip[1], 1);
+ close(pip[1]);
}
- evaltree(lp->n, EV_EXIT);
+ evaltreenr(lp->n, flags);
+ /* never returns */
}
if (prevfd >= 0)
close(prevfd);
prevfd = pip[0];
close(pip[1]);
}
- INTON;
if (n->npipe.backgnd == 0) {
- INTOFF;
exitstatus = waitforjob(jp);
TRACE(("evalpipe: job done exit status %d\n", exitstatus));
- INTON;
}
+ INTON;
}
-static void find_command (const char *, struct cmdentry *, int, const char *);
-static int
-isassignment(const char *word) {
- if (!is_name(*word)) {
- return 0;
+
+/*
+ * Execute a command inside back quotes. If it's a builtin command, we
+ * want to save its output in a block obtained from malloc. Otherwise
+ * we fork off a subprocess and get the output of the command via a pipe.
+ * Should be called with interrupts off.
+ */
+
+static void
+evalbackcmd(union node *n, struct backcmd *result)
+{
+ int saveherefd;
+
+ result->fd = -1;
+ result->buf = NULL;
+ result->nleft = 0;
+ result->jp = NULL;
+ if (n == NULL) {
+ goto out;
}
- do {
- word++;
- } while (is_in_name(*word));
- return *word == '=';
+
+ saveherefd = herefd;
+ herefd = -1;
+
+ {
+ int pip[2];
+ struct job *jp;
+
+ if (pipe(pip) < 0)
+ error("Pipe call failed");
+ jp = makejob(n, 1);
+ if (forkshell(jp, n, FORK_NOJOB) == 0) {
+ FORCEINTON;
+ close(pip[0]);
+ if (pip[1] != 1) {
+ close(1);
+ ash_copyfd(pip[1], 1);
+ close(pip[1]);
+ }
+ eflag = 0;
+ evaltreenr(n, EV_EXIT);
+ /* NOTREACHED */
+ }
+ close(pip[1]);
+ result->fd = pip[0];
+ result->jp = jp;
+ }
+ herefd = saveherefd;
+out:
+ TRACE(("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
+ result->fd, result->buf, result->nleft, result->jp));
+}
+
+#ifdef BB_ASH_CMDCMD
+static inline char **
+parse_command_args(char **argv, const char **path)
+{
+ char *cp, c;
+
+ for (;;) {
+ cp = *++argv;
+ if (!cp)
+ return 0;
+ if (*cp++ != '-')
+ break;
+ if (!(c = *cp++))
+ break;
+ if (c == '-' && !*cp) {
+ argv++;
+ break;
+ }
+ do {
+ switch (c) {
+ case 'p':
+ *path = defpath;
+ break;
+ default:
+ /* run 'typecmd' for other options */
+ return 0;
+ }
+ } while ((c = *cp++));
+ }
+ return argv;
}
+#endif
+
+
+/*
+ * Execute a simple command.
+ */
static void
evalcommand(union node *cmd, int flags)
@@ -2636,567 +3225,323 @@ evalcommand(union node *cmd, int flags)
struct arglist varlist;
char **argv;
int argc;
- char **envp;
- struct strlist *sp;
- int mode;
+ const struct strlist *sp;
struct cmdentry cmdentry;
struct job *jp;
- char *volatile savecmdname;
- volatile struct shparam saveparam;
- struct localvar *volatile savelocalvars;
- volatile int e;
char *lastarg;
const char *path;
- const struct builtincmd *firstbltin;
- struct jmploc *volatile savehandler;
- struct jmploc jmploc;
-#if __GNUC__
- /* Avoid longjmp clobbering */
- (void) &argv;
- (void) &argc;
- (void) &lastarg;
- (void) &flags;
-#endif
+ int spclbltin;
+ int cmd_is_exec;
+ int status;
+ char **nargv;
/* First expand the arguments. */
TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
setstackmark(&smark);
- arglist.lastp = &arglist.list;
+ back_exitstatus = 0;
+
+ cmdentry.cmdtype = CMDBUILTIN;
+ cmdentry.u.cmd = &bltin;
varlist.lastp = &varlist.list;
- arglist.list = 0;
- oexitstatus = exitstatus;
- exitstatus = 0;
- path = pathval();
- for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) {
- expandarg(argp, &varlist, EXP_VARTILDE);
- }
- for (
- argp = cmd->ncmd.args; argp && !arglist.list;
- argp = argp->narg.next
- ) {
- expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
- }
- if (argp) {
- struct builtincmd *bcmd;
- int pseudovarflag;
- bcmd = find_builtin(arglist.list->text);
- pseudovarflag = bcmd && IS_BUILTIN_ASSIGN(bcmd);
- for (; argp; argp = argp->narg.next) {
- if (pseudovarflag && isassignment(argp->narg.text)) {
- expandarg(argp, &arglist, EXP_VARTILDE);
- continue;
- }
- expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
- }
- }
- *arglist.lastp = NULL;
*varlist.lastp = NULL;
- expredir(cmd->ncmd.redirect);
+ arglist.lastp = &arglist.list;
+ *arglist.lastp = NULL;
+
argc = 0;
- for (sp = arglist.list ; sp ; sp = sp->next)
- argc++;
- argv = stalloc(sizeof (char *) * (argc + 1));
+ for (argp = cmd->ncmd.args; argp; argp = argp->narg.next) {
+ struct strlist **spp;
+ spp = arglist.lastp;
+ expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
+ for (sp = *spp; sp; sp = sp->next)
+ argc++;
+ }
+
+ argv = nargv = stalloc(sizeof (char *) * (argc + 1));
for (sp = arglist.list ; sp ; sp = sp->next) {
TRACE(("evalcommand arg: %s\n", sp->text));
- *argv++ = sp->text;
+ *nargv++ = sp->text;
}
- *argv = NULL;
+ *nargv = NULL;
+
lastarg = NULL;
if (iflag && funcnest == 0 && argc > 0)
- lastarg = argv[-1];
- argv -= argc;
+ lastarg = nargv[-1];
- /* Print the command if xflag is set. */
- if (xflag) {
- out2c('+');
- eprintlist(varlist.list);
- eprintlist(arglist.list);
- out2c('\n');
- }
+ preverrout_fd = 2;
+ expredir(cmd->ncmd.redirect);
+ status = redirectsafe(cmd->ncmd.redirect, REDIR_PUSH|REDIR_SAVEFD2);
- /* Now locate the command. */
- if (argc == 0) {
- cmdentry.cmdtype = CMDBUILTIN;
- firstbltin = cmdentry.u.cmd = BLTINCMD;
- } else {
- const char *oldpath;
- int findflag = DO_ERR;
- int oldfindflag;
+ path = vpath.text;
+ for (argp = cmd->ncmd.assign; argp; argp = argp->narg.next) {
+ struct strlist **spp;
+ char *p;
+
+ spp = varlist.lastp;
+ expandarg(argp, &varlist, EXP_VARTILDE);
/*
* Modify the command lookup path, if a PATH= assignment
* is present
*/
- for (sp = varlist.list ; sp ; sp = sp->next)
- if (varequal(sp->text, defpathvar)) {
- path = sp->text + 5;
- findflag |= DO_BRUTE;
+ p = (*spp)->text;
+ if (varequal(p, path))
+ path = p;
+ }
+
+ /* Print the command if xflag is set. */
+ if (xflag) {
+ int n;
+ const char *p = " %s";
+
+ p++;
+ dprintf(preverrout_fd, p, ps4val());
+
+ sp = varlist.list;
+ for(n = 0; n < 2; n++) {
+ while (sp) {
+ dprintf(preverrout_fd, p, sp->text);
+ sp = sp->next;
+ if(*p == '%') {
+ p--;
+ }
}
+ sp = arglist.list;
+ }
+ xwrite(preverrout_fd, "\n", 1);
+ }
+
+ cmd_is_exec = 0;
+ spclbltin = -1;
+
+ /* Now locate the command. */
+ if (argc) {
+ const char *oldpath;
+ int cmd_flag = DO_ERR;
+
+ path += 5;
oldpath = path;
- oldfindflag = findflag;
- firstbltin = 0;
- for(;;) {
- find_command(argv[0], &cmdentry, findflag, path);
- if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */
- exitstatus = 127;
- goto out;
+ for (;;) {
+ find_command(argv[0], &cmdentry, cmd_flag, path);
+ if (cmdentry.cmdtype == CMDUNKNOWN) {
+ status = 127;
+ flushout(stderr);
+ goto bail;
}
+
/* implement bltin and command here */
- if (cmdentry.cmdtype != CMDBUILTIN) {
+ if (cmdentry.cmdtype != CMDBUILTIN)
+ break;
+ if (spclbltin < 0)
+ spclbltin = IS_BUILTIN_SPECIAL(cmdentry.u.cmd);
+ if (cmdentry.u.cmd == EXECCMD)
+ cmd_is_exec++;
+#ifdef BB_ASH_CMDCMD
+ if (cmdentry.u.cmd == COMMANDCMD) {
+
+ path = oldpath;
+ nargv = parse_command_args(argv, &path);
+ if (!nargv)
+ break;
+ argc -= nargv - argv;
+ argv = nargv;
+ cmd_flag |= DO_NOFUNC;
+ } else
+#endif
break;
- }
- if (!firstbltin) {
- firstbltin = cmdentry.u.cmd;
- }
- if (cmdentry.u.cmd == BLTINCMD) {
- for(;;) {
- struct builtincmd *bcmd;
-
- argv++;
- if (--argc == 0)
- goto found;
- if (!(bcmd = find_builtin(*argv))) {
- out2fmt("%s: not found\n", *argv);
- exitstatus = 127;
- goto out;
- }
- cmdentry.u.cmd = bcmd;
- if (bcmd != BLTINCMD)
- break;
- }
- }
- if (cmdentry.u.cmd == find_builtin("command")) {
- argv++;
- if (--argc == 0) {
- goto found;
- }
- if (*argv[0] == '-') {
- if (!equal(argv[0], "-p")) {
- argv--;
- argc++;
- break;
- }
- argv++;
- if (--argc == 0) {
- goto found;
- }
- path = defpath;
- findflag |= DO_BRUTE;
- } else {
- path = oldpath;
- findflag = oldfindflag;
- }
- findflag |= DO_NOFUN;
- continue;
- }
-found:
- break;
}
}
- /* Fork off a child process if necessary. */
- if (cmd->ncmd.backgnd
- || (cmdentry.cmdtype == CMDNORMAL && (flags & EV_EXIT) == 0)
- ) {
- jp = makejob(cmd, 1);
- mode = cmd->ncmd.backgnd;
- if (forkshell(jp, cmd, mode) != 0)
- goto parent; /* at end of routine */
- flags |= EV_EXIT;
+ if (status) {
+ /* We have a redirection error. */
+ if (spclbltin > 0)
+ exraise(EXERROR);
+bail:
+ exitstatus = status;
+ goto out;
}
- /* This is the child process if a fork occurred. */
/* Execute the command. */
- if (cmdentry.cmdtype == CMDFUNCTION) {
-#ifdef DEBUG
- trputs("Shell function: "); trargs(argv);
-#endif
- exitstatus = oexitstatus;
- redirect(cmd->ncmd.redirect, REDIR_PUSH);
- saveparam = shellparam;
- shellparam.malloc = 0;
- shellparam.nparam = argc - 1;
- shellparam.p = argv + 1;
- INTOFF;
- savelocalvars = localvars;
- localvars = NULL;
- INTON;
- if (setjmp(jmploc.loc)) {
- if (exception == EXSHELLPROC) {
- freeparam((volatile struct shparam *)
- &saveparam);
- } else {
- saveparam.optind = shellparam.optind;
- saveparam.optoff = shellparam.optoff;
- freeparam(&shellparam);
- shellparam = saveparam;
+ switch (cmdentry.cmdtype) {
+ default:
+ /* Fork off a child process if necessary. */
+ if (!(flags & EV_EXIT) || trap[0]) {
+ INTOFF;
+ jp = makejob(cmd, 1);
+ if (forkshell(jp, cmd, FORK_FG) != 0) {
+ exitstatus = waitforjob(jp);
+ INTON;
+ break;
}
- poplocalvars();
- localvars = savelocalvars;
- handler = savehandler;
- longjmp(handler->loc, 1);
- }
- savehandler = handler;
- handler = &jmploc;
- for (sp = varlist.list ; sp ; sp = sp->next)
- mklocal(sp->text);
- funcnest++;
- evaltree(cmdentry.u.func, flags & EV_TESTED);
- funcnest--;
- INTOFF;
- poplocalvars();
- localvars = savelocalvars;
- saveparam.optind = shellparam.optind;
- saveparam.optoff = shellparam.optoff;
- freeparam(&shellparam);
- shellparam = saveparam;
- handler = savehandler;
- popredir();
- INTON;
- if (evalskip == SKIPFUNC) {
- evalskip = 0;
- skipcount = 0;
- }
- if (flags & EV_EXIT)
- exitshell(exitstatus);
- } else if (cmdentry.cmdtype == CMDBUILTIN) {
-#ifdef DEBUG
- trputs("builtin command: "); trargs(argv);
-#endif
- mode = (cmdentry.u.cmd == EXECCMD)? 0 : REDIR_PUSH;
- redirect(cmd->ncmd.redirect, mode);
- savecmdname = commandname;
- if (IS_BUILTIN_SPECIAL(firstbltin)) {
- listsetvar(varlist.list);
- } else {
- cmdenviron = varlist.list;
- }
- e = -1;
- if (setjmp(jmploc.loc)) {
- e = exception;
- exitstatus = (e == EXINT)? SIGINT+128 : 2;
- goto cmddone;
- }
- savehandler = handler;
- handler = &jmploc;
- commandname = argv[0];
- argptr = argv + 1;
- optptr = NULL; /* initialize nextopt */
- exitstatus = (*cmdentry.u.cmd->builtinfunc)(argc, argv);
- flushall();
-cmddone:
- cmdenviron = NULL;
- if (e != EXSHELLPROC) {
- commandname = savecmdname;
- if (flags & EV_EXIT)
- exitshell(exitstatus);
+ FORCEINTON;
}
- handler = savehandler;
- if (e != -1) {
- if ((e != EXERROR && e != EXEXEC)
- || cmdentry.u.cmd == BLTINCMD
- || cmdentry.u.cmd == DOTCMD
- || cmdentry.u.cmd == EVALCMD
- || cmdentry.u.cmd == EXECCMD)
- exraise(e);
+ listsetvar(varlist.list, VEXPORT|VSTACK);
+ shellexec(argv, path, cmdentry.u.index);
+ /* NOTREACHED */
+
+ case CMDBUILTIN:
+ cmdenviron = varlist.list;
+ if (cmdenviron) {
+ struct strlist *list = cmdenviron;
+ int i = VNOSET;
+ if (spclbltin > 0 || argc == 0) {
+ i = 0;
+ if (cmd_is_exec && argc > 1)
+ i = VEXPORT;
+ }
+ listsetvar(list, i);
+ }
+ if (evalbltin(cmdentry.u.cmd, argc, argv)) {
+ int exit_status;
+ int i, j;
+
+ i = exception;
+ if (i == EXEXIT)
+ goto raise;
+
+ exit_status = 2;
+ j = 0;
+ if (i == EXINT)
+ j = SIGINT;
+ if (i == EXSIG)
+ j = pendingsigs;
+ if (j)
+ exit_status = j + 128;
+ exitstatus = exit_status;
+
+ if (i == EXINT || spclbltin > 0) {
+raise:
+ longjmp(handler->loc, 1);
+ }
FORCEINTON;
}
- if (cmdentry.u.cmd != EXECCMD)
- popredir();
- } else {
-#ifdef DEBUG
- trputs("normal command: "); trargs(argv);
-#endif
- redirect(cmd->ncmd.redirect, 0);
- clearredir();
- for (sp = varlist.list ; sp ; sp = sp->next)
- setvareq(sp->text, VEXPORT|VSTACK);
- envp = environment();
- shellexec(argv, envp, path, cmdentry.u.index);
- }
- goto out;
+ break;
-parent: /* parent process gets here (if we forked) */
- if (mode == 0) { /* argument to fork */
- INTOFF;
- exitstatus = waitforjob(jp);
- INTON;
+ case CMDFUNCTION:
+ listsetvar(varlist.list, 0);
+ if (evalfun(cmdentry.u.func, argc, argv, flags))
+ goto raise;
+ break;
}
out:
+ popredir(cmd_is_exec);
if (lastarg)
+ /* dsl: I think this is intended to be used to support
+ * '_' in 'vi' command mode during line editing...
+ * However I implemented that within libedit itself.
+ */
setvar("_", lastarg, 0);
popstackmark(&smark);
}
-/*
- * Evaluate a parse tree. The value is left in the global variable
- * exitstatus.
- */
-static void
-evaltree(n, flags)
- union node *n;
- int flags;
-{
- int checkexit = 0;
- if (n == NULL) {
- TRACE(("evaltree(NULL) called\n"));
- goto out;
- }
- TRACE(("evaltree(0x%lx: %d) called\n", (long)n, n->type));
- switch (n->type) {
- case NSEMI:
- evaltree(n->nbinary.ch1, flags & EV_TESTED);
- if (evalskip)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NAND:
- evaltree(n->nbinary.ch1, EV_TESTED);
- if (evalskip || exitstatus != 0)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NOR:
- evaltree(n->nbinary.ch1, EV_TESTED);
- if (evalskip || exitstatus == 0)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NREDIR:
- expredir(n->nredir.redirect);
- redirect(n->nredir.redirect, REDIR_PUSH);
- evaltree(n->nredir.n, flags);
- popredir();
- break;
- case NSUBSHELL:
- evalsubshell(n, flags);
- break;
- case NBACKGND:
- evalsubshell(n, flags);
- break;
- case NIF: {
- evaltree(n->nif.test, EV_TESTED);
- if (evalskip)
- goto out;
- if (exitstatus == 0)
- evaltree(n->nif.ifpart, flags);
- else if (n->nif.elsepart)
- evaltree(n->nif.elsepart, flags);
- else
- exitstatus = 0;
- break;
- }
- case NWHILE:
- case NUNTIL:
- evalloop(n, flags);
- break;
- case NFOR:
- evalfor(n, flags);
- break;
- case NCASE:
- evalcase(n, flags);
- break;
- case NDEFUN: {
- struct builtincmd *bcmd;
- struct cmdentry entry;
- if (
- (bcmd = find_builtin(n->narg.text)) &&
- IS_BUILTIN_SPECIAL(bcmd)
- ) {
- out2fmt("%s is a special built-in\n", n->narg.text);
- exitstatus = 1;
- break;
- }
- entry.cmdtype = CMDFUNCTION;
- entry.u.func = copyfunc(n->narg.next);
- addcmdentry(n->narg.text, &entry);
- exitstatus = 0;
- break;
- }
- case NNOT:
- evaltree(n->nnot.com, EV_TESTED);
- exitstatus = !exitstatus;
- break;
-
- case NPIPE:
- evalpipe(n);
- checkexit = 1;
- break;
- case NCMD:
- evalcommand(n, flags);
- checkexit = 1;
- break;
-#ifdef DEBUG
- default:
- printf("Node type = %d\n", n->type);
- break;
-#endif
- }
-out:
- if (pendingsigs)
- dotrap();
- if (
- flags & EV_EXIT ||
- (checkexit && eflag && exitstatus && !(flags & EV_TESTED))
- )
- exitshell(exitstatus);
-}
-
-/*
- * Kick off a subshell to evaluate a tree.
- */
-
-static void
-evalsubshell(const union node *n, int flags)
-{
- struct job *jp;
- int backgnd = (n->type == NBACKGND);
-
- expredir(n->nredir.redirect);
- jp = makejob(n, 1);
- if (forkshell(jp, n, backgnd) == 0) {
- if (backgnd)
- flags &=~ EV_TESTED;
- redirect(n->nredir.redirect, 0);
- evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */
- }
- if (! backgnd) {
- INTOFF;
- exitstatus = waitforjob(jp);
- INTON;
- }
-}
-
-/*
- * Compute the names of the files in a redirection list.
- */
-
-static void fixredir(union node *n, const char *text, int err);
+static int
+evalbltin(const struct builtincmd *cmd, int argc, char **argv) {
+ char *volatile savecmdname;
+ struct jmploc *volatile savehandler;
+ struct jmploc jmploc;
+ int i;
-static void
-expredir(union node *n)
-{
- union node *redir;
+ savecmdname = commandname;
+ if ((i = setjmp(jmploc.loc)))
+ goto cmddone;
+ savehandler = handler;
+ handler = &jmploc;
+ commandname = argv[0];
+ argptr = argv + 1;
+ optptr = NULL; /* initialize nextopt */
+ exitstatus = (*cmd->builtin)(argc, argv);
+ flushall();
+cmddone:
+ exitstatus |= ferror(stdout);
+ commandname = savecmdname;
+ exsig = 0;
+ handler = savehandler;
- for (redir = n ; redir ; redir = redir->nfile.next) {
- struct arglist fn;
- fn.lastp = &fn.list;
- oexitstatus = exitstatus;
- switch (redir->type) {
- case NFROMTO:
- case NFROM:
- case NTO:
- case NAPPEND:
- case NTOOV:
- expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
- redir->nfile.expfname = fn.list->text;
- break;
- case NFROMFD:
- case NTOFD:
- if (redir->ndup.vname) {
- expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE);
- fixredir(redir, fn.list->text, 1);
- }
- break;
- }
- }
+ return i;
}
-
-/*
- * Execute a command inside back quotes. If it's a builtin command, we
- * want to save its output in a block obtained from malloc. Otherwise
- * we fork off a subprocess and get the output of the command via a pipe.
- * Should be called with interrupts off.
- */
-
-static void
-evalbackcmd(union node *n, struct backcmd *result)
+static int
+evalfun(struct funcnode *func, int argc, char **argv, int flags)
{
- int pip[2];
- struct job *jp;
- struct stackmark smark; /* unnecessary */
+ volatile struct shparam saveparam;
+ struct localvar *volatile savelocalvars;
+ struct jmploc *volatile savehandler;
+ struct jmploc jmploc;
+ int e;
- setstackmark(&smark);
- result->fd = -1;
- result->buf = NULL;
- result->nleft = 0;
- result->jp = NULL;
- if (n == NULL) {
- exitstatus = 0;
- goto out;
+ saveparam = shellparam;
+ savelocalvars = localvars;
+ if ((e = setjmp(jmploc.loc))) {
+ goto funcdone;
}
- exitstatus = 0;
- if (pipe(pip) < 0)
- error("Pipe call failed");
- jp = makejob(n, 1);
- if (forkshell(jp, n, FORK_NOJOB) == 0) {
- FORCEINTON;
- close(pip[0]);
- if (pip[1] != 1) {
- close(1);
- dup_as_newfd(pip[1], 1);
- close(pip[1]);
- }
- eflag = 0;
- evaltree(n, EV_EXIT);
+ INTOFF;
+ savehandler = handler;
+ handler = &jmploc;
+ localvars = NULL;
+ shellparam.malloc = 0;
+ func->count++;
+ INTON;
+ shellparam.nparam = argc - 1;
+ shellparam.p = argv + 1;
+#ifdef BB_ASH_GETOPTS
+ shellparam.optind = 1;
+ shellparam.optoff = -1;
+#endif
+ funcnest++;
+ evaltree(&func->n, flags & EV_TESTED);
+ funcnest--;
+funcdone:
+ INTOFF;
+ freefunc(func);
+ poplocalvars();
+ localvars = savelocalvars;
+ freeparam(&shellparam);
+ shellparam = saveparam;
+ handler = savehandler;
+ INTON;
+ if (evalskip == SKIPFUNC) {
+ evalskip = 0;
+ skipcount = 0;
}
- close(pip[1]);
- result->fd = pip[0];
- result->jp = jp;
-out:
- popstackmark(&smark);
- TRACE(("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
- result->fd, result->buf, result->nleft, result->jp));
+ return e;
}
/*
- * Execute a simple command.
- */
-
-/*
* Search for a command. This is called before we fork so that the
* location of the command will be available in the parent as well as
- * the child. The check for "goodname" is an overly conservative
- * check that the name will not be subject to expansion.
+ * the child.
*/
static void
-prehash(n)
- union node *n;
+prehash(union node *n)
{
struct cmdentry entry;
if (n->type == NCMD && n->ncmd.args)
- if (goodname(n->ncmd.args->narg.text))
- find_command(n->ncmd.args->narg.text, &entry, 0,
- pathval());
+ find_command(n->ncmd.args->narg.text, &entry, 0, pathval());
}
+
/*
* Builtin commands. Builtin commands whose functions are closely
* tied to evaluation are implemented here.
*/
/*
- * No command given, or a bltin command with no arguments. Set the
- * specified variables.
+ * No command given.
*/
-int
-bltincmd(argc, argv)
- int argc;
- char **argv;
+static int
+bltincmd(int argc, char **argv)
{
/*
* Preserve exitstatus of a previous possible redirection
* as POSIX mandates
*/
- return exitstatus;
+ return back_exitstatus;
}
@@ -3212,12 +3557,12 @@ bltincmd(argc, argv)
*/
static int
-breakcmd(argc, argv)
- int argc;
- char **argv;
+breakcmd(int argc, char **argv)
{
int n = argc > 1 ? number(argv[1]) : 1;
+ if (n <= 0)
+ error(illnum, argv[1]);
if (n > loopnest)
n = loopnest;
if (n > 0) {
@@ -3233,11 +3578,9 @@ breakcmd(argc, argv)
*/
static int
-returncmd(argc, argv)
- int argc;
- char **argv;
+returncmd(int argc, char **argv)
{
- int ret = argc > 1 ? number(argv[1]) : oexitstatus;
+ int ret = argc > 1 ? number(argv[1]) : exitstatus;
if (funcnest) {
evalskip = SKIPFUNC;
@@ -3253,105 +3596,87 @@ returncmd(argc, argv)
}
-#ifndef BB_TRUE_FALSE
static int
-false_main(argc, argv)
- int argc;
- char **argv;
+falsecmd(int argc, char **argv)
{
return 1;
}
static int
-true_main(argc, argv)
- int argc;
- char **argv;
+truecmd(int argc, char **argv)
{
return 0;
}
-#endif
-
-/*
- * Controls whether the shell is interactive or not.
- */
-
-static void setsignal(int signo);
-static void chkmail(int silent);
-
-
-static void
-setinteractive(int on)
-{
- static int is_interactive;
- static int do_banner=0;
-
- if (on == is_interactive)
- return;
- setsignal(SIGINT);
- setsignal(SIGQUIT);
- setsignal(SIGTERM);
- chkmail(1);
- is_interactive = on;
- if (do_banner==0 && is_interactive) {
- /* Looks like they want an interactive shell */
- printf( "\n\n" BB_BANNER " Built-in shell (ash)\n");
- printf( "Enter 'help' for a list of built-in commands.\n\n");
- do_banner=1;
- }
-}
-
-static void
-optschanged(void)
-{
- setinteractive(iflag);
- setjobctl(mflag);
-}
static int
-execcmd(argc, argv)
- int argc;
- char **argv;
+execcmd(int argc, char **argv)
{
if (argc > 1) {
- struct strlist *sp;
-
iflag = 0; /* exit on error */
mflag = 0;
optschanged();
- for (sp = cmdenviron; sp ; sp = sp->next)
- setvareq(sp->text, VEXPORT|VSTACK);
- shellexec(argv + 1, environment(), pathval(), 0);
+ shellexec(argv + 1, pathval(), 0);
}
return 0;
}
-static void
-eprintlist(struct strlist *sp)
-{
- for (; sp; sp = sp->next) {
- out2fmt(" %s",sp->text);
- }
-}
+
+/* $NetBSD: exec.c,v 1.35 2003/01/22 20:36:04 dsl Exp $ */
+
+/*
+ * When commands are first encountered, they are entered in a hash table.
+ * This ensures that a full path search will not have to be done for them
+ * on each invocation.
+ *
+ * We should investigate converting to a linear search, even though that
+ * would make the command name "hash" a misnomer.
+ */
+
+#define CMDTABLESIZE 31 /* should be prime */
+#define ARB 1 /* actual size determined at run time */
+
+
+
+struct tblentry {
+ struct tblentry *next; /* next entry in hash chain */
+ union param param; /* definition of builtin function */
+ short cmdtype; /* index identifying command */
+ char rehash; /* if set, cd done since entry created */
+ char cmdname[ARB]; /* name of command */
+};
+
+
+static struct tblentry *cmdtable[CMDTABLESIZE];
+static int builtinloc = -1; /* index in path of %builtin, or -1 */
+
+
+static void tryexec(char *, char **, char **);
+static void clearcmdentry(int);
+static struct tblentry *cmdlookup(const char *, int);
+static void delete_cmd_entry(void);
+
/*
* Exec a program. Never returns. If you change this routine, you may
* have to change the find_command routine as well.
*/
-static const char *pathopt; /* set by padvance */
-
static void
-shellexec(argv, envp, path, idx)
- char **argv, **envp;
- const char *path;
- int idx;
+shellexec(char **argv, const char *path, int idx)
{
char *cmdname;
int e;
+ char **envp;
- if (strchr(argv[0], '/') != NULL) {
+ clearredir(1);
+ envp = environment();
+ if (strchr(argv[0], '/') != NULL
+#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+ || find_applet_by_name(argv[0])
+#endif
+ ) {
tryexec(argv[0], argv, envp);
e = errno;
} else {
@@ -3378,263 +3703,77 @@ shellexec(argv, envp, path, idx)
exerrno = 2;
break;
}
+ TRACE(("shellexec failed for %s, errno %d, suppressint %d\n",
+ argv[0], e, suppressint ));
exerror(EXEXEC, "%s: %s", argv[0], errmsg(e, E_EXEC));
/* NOTREACHED */
}
-/*
- * Clear traps on a fork.
- */
+
static void
-clear_traps(void) {
- char **tp;
+tryexec(char *cmd, char **argv, char **envp)
+{
+ int repeated = 0;
+#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+ int flg_bb = 0;
+ char *name = cmd;
- for (tp = trap ; tp < &trap[NSIG] ; tp++) {
- if (*tp && **tp) { /* trap not NULL or SIG_IGN */
- INTOFF;
- ckfree(*tp);
- *tp = NULL;
- if (tp != &trap[0])
- setsignal(tp - trap);
- INTON;
+#ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+ name = bb_get_last_path_component(name);
+ if(find_applet_by_name(name) != NULL)
+ flg_bb = 1;
+#else
+ if(strchr(name, '/') == NULL && find_applet_by_name(name) != NULL) {
+ flg_bb = 1;
+ }
+#endif
+ if(flg_bb) {
+ char **ap;
+ char **new;
+
+ *argv = name;
+ if(strcmp(name, "busybox")) {
+ for (ap = argv; *ap; ap++);
+ ap = new = xmalloc((ap - argv + 2) * sizeof(char *));
+ *ap++ = cmd = "/bin/busybox";
+ while ((*ap++ = *argv++));
+ argv = new;
+ repeated++;
+ } else {
+ cmd = "/bin/busybox";
}
}
-}
-
-
-static void
-initshellproc(void) {
-
-#ifdef ASH_ALIAS
- /* from alias.c: */
- {
- rmaliases();
- }
-#endif
- /* from eval.c: */
- {
- exitstatus = 0;
- }
-
- /* from exec.c: */
- {
- deletefuncs();
- }
-
- /* from jobs.c: */
- {
- backgndpid = -1;
-#ifdef JOBS
- jobctl = 0;
#endif
- }
-
- /* from options.c: */
- {
- int i;
-
- for (i = 0; i < NOPTS; i++)
- optent_val(i) = 0;
- optschanged();
-
- }
-
- /* from redir.c: */
- {
- clearredir();
- }
- /* from trap.c: */
- {
- char *sm;
-
- clear_traps();
- for (sm = sigmode ; sm < sigmode + NSIG - 1; sm++) {
- if (*sm == S_IGN)
- *sm = S_HARD_IGN;
- }
- }
-
- /* from var.c: */
- {
- shprocvar();
- }
-}
-
-static int preadbuffer(void);
-static void pushfile (void);
-
-/*
- * Read a character from the script, returning PEOF on end of file.
- * Nul characters in the input are silently discarded.
- */
-
-#ifndef ASH_OPTIMIZE_FOR_SIZE
-#define pgetc_macro() (--parsenleft >= 0? *parsenextc++ : preadbuffer())
-static int
-pgetc(void)
-{
- return pgetc_macro();
-}
+repeat:
+#ifdef SYSV
+ do {
+ execve(cmd, argv, envp);
+ } while (errno == EINTR);
#else
-static int
-pgetc_macro(void)
-{
- return --parsenleft >= 0? *parsenextc++ : preadbuffer();
-}
-
-static inline int
-pgetc(void)
-{
- return pgetc_macro();
-}
+ execve(cmd, argv, envp);
#endif
+ if (repeated++) {
+ ckfree(argv);
+ } else if (errno == ENOEXEC) {
+ char **ap;
+ char **new;
-
-/*
- * Undo the last call to pgetc. Only one character may be pushed back.
- * PEOF may be pushed back.
- */
-
-static void
-pungetc() {
- parsenleft++;
- parsenextc--;
-}
-
-
-static void
-popfile(void) {
- struct parsefile *pf = parsefile;
-
- INTOFF;
- if (pf->fd >= 0)
- close(pf->fd);
- if (pf->buf)
- ckfree(pf->buf);
- while (pf->strpush)
- popstring();
- parsefile = pf->prev;
- ckfree(pf);
- parsenleft = parsefile->nleft;
- parselleft = parsefile->lleft;
- parsenextc = parsefile->nextc;
- plinno = parsefile->linno;
- INTON;
-}
-
-
-/*
- * Return to top level.
- */
-
-static void
-popallfiles(void) {
- while (parsefile != &basepf)
- popfile();
-}
-
-/*
- * Close the file(s) that the shell is reading commands from. Called
- * after a fork is done.
- */
-
-static void
-closescript() {
- popallfiles();
- if (parsefile->fd > 0) {
- close(parsefile->fd);
- parsefile->fd = 0;
+ for (ap = argv; *ap; ap++)
+ ;
+ ap = new = ckmalloc((ap - argv + 2) * sizeof(char *));
+ ap[1] = cmd;
+ *ap = cmd = (char *)"/bin/sh";
+ ap += 2;
+ argv++;
+ while ((*ap++ = *argv++))
+ ;
+ argv = new;
+ goto repeat;
}
}
-/*
- * Like setinputfile, but takes an open file descriptor. Call this with
- * interrupts off.
- */
-
-static void
-setinputfd(fd, push)
- int fd, push;
-{
- (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
- if (push) {
- pushfile();
- parsefile->buf = 0;
- } else {
- closescript();
- while (parsefile->strpush)
- popstring();
- }
- parsefile->fd = fd;
- if (parsefile->buf == NULL)
- parsefile->buf = ckmalloc(BUFSIZ);
- parselleft = parsenleft = 0;
- plinno = 1;
-}
-
-
-/*
- * Set the input to take input from a file. If push is set, push the
- * old input onto the stack first.
- */
-
-static void
-setinputfile(const char *fname, int push)
-{
- int fd;
- int myfileno2;
-
- INTOFF;
- if ((fd = open(fname, O_RDONLY)) < 0)
- error("Can't open %s", fname);
- if (fd < 10) {
- myfileno2 = dup_as_newfd(fd, 10);
- close(fd);
- if (myfileno2 < 0)
- error("Out of file descriptors");
- fd = myfileno2;
- }
- setinputfd(fd, push);
- INTON;
-}
-
-
-static void
-tryexec(char *cmd, char **argv, char **envp)
-{
- int e;
-
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- char *name = cmd;
- char** argv_l=argv;
- int argc_l;
-#ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
- name = get_last_path_component(name);
-#endif
- argv_l=envp;
- for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++)
- putenv(*argv_l);
- argv_l=argv;
- for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++)
- optind = 1;
- run_applet_by_name(name, argc_l, argv);
-#endif
- execve(cmd, argv, envp);
- e = errno;
- if (e == ENOEXEC) {
- INTOFF;
- initshellproc();
- setinputfile(cmd, 0);
- commandname = arg0 = savestr(argv[0]);
- setparam(argv + 1);
- exraise(EXSHELLPROC);
- }
- errno = e;
-}
-
-static char *commandtext (const union node *);
/*
* Do a path search. The variable path (passed by reference) should be
@@ -3646,18 +3785,13 @@ static char *commandtext (const union node *);
* NULL.
*/
-static const char *pathopt;
-
-static void growstackblock(void);
-
-
static char *
padvance(const char **path, const char *name)
{
const char *p;
char *q;
const char *start;
- int len;
+ size_t len;
if (*path == NULL)
return NULL;
@@ -3685,186 +3819,70 @@ padvance(const char **path, const char *name)
return stalloc(len);
}
-/*
- * Wrapper around strcmp for qsort/bsearch/...
- */
-static int
-pstrcmp(const void *a, const void *b)
-{
- return strcmp((const char *) a, *(const char *const *) b);
-}
-/*
- * Find a keyword is in a sorted array.
- */
+/*** Command hashing code ***/
-static const char *const *
-findkwd(const char *s)
+static void
+printentry(struct tblentry *cmdp)
{
- return bsearch(s, parsekwd, sizeof(parsekwd) / sizeof(const char *),
- sizeof(const char *), pstrcmp);
-}
-
+ int idx;
+ const char *path;
+ char *name;
-/*** Command hashing code ***/
+ idx = cmdp->param.index;
+ path = pathval();
+ do {
+ name = padvance(&path, cmdp->cmdname);
+ stunalloc(name);
+ } while (--idx >= 0);
+ out1fmt("%s%s\n", name, (cmdp->rehash ? "*" : nullstr));
+}
static int
-hashcmd(argc, argv)
- int argc;
- char **argv;
+hashcmd(int argc, char **argv)
{
struct tblentry **pp;
struct tblentry *cmdp;
int c;
- int verbose;
struct cmdentry entry;
char *name;
-#ifdef ASH_ALIAS
- const struct alias *ap;
-#endif
- verbose = 0;
- while ((c = nextopt("rvV")) != '\0') {
- if (c == 'r') {
- clearcmdentry(0);
- return 0;
- } else if (c == 'v' || c == 'V') {
- verbose = c;
- }
+ while ((c = nextopt("r")) != '\0') {
+ clearcmdentry(0);
+ return 0;
}
if (*argptr == NULL) {
for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
- if (cmdp->cmdtype != CMDBUILTIN) {
- printentry(cmdp, verbose);
- }
+ if (cmdp->cmdtype == CMDNORMAL)
+ printentry(cmdp);
}
}
return 0;
}
c = 0;
- while ((name = *argptr++) != NULL) {
+ while ((name = *argptr) != NULL) {
if ((cmdp = cmdlookup(name, 0)) != NULL
&& (cmdp->cmdtype == CMDNORMAL
|| (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
delete_cmd_entry();
-#ifdef ASH_ALIAS
- /* Then look at the aliases */
- if ((ap = lookupalias(name, 0)) != NULL) {
- if (verbose=='v')
- printf("%s is an alias for %s\n", name, ap->val);
- else
- printalias(ap);
- continue;
- }
-#endif
- /* First look at the keywords */
- if (findkwd(name)!=0) {
- if (verbose=='v')
- printf("%s is a shell keyword\n", name);
- else
- printf(snlfmt, name);
- continue;
- }
-
find_command(name, &entry, DO_ERR, pathval());
- if (entry.cmdtype == CMDUNKNOWN) c = 1;
- else if (verbose) {
- cmdp = cmdlookup(name, 0);
- if (cmdp) printentry(cmdp, verbose=='v');
- flushall();
- }
+ if (entry.cmdtype == CMDUNKNOWN)
+ c = 1;
+ argptr++;
}
return c;
}
-static void
-printentry(cmdp, verbose)
- struct tblentry *cmdp;
- int verbose;
- {
- int idx;
- const char *path;
- char *name;
-
- printf("%s%s", cmdp->cmdname, (verbose ? " is " : ""));
- if (cmdp->cmdtype == CMDNORMAL) {
- idx = cmdp->param.index;
- path = pathval();
- do {
- name = padvance(&path, cmdp->cmdname);
- stunalloc(name);
- } while (--idx >= 0);
- if(verbose)
- out1str(name);
- } else if (cmdp->cmdtype == CMDBUILTIN) {
- if(verbose)
- out1str("a shell builtin");
- } else if (cmdp->cmdtype == CMDFUNCTION) {
- if (verbose) {
- INTOFF;
- out1str("a function\n");
- name = commandtext(cmdp->param.func);
- printf("%s() {\n %s\n}", cmdp->cmdname, name);
- ckfree(name);
- INTON;
- }
-#ifdef DEBUG
- } else {
- error("internal error: cmdtype %d", cmdp->cmdtype);
-#endif
- }
- printf(snlfmt, cmdp->rehash ? "*" : nullstr);
-}
-
-
-
-/*** List the available builtins ***/
-
-
-static int helpcmd(int argc, char** argv)
-{
- int col, i;
-
- printf("\nBuilt-in commands:\n-------------------\n");
- for (col=0, i=0; i < NUMBUILTINS; i++) {
- col += printf("%c%s", ((col == 0) ? '\t' : ' '),
- builtincmds[i].name+1);
- if (col > 60) {
- printf("\n");
- col = 0;
- }
- }
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- {
- extern const struct BB_applet applets[];
- extern const size_t NUM_APPLETS;
-
- for (i=0; i < NUM_APPLETS; i++) {
-
- col += printf("%c%s", ((col == 0) ? '\t' : ' '),
- applets[i].name);
- if (col > 60) {
- printf("\n");
- col = 0;
- }
- }
- }
-#endif
- printf("\n\n");
- return EXIT_SUCCESS;
-}
/*
* Resolve a command name. If you change this routine, you may have to
* change the shellexec routine as well.
*/
-static int prefix (const char *, const char *);
-
static void
-find_command(const char *name, struct cmdentry *entry, int act, const char *path)
+find_command(char *name, struct cmdentry *entry, int act, const char *path)
{
struct tblentry *cmdp;
int idx;
@@ -3872,90 +3890,74 @@ find_command(const char *name, struct cmdentry *entry, int act, const char *path
char *fullname;
struct stat statb;
int e;
- int bltin;
- int firstchange;
int updatetbl;
- int regular;
struct builtincmd *bcmd;
- /* If name contains a slash, don't use the hash table */
+ /* If name contains a slash, don't use PATH or hash table */
if (strchr(name, '/') != NULL) {
+ entry->u.index = -1;
if (act & DO_ABS) {
while (stat(name, &statb) < 0) {
- if (errno != ENOENT && errno != ENOTDIR)
- e = errno;
+#ifdef SYSV
+ if (errno == EINTR)
+ continue;
+#endif
entry->cmdtype = CMDUNKNOWN;
- entry->u.index = -1;
return;
}
- entry->cmdtype = CMDNORMAL;
- entry->u.index = -1;
- return;
}
entry->cmdtype = CMDNORMAL;
- entry->u.index = 0;
return;
}
- updatetbl = 1;
- if (act & DO_BRUTE) {
- firstchange = path_change(path, &bltin);
- } else {
- bltin = builtinloc;
- firstchange = 9999;
+#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+ if (find_applet_by_name(name)) {
+ entry->cmdtype = CMDNORMAL;
+ entry->u.index = -1;
+ return;
}
+#endif
- /* If name is in the table, and not invalidated by cd, we're done */
- if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) {
- if (cmdp->cmdtype == CMDFUNCTION) {
- if (act & DO_NOFUN) {
- updatetbl = 0;
- } else {
- goto success;
- }
- } else if (act & DO_BRUTE) {
- if ((cmdp->cmdtype == CMDNORMAL &&
- cmdp->param.index >= firstchange) ||
- (cmdp->cmdtype == CMDBUILTIN &&
- ((builtinloc < 0 && bltin >= 0) ?
- bltin : builtinloc) >= firstchange)) {
- /* need to recompute the entry */
- } else {
- goto success;
- }
- } else {
- goto success;
- }
+ updatetbl = (path == pathval());
+ if (!updatetbl) {
+ act |= DO_ALTPATH;
+ if (strstr(path, "%builtin") != NULL)
+ act |= DO_ALTBLTIN;
}
- bcmd = find_builtin(name);
- regular = bcmd && IS_BUILTIN_REGULAR(bcmd);
+ /* If name is in the table, check answer will be ok */
+ if ((cmdp = cmdlookup(name, 0)) != NULL) {
+ int bit;
- if (regular) {
- if (cmdp && (cmdp->cmdtype == CMDBUILTIN)) {
- goto success;
+ switch (cmdp->cmdtype) {
+ default:
+#if DEBUG
+ abort();
+#endif
+ case CMDNORMAL:
+ bit = DO_ALTPATH;
+ break;
+ case CMDFUNCTION:
+ bit = DO_NOFUNC;
+ break;
+ case CMDBUILTIN:
+ bit = DO_ALTBLTIN;
+ break;
}
- } else if (act & DO_BRUTE) {
- if (firstchange == 0) {
+ if (act & bit) {
updatetbl = 0;
- }
+ cmdp = NULL;
+ } else if (cmdp->rehash == 0)
+ /* if not invalidated by cd, we're done */
+ goto success;
}
/* If %builtin not in path, check for builtin next */
- if (regular || (bltin < 0 && bcmd)) {
-builtin:
- if (!updatetbl) {
- entry->cmdtype = CMDBUILTIN;
- entry->u.cmd = bcmd;
- return;
- }
- INTOFF;
- cmdp = cmdlookup(name, 1);
- cmdp->cmdtype = CMDBUILTIN;
- cmdp->param.cmd = bcmd;
- INTON;
- goto success;
- }
+ bcmd = find_builtin(name);
+ if (bcmd && (IS_BUILTIN_REGULAR(bcmd) || (
+ act & DO_ALTPATH ? !(act & DO_ALTBLTIN) : builtinloc <= 0
+ )))
+ goto builtin_success;
/* We have to search path. */
prev = -1; /* where to start */
@@ -3972,31 +3974,31 @@ loop:
while ((fullname = padvance(&path, name)) != NULL) {
stunalloc(fullname);
idx++;
- if (idx >= firstchange) {
- updatetbl = 0;
- }
if (pathopt) {
- if (prefix("builtin", pathopt)) {
- if ((bcmd = find_builtin(name))) {
- goto builtin;
- }
+ if (prefix(pathopt, "builtin")) {
+ if (bcmd)
+ goto builtin_success;
continue;
- } else if (!(act & DO_NOFUN) &&
- prefix("func", pathopt)) {
+ } else if (!(act & DO_NOFUNC) &&
+ prefix(pathopt, "func")) {
/* handled below */
} else {
- continue; /* ignore unimplemented options */
+ /* ignore unimplemented options */
+ continue;
}
}
/* if rehash, don't redo absolute path names */
- if (fullname[0] == '/' && idx <= prev &&
- idx < firstchange) {
+ if (fullname[0] == '/' && idx <= prev) {
if (idx < prev)
continue;
TRACE(("searchexec \"%s\": no change\n", name));
goto success;
}
while (stat(fullname, &statb) < 0) {
+#ifdef SYSV
+ if (errno == EINTR)
+ continue;
+#endif
if (errno != ENOENT && errno != ENOTDIR)
e = errno;
goto loop;
@@ -4007,14 +4009,13 @@ loop:
if (pathopt) { /* this is a %func directory */
stalloc(strlen(fullname) + 1);
readcmdfile(fullname);
- if ((cmdp = cmdlookup(name, 0)) == NULL || cmdp->cmdtype != CMDFUNCTION)
+ if ((cmdp = cmdlookup(name, 0)) == NULL ||
+ cmdp->cmdtype != CMDFUNCTION)
error("%s not defined in %s", name, fullname);
stunalloc(fullname);
goto success;
}
TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
- /* If we aren't called with DO_BRUTE and cmdp is set, it must
- be a function and we're being called with DO_NOFUN */
if (!updatetbl) {
entry->cmdtype = CMDNORMAL;
entry->u.index = idx;
@@ -4032,10 +4033,21 @@ loop:
if (cmdp && updatetbl)
delete_cmd_entry();
if (act & DO_ERR)
- out2fmt("%s: %s\n", name, errmsg(e, E_EXEC));
+ sh_warnx("%s: %s", name, errmsg(e, E_EXEC));
entry->cmdtype = CMDUNKNOWN;
return;
+builtin_success:
+ if (!updatetbl) {
+ entry->cmdtype = CMDBUILTIN;
+ entry->u.cmd = bcmd;
+ return;
+ }
+ INTOFF;
+ cmdp = cmdlookup(name, 1);
+ cmdp->cmdtype = CMDBUILTIN;
+ cmdp->param.cmd = bcmd;
+ INTON;
success:
cmdp->rehash = 0;
entry->cmdtype = cmdp->cmdtype;
@@ -4043,43 +4055,50 @@ success:
}
-
/*
- * Search the table of builtin commands.
+ * Wrapper around strcmp for qsort/bsearch/...
*/
-
-static int
-bstrcmp(const void *name, const void *b)
+static int pstrcmp(const void *a, const void *b)
{
- return strcmp((const char *)name, (*(const char *const *) b)+1);
+ return strcmp((const char *) a, (*(const char *const *) b) + 1);
}
+/*
+ * Search the table of builtin commands.
+ */
+
static struct builtincmd *
find_builtin(const char *name)
{
struct builtincmd *bp;
- bp = bsearch(name, builtincmds, NUMBUILTINS, sizeof(struct builtincmd),
- bstrcmp
+ bp = bsearch(
+ name, builtincmd, NUMBUILTINS, sizeof(struct builtincmd),
+ pstrcmp
);
return bp;
}
+
/*
* Called when a cd is done. Marks all commands so the next time they
* are executed they will be rehashed.
*/
static void
-hashcd(void) {
+hashcd(void)
+{
struct tblentry **pp;
struct tblentry *cmdp;
for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
- if (cmdp->cmdtype == CMDNORMAL
- || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))
+ if (cmdp->cmdtype == CMDNORMAL || (
+ cmdp->cmdtype == CMDBUILTIN &&
+ !(IS_BUILTIN_REGULAR(cmdp->param.cmd)) &&
+ builtinloc > 0
+ ))
cmdp->rehash = 1;
}
}
@@ -4088,22 +4107,48 @@ hashcd(void) {
/*
+ * Fix command hash table when PATH changed.
* Called before PATH is changed. The argument is the new value of PATH;
- * pathval() still returns the old value at this point. Called with
- * interrupts off.
+ * pathval() still returns the old value at this point.
+ * Called with interrupts off.
*/
static void
changepath(const char *newval)
{
+ const char *old, *new;
+ int idx;
int firstchange;
- int bltin;
+ int idx_bltin;
- firstchange = path_change(newval, &bltin);
- if (builtinloc < 0 && bltin >= 0)
- builtinloc = bltin; /* zap builtins */
+ old = pathval();
+ new = newval;
+ firstchange = 9999; /* assume no change */
+ idx = 0;
+ idx_bltin = -1;
+ for (;;) {
+ if (*old != *new) {
+ firstchange = idx;
+ if ((*old == '\0' && *new == ':')
+ || (*old == ':' && *new == '\0'))
+ firstchange++;
+ old = new; /* ignore subsequent differences */
+ }
+ if (*new == '\0')
+ break;
+ if (*new == '%' && idx_bltin < 0 && prefix(new + 1, "builtin"))
+ idx_bltin = idx;
+ if (*new == ':') {
+ idx++;
+ }
+ new++, old++;
+ }
+ if (builtinloc < 0 && idx_bltin >= 0)
+ builtinloc = idx_bltin; /* zap builtins */
+ if (builtinloc >= 0 && idx_bltin < 0)
+ firstchange = 0;
clearcmdentry(firstchange);
- builtinloc = bltin;
+ builtinloc = idx_bltin;
}
@@ -4113,8 +4158,7 @@ changepath(const char *newval)
*/
static void
-clearcmdentry(firstchange)
- int firstchange;
+clearcmdentry(int firstchange)
{
struct tblentry **tblp;
struct tblentry **pp;
@@ -4139,33 +4183,6 @@ clearcmdentry(firstchange)
}
-/*
- * Delete all functions.
- */
-
-static void
-deletefuncs(void) {
- struct tblentry **tblp;
- struct tblentry **pp;
- struct tblentry *cmdp;
-
- INTOFF;
- for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) {
- pp = tblp;
- while ((cmdp = *pp) != NULL) {
- if (cmdp->cmdtype == CMDFUNCTION) {
- *pp = cmdp->next;
- freefunc(cmdp->param.func);
- ckfree(cmdp);
- } else {
- pp = &cmdp->next;
- }
- }
- }
- INTON;
-}
-
-
/*
* Locate a command in the command hash table. If "add" is nonzero,
@@ -4173,22 +4190,25 @@ deletefuncs(void) {
* variable "lastcmdentry" is set to point to the address of the link
* pointing to the entry, so that delete_cmd_entry can delete the
* entry.
+ *
+ * Interrupts must be off if called with add != 0.
*/
static struct tblentry **lastcmdentry;
+
static struct tblentry *
cmdlookup(const char *name, int add)
{
- int hashval;
+ unsigned int hashval;
const char *p;
struct tblentry *cmdp;
struct tblentry **pp;
p = name;
- hashval = *p << 4;
+ hashval = (unsigned char)*p << 4;
while (*p)
- hashval += *p++;
+ hashval += (unsigned char)*p++;
hashval &= 0x7FFF;
pp = &cmdtable[hashval % CMDTABLESIZE];
for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
@@ -4197,14 +4217,11 @@ cmdlookup(const char *name, int add)
pp = &cmdp->next;
}
if (add && cmdp == NULL) {
- INTOFF;
cmdp = *pp = ckmalloc(sizeof (struct tblentry) - ARB
+ strlen(name) + 1);
cmdp->next = NULL;
cmdp->cmdtype = CMDUNKNOWN;
- cmdp->rehash = 0;
strcpy(cmdp->cmdname, name);
- INTON;
}
lastcmdentry = pp;
return cmdp;
@@ -4215,49 +4232,76 @@ cmdlookup(const char *name, int add)
*/
static void
-delete_cmd_entry() {
+delete_cmd_entry(void)
+{
struct tblentry *cmdp;
INTOFF;
cmdp = *lastcmdentry;
*lastcmdentry = cmdp->next;
+ if (cmdp->cmdtype == CMDFUNCTION)
+ freefunc(cmdp->param.func);
ckfree(cmdp);
INTON;
}
+/*
+ * Add a new command entry, replacing any existing command entry for
+ * the same name - except special builtins.
+ */
+static inline void
+addcmdentry(char *name, struct cmdentry *entry)
+{
+ struct tblentry *cmdp;
+ cmdp = cmdlookup(name, 1);
+ if (cmdp->cmdtype == CMDFUNCTION) {
+ freefunc(cmdp->param.func);
+ }
+ cmdp->cmdtype = entry->cmdtype;
+ cmdp->param = entry->u;
+ cmdp->rehash = 0;
+}
-static const short nodesize[26] = {
- ALIGN(sizeof (struct nbinary)),
- ALIGN(sizeof (struct ncmd)),
- ALIGN(sizeof (struct npipe)),
- ALIGN(sizeof (struct nredir)),
- ALIGN(sizeof (struct nredir)),
- ALIGN(sizeof (struct nredir)),
- ALIGN(sizeof (struct nbinary)),
- ALIGN(sizeof (struct nbinary)),
- ALIGN(sizeof (struct nif)),
- ALIGN(sizeof (struct nbinary)),
- ALIGN(sizeof (struct nbinary)),
- ALIGN(sizeof (struct nfor)),
- ALIGN(sizeof (struct ncase)),
- ALIGN(sizeof (struct nclist)),
- ALIGN(sizeof (struct narg)),
- ALIGN(sizeof (struct narg)),
- ALIGN(sizeof (struct nfile)),
- ALIGN(sizeof (struct nfile)),
- ALIGN(sizeof (struct nfile)),
- ALIGN(sizeof (struct nfile)),
- ALIGN(sizeof (struct nfile)),
- ALIGN(sizeof (struct ndup)),
- ALIGN(sizeof (struct ndup)),
- ALIGN(sizeof (struct nhere)),
- ALIGN(sizeof (struct nhere)),
- ALIGN(sizeof (struct nnot)),
-};
+/*
+ * Make a copy of a parse tree.
+ */
+static inline struct funcnode *
+copyfunc(union node *n)
+{
+ struct funcnode *f;
+ size_t blocksize;
+
+ funcblocksize = offsetof(struct funcnode, n);
+ funcstringsize = 0;
+ calcsize(n);
+ blocksize = funcblocksize;
+ f = ckmalloc(blocksize + funcstringsize);
+ funcblock = (char *) f + offsetof(struct funcnode, n);
+ funcstring = (char *) f + blocksize;
+ copynode(n);
+ f->count = 0;
+ return f;
+}
+
+/*
+ * Define a shell function.
+ */
+
+static void
+defun(char *name, union node *func)
+{
+ struct cmdentry entry;
+
+ INTOFF;
+ entry.cmdtype = CMDFUNCTION;
+ entry.u.func = copyfunc(func);
+ addcmdentry(name, &entry);
+ INTON;
+}
/*
@@ -4265,44 +4309,140 @@ static const short nodesize[26] = {
*/
static void
-unsetfunc(char *name)
+unsetfunc(const char *name)
{
struct tblentry *cmdp;
- if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->cmdtype == CMDFUNCTION) {
- freefunc(cmdp->param.func);
+ if ((cmdp = cmdlookup(name, 0)) != NULL &&
+ cmdp->cmdtype == CMDFUNCTION)
delete_cmd_entry();
- }
}
-
/*
* Locate and print what a word is...
*/
+
+#ifdef BB_ASH_CMDCMD
+static int
+describe_command(char *command, int describe_command_verbose)
+#else
+#define describe_command_verbose 1
+static int
+describe_command(char *command)
+#endif
+{
+ struct cmdentry entry;
+ struct tblentry *cmdp;
+#ifdef BB_ASH_ALIAS
+ const struct alias *ap;
+#endif
+ const char *path = pathval();
+
+ if (describe_command_verbose) {
+ out1str(command);
+ }
+
+ /* First look at the keywords */
+ if (findkwd(command)) {
+ out1str(describe_command_verbose ? " is a shell keyword" : command);
+ goto out;
+ }
+
+#ifdef BB_ASH_ALIAS
+ /* Then look at the aliases */
+ if ((ap = lookupalias(command, 0)) != NULL) {
+ if (describe_command_verbose) {
+ out1fmt(" is an alias for %s", ap->val);
+ } else {
+ out1str("alias ");
+ printalias(ap);
+ return 0;
+ }
+ goto out;
+ }
+#endif
+ /* Then check if it is a tracked alias */
+ if ((cmdp = cmdlookup(command, 0)) != NULL) {
+ entry.cmdtype = cmdp->cmdtype;
+ entry.u = cmdp->param;
+ } else {
+ /* Finally use brute force */
+ find_command(command, &entry, DO_ABS, path);
+ }
+
+ switch (entry.cmdtype) {
+ case CMDNORMAL: {
+ int j = entry.u.index;
+ char *p;
+ if (j == -1) {
+ p = command;
+ } else {
+ do {
+ p = padvance(&path, command);
+ stunalloc(p);
+ } while (--j >= 0);
+ }
+ if (describe_command_verbose) {
+ out1fmt(" is%s %s",
+ (cmdp ? " a tracked alias for" : nullstr), p
+ );
+ } else {
+ out1str(p);
+ }
+ break;
+ }
+
+ case CMDFUNCTION:
+ if (describe_command_verbose) {
+ out1str(" is a shell function");
+ } else {
+ out1str(command);
+ }
+ break;
+
+ case CMDBUILTIN:
+ if (describe_command_verbose) {
+ out1fmt(" is a %sshell builtin",
+ IS_BUILTIN_SPECIAL(entry.u.cmd) ?
+ "special " : nullstr
+ );
+ } else {
+ out1str(command);
+ }
+ break;
+
+ default:
+ if (describe_command_verbose) {
+ out1str(": not found\n");
+ }
+ return 127;
+ }
+
+out:
+ outstr("\n", stdout);
+ return 0;
+}
+
static int
typecmd(int argc, char **argv)
{
int i;
int err = 0;
- char *argv_a[2];
-
- argv_a[1] = 0;
for (i = 1; i < argc; i++) {
- argv_a[0] = argv[i];
- argptr = argv_a;
- optptr = "v";
- err |= hashcmd(argc, argv);
+#ifdef BB_ASH_CMDCMD
+ err |= describe_command(argv[i], 1);
+#else
+ err |= describe_command(argv[i]);
+#endif
}
return err;
}
-#ifdef ASH_CMDCMD
+#ifdef BB_ASH_CMDCMD
static int
-commandcmd(argc, argv)
- int argc;
- char **argv;
+commandcmd(int argc, char **argv)
{
int c;
int default_path = 0;
@@ -4311,6 +4451,12 @@ commandcmd(argc, argv)
while ((c = nextopt("pvV")) != '\0')
switch (c) {
+ default:
+#ifdef DEBUG
+ fprintf(stderr,
+"command: nextopt returned character code 0%o\n", c);
+ return EX_SOFTWARE;
+#endif
case 'p':
default_path = 1;
break;
@@ -4324,70 +4470,35 @@ commandcmd(argc, argv)
if (default_path + verify_only + verbose_verify_only > 1 ||
!*argptr) {
- out2str(
+ fprintf(stderr,
"command [-p] command [arg ...]\n"
"command {-v|-V} command\n");
return EX_USAGE;
}
if (verify_only || verbose_verify_only) {
- char *argv_a[2];
-
- argv_a[1] = 0;
- argv_a[0] = *argptr;
- argptr = argv_a;
- optptr = verbose_verify_only ? "v" : "V"; /* reverse special */
- return hashcmd(argc, argv);
+ return describe_command(*argptr, verbose_verify_only);
}
return 0;
}
#endif
-static int
-path_change(newval, bltin)
- const char *newval;
- int *bltin;
-{
- const char *old, *new;
- int idx;
- int firstchange;
+/* $NetBSD: expand.c,v 1.56 2002/11/24 22:35:39 christos Exp $ */
- old = pathval();
- new = newval;
- firstchange = 9999; /* assume no change */
- idx = 0;
- *bltin = -1;
- for (;;) {
- if (*old != *new) {
- firstchange = idx;
- if ((*old == '\0' && *new == ':')
- || (*old == ':' && *new == '\0'))
- firstchange++;
- old = new; /* ignore subsequent differences */
- }
- if (*new == '\0')
- break;
- if (*new == '%' && *bltin < 0 && prefix("builtin", new + 1))
- *bltin = idx;
- if (*new == ':') {
- idx++;
- }
- new++, old++;
- }
- if (builtinloc >= 0 && *bltin < 0)
- firstchange = 0;
- return firstchange;
-}
/*
* Routines to expand arguments to commands. We have to deal with
* backquotes, shell variables, and file metacharacters.
*/
+
/*
* _rmescape() flags
*/
#define RMESCAPE_ALLOC 0x1 /* Allocate a new string */
#define RMESCAPE_GLOB 0x2 /* Add backslashes for glob */
+#define RMESCAPE_QUOTED 0x4 /* Remove CTLESC unless in quotes */
+#define RMESCAPE_GROW 0x8 /* Grow strings instead of stalloc */
+#define RMESCAPE_HEAP 0x10 /* Malloc strings instead of stalloc */
/*
* Structure specifying which parts of the string should be searched
@@ -4401,58 +4512,79 @@ struct ifsregion {
int nulonly; /* search for nul bytes only */
};
+/* output of current string */
+static char *expdest;
+/* list of back quote expressions */
+static struct nodelist *argbackq;
+/* first struct in list of ifs regions */
+static struct ifsregion ifsfirst;
+/* last struct in list */
+static struct ifsregion *ifslastp;
+/* holds expanded arg list */
+static struct arglist exparg;
+
+static void argstr(char *, int);
+static char *exptilde(char *, char *, int);
+static void expbackq(union node *, int, int);
+static const char *subevalvar(char *, char *, int, int, int, int, int);
+static char *evalvar(char *, int);
+static int varisset(char *, int);
+static void strtodest(const char *, int, int);
+static void memtodest(const char *p, size_t len, int syntax, int quotes);
+static void varvalue(char *, int, int);
+static void recordregion(int, int, int);
+static void removerecordregions(int);
+static void ifsbreakup(char *, struct arglist *);
+static void ifsfree(void);
+static void expandmeta(struct strlist *, int);
+static int patmatch(char *, const char *);
+
+static int cvtnum(long);
+static size_t esclen(const char *, const char *);
+static char *scanleft(char *, char *, char *, char *, int, int);
+static char *scanright(char *, char *, char *, char *, int, int);
+static void varunset(const char *, const char *, const char *, int)
+ __attribute__((__noreturn__));
+
+
+#define pmatch(a, b) !fnmatch((a), (b), 0)
+/*
+ * Prepare a pattern for a expmeta (internal glob(3)) call.
+ *
+ * Returns an stalloced string.
+ */
+
+static inline char *
+preglob(const char *pattern, int quoted, int flag) {
+ flag |= RMESCAPE_GLOB;
+ if (quoted) {
+ flag |= RMESCAPE_QUOTED;
+ }
+ return _rmescapes((char *)pattern, flag);
+}
+
+
+static size_t
+esclen(const char *start, const char *p) {
+ size_t esc = 0;
+
+ while (p > start && *--p == CTLESC) {
+ esc++;
+ }
+ return esc;
+}
-static char *expdest; /* output of current string */
-static struct nodelist *argbackq; /* list of back quote expressions */
-static struct ifsregion ifsfirst; /* first struct in list of ifs regions */
-static struct ifsregion *ifslastp; /* last struct in list */
-static struct arglist exparg; /* holds expanded arg list */
-
-static void argstr (char *, int);
-static char *exptilde (char *, int);
-static void expbackq (union node *, int, int);
-static int subevalvar (char *, char *, int, int, int, int, int);
-static int varisset (char *, int);
-static void strtodest (const char *, const char *, int);
-static void varvalue (char *, int, int);
-static void recordregion (int, int, int);
-static void removerecordregions (int);
-static void ifsbreakup (char *, struct arglist *);
-static void ifsfree (void);
-static void expandmeta (struct strlist *, int);
-#if defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN)
-#define preglob(p) _rmescapes((p), RMESCAPE_ALLOC | RMESCAPE_GLOB)
-#if !defined(GLOB_BROKEN)
-static void addglob (const glob_t *);
-#endif
-#endif
-#if !(defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN) && !defined(GLOB_BROKEN))
-static void expmeta (char *, char *);
-#endif
-#if !(defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN) && !defined(GLOB_BROKEN))
-static struct strlist *expsort (struct strlist *);
-static struct strlist *msort (struct strlist *, int);
-#endif
-static int patmatch (char *, char *, int);
-#if defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN)
-static int patmatch2 (char *, char *, int);
-#else
-static int pmatch (char *, char *, int);
-#define patmatch2 patmatch
-#endif
-static char *cvtnum (int, char *);
/*
* Expand shell variables and backquotes inside a here document.
*/
-/* arg: the document, fd: where to write the expanded version */
static inline void
expandhere(union node *arg, int fd)
{
herefd = fd;
expandarg(arg, (struct arglist *)NULL, 0);
- xwrite(fd, stackblock(), expdest - stackblock());
+ xwrite(fd, stackblock(), expdest - (char *)stackblock());
}
@@ -4463,11 +4595,8 @@ expandhere(union node *arg, int fd)
* here document expansion.
*/
-static void
-expandarg(arg, arglist, flag)
- union node *arg;
- struct arglist *arglist;
- int flag;
+void
+expandarg(union node *arg, struct arglist *arglist, int flag)
{
struct strlist *sp;
char *p;
@@ -4499,7 +4628,8 @@ expandarg(arg, arglist, flag)
*exparg.lastp = sp;
exparg.lastp = &sp->next;
}
- ifsfree();
+ if (ifsfirst.next)
+ ifsfree();
*exparg.lastp = NULL;
if (exparg.list) {
*arglist->lastp = exparg.list;
@@ -4509,252 +4639,163 @@ expandarg(arg, arglist, flag)
/*
- * Expand a variable, and return a pointer to the next character in the
- * input string.
+ * Perform variable and command substitution. If EXP_FULL is set, output CTLESC
+ * characters to allow for further processing. Otherwise treat
+ * $@ like $* since no splitting will be performed.
*/
-static inline char *
-evalvar(p, flag)
- char *p;
- int flag;
-{
- int subtype;
- int varflags;
- char *var;
- const char *val;
- int patloc;
+static void
+argstr(char *p, int flag)
+{
+ static const char spclchars[] = {
+ '=',
+ ':',
+ CTLQUOTEMARK,
+ CTLENDVAR,
+ CTLESC,
+ CTLVAR,
+ CTLBACKQ,
+ CTLBACKQ | CTLQUOTE,
+#ifdef BB_ASH_MATH_SUPPORT
+ CTLENDARI,
+#endif
+ 0
+ };
+ const char *reject = spclchars;
int c;
- int set;
- int special;
+ int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */
+ int breakall = flag & EXP_WORD;
+ int inquotes;
+ size_t length;
int startloc;
- int varlen;
- int easy;
- int quotes = flag & (EXP_FULL | EXP_CASE);
- varflags = *p++;
- subtype = varflags & VSTYPE;
- var = p;
- special = 0;
- if (! is_name(*p))
- special = 1;
- p = strchr(p, '=') + 1;
-again: /* jump here after setting a variable with ${var=text} */
- if (special) {
- set = varisset(var, varflags & VSNUL);
- val = NULL;
- } else {
- val = lookupvar(var);
- if (val == NULL || ((varflags & VSNUL) && val[0] == '\0')) {
- val = NULL;
- set = 0;
- } else
- set = 1;
+ if (!(flag & EXP_VARTILDE)) {
+ reject += 2;
+ } else if (flag & EXP_VARTILDE2) {
+ reject++;
}
- varlen = 0;
- startloc = expdest - stackblock();
- if (set && subtype != VSPLUS) {
- /* insert the value of the variable */
- if (special) {
- varvalue(var, varflags & VSQUOTE, flag);
- if (subtype == VSLENGTH) {
- varlen = expdest - stackblock() - startloc;
- STADJUST(-varlen, expdest);
- }
- } else {
- if (subtype == VSLENGTH) {
- varlen = strlen(val);
- } else {
- strtodest(
- val,
- varflags & VSQUOTE ?
- DQSYNTAX : BASESYNTAX,
- quotes
- );
- }
- }
- }
-
- if (subtype == VSPLUS)
- set = ! set;
-
- easy = ((varflags & VSQUOTE) == 0 ||
- (*var == '@' && shellparam.nparam != 1));
-
-
- switch (subtype) {
- case VSLENGTH:
- expdest = cvtnum(varlen, expdest);
- goto record;
-
- case VSNORMAL:
- if (!easy)
- break;
-record:
- recordregion(startloc, expdest - stackblock(),
- varflags & VSQUOTE);
- break;
-
- case VSPLUS:
- case VSMINUS:
- if (!set) {
- argstr(p, flag);
- break;
- }
- if (easy)
- goto record;
- break;
+ inquotes = 0;
+ length = 0;
+ if (flag & EXP_TILDE) {
+ char *q;
- case VSTRIMLEFT:
- case VSTRIMLEFTMAX:
- case VSTRIMRIGHT:
- case VSTRIMRIGHTMAX:
- if (!set)
- break;
- /*
- * Terminate the string and start recording the pattern
- * right after it
- */
- STPUTC('\0', expdest);
- patloc = expdest - stackblock();
- if (subevalvar(p, NULL, patloc, subtype,
- startloc, varflags, quotes) == 0) {
- int amount = (expdest - stackblock() - patloc) + 1;
- STADJUST(-amount, expdest);
- }
- /* Remove any recorded regions beyond start of variable */
- removerecordregions(startloc);
- goto record;
-
- case VSASSIGN:
- case VSQUESTION:
- if (!set) {
- if (subevalvar(p, var, 0, subtype, startloc,
- varflags, quotes)) {
- varflags &= ~VSNUL;
- /*
- * Remove any recorded regions beyond
- * start of variable
- */
- removerecordregions(startloc);
- goto again;
+ flag &= ~EXP_TILDE;
+tilde:
+ q = p;
+ if (*q == CTLESC && (flag & EXP_QWORD))
+ q++;
+ if (*q == '~')
+ p = exptilde(p, q, flag);
+ }
+start:
+ startloc = expdest - (char *)stackblock();
+ for (;;) {
+ length += strcspn(p + length, reject);
+ c = p[length];
+ if (c && (!(c & 0x80)
+#ifdef BB_ASH_MATH_SUPPORT
+ || c == CTLENDARI
+#endif
+ )) {
+ /* c == '=' || c == ':' || c == CTLENDARI */
+ length++;
+ }
+ if (length > 0) {
+ int newloc;
+ expdest = stnputs(p, length, expdest);
+ newloc = expdest - (char *)stackblock();
+ if (breakall && !inquotes && newloc > startloc) {
+ recordregion(startloc, newloc, 0);
}
- break;
+ startloc = newloc;
}
- if (easy)
- goto record;
- break;
-
-#ifdef DEBUG
- default:
- abort();
-#endif
- }
+ p += length + 1;
+ length = 0;
- if (subtype != VSNORMAL) { /* skip to end of alternative */
- int nesting = 1;
- for (;;) {
- if ((c = *p++) == CTLESC)
- p++;
- else if (c == CTLBACKQ || c == (CTLBACKQ|CTLQUOTE)) {
- if (set)
- argbackq = argbackq->next;
- } else if (c == CTLVAR) {
- if ((*p++ & VSTYPE) != VSNORMAL)
- nesting++;
- } else if (c == CTLENDVAR) {
- if (--nesting == 0)
- break;
+ switch (c) {
+ case '\0':
+ goto breakloop;
+ case '=':
+ if (flag & EXP_VARTILDE2) {
+ p--;
+ continue;
+ }
+ flag |= EXP_VARTILDE2;
+ reject++;
+ /* fall through */
+ case ':':
+ /*
+ * sort of a hack - expand tildes in variable
+ * assignments (after the first '=' and after ':'s).
+ */
+ if (*--p == '~') {
+ goto tilde;
}
+ continue;
}
- }
- return p;
-}
-
-/*
- * Perform variable and command substitution. If EXP_FULL is set, output CTLESC
- * characters to allow for further processing. Otherwise treat
- * $@ like $* since no splitting will be performed.
- */
-
-static void
-argstr(p, flag)
- char *p;
- int flag;
-{
- char c;
- int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */
- int firsteq = 1;
-
- if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE)))
- p = exptilde(p, flag);
- for (;;) {
- switch (c = *p++) {
- case '\0':
+ switch (c) {
case CTLENDVAR: /* ??? */
goto breakloop;
case CTLQUOTEMARK:
/* "$@" syntax adherence hack */
- if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=')
- break;
- if ((flag & EXP_FULL) != 0)
- STPUTC(c, expdest);
+ if (
+ !inquotes &&
+ !memcmp(p, dolatstr, DOLATSTRLEN) &&
+ (p[4] == CTLQUOTEMARK || (
+ p[4] == CTLENDVAR &&
+ p[5] == CTLQUOTEMARK
+ ))
+ ) {
+ p = evalvar(p + 1, flag) + 1;
+ goto start;
+ }
+ inquotes = !inquotes;
+addquote:
+ if (quotes) {
+ p--;
+ length++;
+ startloc++;
+ }
break;
case CTLESC:
- if (quotes)
- STPUTC(c, expdest);
- c = *p++;
- STPUTC(c, expdest);
- break;
+ startloc++;
+ length++;
+ goto addquote;
case CTLVAR:
p = evalvar(p, flag);
- break;
+ goto start;
case CTLBACKQ:
+ c = 0;
case CTLBACKQ|CTLQUOTE:
- expbackq(argbackq->n, c & CTLQUOTE, flag);
+ expbackq(argbackq->n, c, quotes);
argbackq = argbackq->next;
- break;
-#ifdef ASH_MATH_SUPPORT
+ goto start;
+#ifdef BB_ASH_MATH_SUPPORT
case CTLENDARI:
- expari(flag);
- break;
+ p--;
+ expari(quotes);
+ goto start;
#endif
- case ':':
- case '=':
- /*
- * sort of a hack - expand tildes in variable
- * assignments (after the first '=' and after ':'s).
- */
- STPUTC(c, expdest);
- if (flag & EXP_VARTILDE && *p == '~') {
- if (c == '=') {
- if (firsteq)
- firsteq = 0;
- else
- break;
- }
- p = exptilde(p, flag);
- }
- break;
- default:
- STPUTC(c, expdest);
}
}
-breakloop:;
- return;
+breakloop:
+ ;
}
static char *
-exptilde(p, flag)
- char *p;
- int flag;
+exptilde(char *startp, char *p, int flag)
{
- char c, *startp = p;
+ char c;
+ char *name;
struct passwd *pw;
const char *home;
int quotes = flag & (EXP_FULL | EXP_CASE);
+ int startloc;
- while ((c = *p) != '\0') {
+ name = p + 1;
+
+ while ((c = *++p) != '\0') {
switch(c) {
case CTLESC:
return (startp);
@@ -4765,24 +4806,26 @@ exptilde(p, flag)
goto done;
break;
case '/':
+ case CTLENDVAR:
goto done;
}
- p++;
}
done:
*p = '\0';
- if (*(startp+1) == '\0') {
- if ((home = lookupvar("HOME")) == NULL)
+ if (*name == '\0') {
+ if ((home = lookupvar(homestr)) == NULL)
goto lose;
} else {
- if ((pw = getpwnam(startp+1)) == NULL)
+ if ((pw = getpwnam(name)) == NULL)
goto lose;
home = pw->pw_dir;
}
if (*home == '\0')
goto lose;
*p = c;
+ startloc = expdest - (char *)stackblock();
strtodest(home, SQSYNTAX, quotes);
+ recordregion(startloc, expdest - (char *)stackblock(), 0);
return (p);
lose:
*p = c;
@@ -4830,70 +4873,65 @@ removerecordregions(int endoff)
}
-#ifdef ASH_MATH_SUPPORT
+#ifdef BB_ASH_MATH_SUPPORT
/*
* Expand arithmetic expression. Backup to start of expression,
* evaluate, place result in (backed up) result, adjust string position.
*/
-static void
-expari(int flag)
+void
+expari(int quotes)
{
char *p, *start;
- int errcode;
- int result;
int begoff;
- int quotes = flag & (EXP_FULL | EXP_CASE);
- int quoted;
+ int flag;
+ int len;
/* ifsfree(); */
/*
* This routine is slightly over-complicated for
- * efficiency. First we make sure there is
- * enough space for the result, which may be bigger
- * than the expression if we add exponentation. Next we
- * scan backwards looking for the start of arithmetic. If the
- * next previous character is a CTLESC character, then we
- * have to rescan starting from the beginning since CTLESC
- * characters have to be processed left to right.
+ * efficiency. Next we scan backwards looking for the
+ * start of arithmetic.
*/
- CHECKSTRSPACE(10, expdest);
- USTPUTC('\0', expdest);
start = stackblock();
p = expdest - 1;
- while (*p != CTLARI && p >= start)
- --p;
- if (*p != CTLARI)
- error("missing CTLARI (shouldn't happen)");
- if (p > start && *(p-1) == CTLESC)
- for (p = start; *p != CTLARI; p++)
- if (*p == CTLESC)
- p++;
+ *p = '\0';
+ p--;
+ do {
+ int esc;
+
+ while (*p != CTLARI) {
+ p--;
+#ifdef DEBUG
+ if (p < start) {
+ error("missing CTLARI (shouldn't happen)");
+ }
+#endif
+ }
+
+ esc = esclen(start, p);
+ if (!(esc % 2)) {
+ break;
+ }
+
+ p -= esc + 1;
+ } while (1);
- if (p[1] == '"')
- quoted=1;
- else
- quoted=0;
begoff = p - start;
+
removerecordregions(begoff);
+
+ flag = p[1];
+
+ expdest = p;
+
if (quotes)
- rmescapes(p+2);
- result = arith(p+2, &errcode);
- if (errcode < 0) {
- if(errcode == -2)
- error("divide by zero");
- else
- error("syntax error: \"%s\"\n", p+2);
- }
- snprintf(p, 12, "%d", result);
+ rmescapes(p + 2);
- while (*p++)
- ;
+ len = cvtnum(dash_arith(p + 2));
- if (quoted == 0)
- recordregion(begoff, p - 1 - start, 0);
- result = expdest - p + 1;
- STADJUST(-result, expdest);
+ if (flag != '"')
+ recordregion(begoff, begoff + len, 0);
}
#endif
@@ -4902,244 +4940,375 @@ expari(int flag)
*/
static void
-expbackq(cmd, quoted, flag)
- union node *cmd;
- int quoted;
- int flag;
+expbackq(union node *cmd, int quoted, int quotes)
{
- volatile struct backcmd in;
+ struct backcmd in;
int i;
char buf[128];
char *p;
- char *dest = expdest;
- volatile struct ifsregion saveifs;
- struct ifsregion *volatile savelastp;
- struct nodelist *volatile saveargbackq;
- char lastc;
- int startloc = dest - stackblock();
- char const *syntax = quoted? DQSYNTAX : BASESYNTAX;
- volatile int saveherefd;
- int quotes = flag & (EXP_FULL | EXP_CASE);
- struct jmploc jmploc;
- struct jmploc *volatile savehandler;
- int ex;
-
-#if __GNUC__
- /* Avoid longjmp clobbering */
- (void) &dest;
- (void) &syntax;
-#endif
-
- in.fd = -1;
- in.buf = 0;
- in.jp = 0;
+ char *dest;
+ int startloc;
+ int syntax = quoted? DQSYNTAX : BASESYNTAX;
+ struct stackmark smark;
INTOFF;
- saveifs = ifsfirst;
- savelastp = ifslastp;
- saveargbackq = argbackq;
- saveherefd = herefd;
- herefd = -1;
- if ((ex = setjmp(jmploc.loc))) {
- goto err1;
- }
- savehandler = handler;
- handler = &jmploc;
- INTON;
- p = grabstackstr(dest);
+ setstackmark(&smark);
+ dest = expdest;
+ startloc = dest - (char *)stackblock();
+ grabstackstr(dest);
evalbackcmd(cmd, (struct backcmd *) &in);
- ungrabstackstr(p, dest);
-err1:
- INTOFF;
- ifsfirst = saveifs;
- ifslastp = savelastp;
- argbackq = saveargbackq;
- herefd = saveherefd;
- if (ex) {
- goto err2;
- }
+ popstackmark(&smark);
p = in.buf;
- lastc = '\0';
+ i = in.nleft;
+ if (i == 0)
+ goto read;
for (;;) {
- if (--in.nleft < 0) {
- if (in.fd < 0)
- break;
- i = safe_read(in.fd, buf, sizeof buf);
- TRACE(("expbackq: read returns %d\n", i));
- if (i <= 0)
- break;
- p = buf;
- in.nleft = i - 1;
- }
- lastc = *p++;
- if (lastc != '\0') {
- if (quotes && syntax[(int)lastc] == CCTL)
- STPUTC(CTLESC, dest);
- STPUTC(lastc, dest);
- }
+ memtodest(p, i, syntax, quotes);
+read:
+ if (in.fd < 0)
+ break;
+ i = safe_read(in.fd, buf, sizeof buf);
+ TRACE(("expbackq: read returns %d\n", i));
+ if (i <= 0)
+ break;
+ p = buf;
}
- /* Eat all trailing newlines */
- for (; dest > stackblock() && dest[-1] == '\n';)
- STUNPUTC(dest);
-
-err2:
- if (in.fd >= 0)
- close(in.fd);
if (in.buf)
ckfree(in.buf);
- if (in.jp)
- exitstatus = waitforjob(in.jp);
- handler = savehandler;
- if (ex) {
- longjmp(handler->loc, 1);
+ if (in.fd >= 0) {
+ close(in.fd);
+ back_exitstatus = waitforjob(in.jp);
}
+ INTON;
+
+ /* Eat all trailing newlines */
+ dest = expdest;
+ for (; dest > (char *)stackblock() && dest[-1] == '\n';)
+ STUNPUTC(dest);
+ expdest = dest;
+
if (quoted == 0)
- recordregion(startloc, dest - stackblock(), 0);
+ recordregion(startloc, dest - (char *)stackblock(), 0);
TRACE(("evalbackq: size=%d: \"%.*s\"\n",
- (dest - stackblock()) - startloc,
- (dest - stackblock()) - startloc,
+ (dest - (char *)stackblock()) - startloc,
+ (dest - (char *)stackblock()) - startloc,
stackblock() + startloc));
- expdest = dest;
- INTON;
}
-static int
-subevalvar(p, str, strloc, subtype, startloc, varflags, quotes)
- char *p;
- char *str;
- int strloc;
- int subtype;
- int startloc;
- int varflags;
- int quotes;
+
+static char *
+scanleft(char *startp, char *rmesc, char *rmescend, char *str, int quotes,
+ int zero)
+{
+ char *loc;
+ char *loc2;
+ char c;
+
+ loc = startp;
+ loc2 = rmesc;
+ do {
+ int match;
+ const char *s = loc2;
+ c = *loc2;
+ if (zero) {
+ *loc2 = '\0';
+ s = rmesc;
+ }
+ match = pmatch(str, s);
+ *loc2 = c;
+ if (match)
+ return loc;
+ if (quotes && *loc == CTLESC)
+ loc++;
+ loc++;
+ loc2++;
+ } while (c);
+ return 0;
+}
+
+
+static char *
+scanright(char *startp, char *rmesc, char *rmescend, char *str, int quotes,
+ int zero)
+{
+ int esc = 0;
+ char *loc;
+ char *loc2;
+
+ for (loc = str - 1, loc2 = rmescend; loc >= startp; loc2--) {
+ int match;
+ char c = *loc2;
+ const char *s = loc2;
+ if (zero) {
+ *loc2 = '\0';
+ s = rmesc;
+ }
+ match = pmatch(str, s);
+ *loc2 = c;
+ if (match)
+ return loc;
+ loc--;
+ if (quotes) {
+ if (--esc < 0) {
+ esc = esclen(startp, loc);
+ }
+ if (esc % 2) {
+ esc--;
+ loc--;
+ }
+ }
+ }
+ return 0;
+}
+
+static const char *
+subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes)
{
char *startp;
- char *loc = NULL;
- char *q;
- int c = 0;
+ char *loc;
int saveherefd = herefd;
struct nodelist *saveargbackq = argbackq;
int amount;
+ char *rmesc, *rmescend;
+ int zero;
+ char *(*scan)(char *, char *, char *, char *, int , int);
herefd = -1;
argstr(p, subtype != VSASSIGN && subtype != VSQUESTION ? EXP_CASE : 0);
- STACKSTRNUL(expdest);
+ STPUTC('\0', expdest);
herefd = saveherefd;
argbackq = saveargbackq;
startp = stackblock() + startloc;
- if (str == NULL)
- str = stackblock() + strloc;
switch (subtype) {
case VSASSIGN:
setvar(str, startp, 0);
amount = startp - expdest;
STADJUST(amount, expdest);
- varflags &= ~VSNUL;
- if (c != 0)
- *loc = c;
- return 1;
+ return startp;
case VSQUESTION:
- if (*p != CTLENDVAR) {
- out2fmt(snlfmt, startp);
- error((char *)NULL);
- }
- error("%.*s: parameter %snot set", p - str - 1,
- str, (varflags & VSNUL) ? "null or "
- : nullstr);
+ varunset(p, str, startp, varflags);
/* NOTREACHED */
+ }
- case VSTRIMLEFT:
- for (loc = startp; loc < str; loc++) {
- c = *loc;
- *loc = '\0';
- if (patmatch2(str, startp, quotes))
- goto recordleft;
- *loc = c;
- if (quotes && *loc == CTLESC)
- loc++;
+ subtype -= VSTRIMRIGHT;
+#ifdef DEBUG
+ if (subtype < 0 || subtype > 3)
+ abort();
+#endif
+
+ rmesc = startp;
+ rmescend = stackblock() + strloc;
+ if (quotes) {
+ rmesc = _rmescapes(startp, RMESCAPE_ALLOC | RMESCAPE_GROW);
+ if (rmesc != startp) {
+ rmescend = expdest;
+ startp = stackblock() + startloc;
}
- return 0;
+ }
+ rmescend--;
+ str = stackblock() + strloc;
+ preglob(str, varflags & VSQUOTE, 0);
- case VSTRIMLEFTMAX:
- for (loc = str - 1; loc >= startp;) {
- c = *loc;
- *loc = '\0';
- if (patmatch2(str, startp, quotes))
- goto recordleft;
- *loc = c;
- loc--;
- if (quotes && loc > startp && *(loc - 1) == CTLESC) {
- for (q = startp; q < loc; q++)
- if (*q == CTLESC)
- q++;
- if (q > loc)
- loc--;
- }
+ /* zero = subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX */
+ zero = subtype >> 1;
+ /* VSTRIMLEFT/VSTRIMRIGHTMAX -> scanleft */
+ scan = (subtype & 1) ^ zero ? scanleft : scanright;
+
+ loc = scan(startp, rmesc, rmescend, str, quotes, zero);
+ if (loc) {
+ if (zero) {
+ memmove(startp, loc, str - loc);
+ loc = startp + (str - loc) - 1;
}
- return 0;
+ *loc = '\0';
+ amount = loc - expdest;
+ STADJUST(amount, expdest);
+ }
+ return loc;
+}
- case VSTRIMRIGHT:
- for (loc = str - 1; loc >= startp;) {
- if (patmatch2(str, loc, quotes))
- goto recordright;
- loc--;
- if (quotes && loc > startp && *(loc - 1) == CTLESC) {
- for (q = startp; q < loc; q++)
- if (*q == CTLESC)
- q++;
- if (q > loc)
- loc--;
+
+/*
+ * Expand a variable, and return a pointer to the next character in the
+ * input string.
+ */
+static char *
+evalvar(char *p, int flag)
+{
+ int subtype;
+ int varflags;
+ char *var;
+ int patloc;
+ int c;
+ int set;
+ int startloc;
+ size_t varlen;
+ int easy;
+ int quotes;
+ int quoted;
+
+ quotes = flag & (EXP_FULL | EXP_CASE);
+ varflags = *p++;
+ subtype = varflags & VSTYPE;
+ quoted = varflags & VSQUOTE;
+ var = p;
+ easy = (!quoted || (*var == '@' && shellparam.nparam));
+ varlen = 0;
+ startloc = expdest - (char *)stackblock();
+ p = strchr(p, '=') + 1;
+
+ if (!is_name(*var)) {
+ set = varisset(var, varflags & VSNUL);
+ set--;
+ if (subtype == VSPLUS)
+ goto vsplus;
+ if (++set) {
+ varvalue(var, quoted, flag);
+ if (subtype == VSLENGTH) {
+ varlen =
+ expdest - (char *)stackblock() -
+ startloc;
+ STADJUST(-varlen, expdest);
+ goto vslen;
}
}
- return 0;
+ } else {
+ const char *val;
+again:
+ /* jump here after setting a variable with ${var=text} */
+ val = lookupvar(var);
+ set = !val || ((varflags & VSNUL) && !*val);
+ if (subtype == VSPLUS)
+ goto vsplus;
+ if (--set) {
+ varlen = strlen(val);
+ if (subtype == VSLENGTH)
+ goto vslen;
+ memtodest(
+ val, varlen, quoted ? DQSYNTAX : BASESYNTAX,
+ quotes
+ );
+ }
+ }
- case VSTRIMRIGHTMAX:
- for (loc = startp; loc < str - 1; loc++) {
- if (patmatch2(str, loc, quotes))
- goto recordright;
- if (quotes && *loc == CTLESC)
- loc++;
+
+ if (subtype == VSMINUS) {
+vsplus:
+ if (!set) {
+ argstr(
+ p, flag | EXP_TILDE |
+ (quoted ? EXP_QWORD : EXP_WORD)
+ );
+ goto end;
}
- return 0;
+ if (easy)
+ goto record;
+ goto end;
+ }
+
+ if (subtype == VSASSIGN || subtype == VSQUESTION) {
+ if (!set) {
+ if (subevalvar(p, var, 0, subtype, startloc,
+ varflags, 0)) {
+ varflags &= ~VSNUL;
+ /*
+ * Remove any recorded regions beyond
+ * start of variable
+ */
+ removerecordregions(startloc);
+ goto again;
+ }
+ goto end;
+ }
+ if (easy)
+ goto record;
+ goto end;
+ }
+
+ if (!set && uflag)
+ varunset(p, var, 0, 0);
+
+ if (subtype == VSLENGTH) {
+vslen:
+ cvtnum(varlen);
+ goto record;
+ }
+
+ if (subtype == VSNORMAL) {
+ if (!easy)
+ goto end;
+record:
+ recordregion(startloc, expdest - (char *)stackblock(), quoted);
+ goto end;
+ }
#ifdef DEBUG
+ switch (subtype) {
+ case VSTRIMLEFT:
+ case VSTRIMLEFTMAX:
+ case VSTRIMRIGHT:
+ case VSTRIMRIGHTMAX:
+ break;
default:
abort();
-#endif
}
+#endif
-recordleft:
- *loc = c;
- amount = ((str - 1) - (loc - startp)) - expdest;
- STADJUST(amount, expdest);
- while (loc != str - 1)
- *startp++ = *loc++;
- return 1;
+ if (set) {
+ /*
+ * Terminate the string and start recording the pattern
+ * right after it
+ */
+ STPUTC('\0', expdest);
+ patloc = expdest - (char *)stackblock();
+ if (subevalvar(p, NULL, patloc, subtype,
+ startloc, varflags, quotes) == 0) {
+ int amount = expdest - (
+ (char *)stackblock() + patloc - 1
+ );
+ STADJUST(-amount, expdest);
+ }
+ /* Remove any recorded regions beyond start of variable */
+ removerecordregions(startloc);
+ goto record;
+ }
-recordright:
- amount = loc - expdest;
- STADJUST(amount, expdest);
- STPUTC('\0', expdest);
- STADJUST(-1, expdest);
- return 1;
+end:
+ if (subtype != VSNORMAL) { /* skip to end of alternative */
+ int nesting = 1;
+ for (;;) {
+ if ((c = *p++) == CTLESC)
+ p++;
+ else if (c == CTLBACKQ || c == (CTLBACKQ|CTLQUOTE)) {
+ if (set)
+ argbackq = argbackq->next;
+ } else if (c == CTLVAR) {
+ if ((*p++ & VSTYPE) != VSNORMAL)
+ nesting++;
+ } else if (c == CTLENDVAR) {
+ if (--nesting == 0)
+ break;
+ }
+ }
+ }
+ return p;
}
+
/*
* Test whether a specialized variable is set.
*/
static int
-varisset(name, nulok)
- char *name;
- int nulok;
+varisset(char *name, int nulok)
{
if (*name == '!')
- return backgndpid != -1;
+ return backgndpid != 0;
else if (*name == '@' || *name == '*') {
if (*shellparam.p == NULL)
return 0;
@@ -5170,32 +5339,43 @@ varisset(name, nulok)
return 1;
}
+
/*
* Put a string on the stack.
*/
static void
-strtodest(p, syntax, quotes)
- const char *p;
- const char *syntax;
- int quotes;
-{
- while (*p) {
- if (quotes && syntax[(int) *p] == CCTL)
- STPUTC(CTLESC, expdest);
- STPUTC(*p++, expdest);
+memtodest(const char *p, size_t len, int syntax, int quotes) {
+ char *q = expdest;
+
+ q = makestrspace(len * 2, q);
+
+ while (len--) {
+ int c = *p++;
+ if (!c)
+ continue;
+ if (quotes && (SIT(c, syntax) == CCTL || SIT(c, syntax) == CBACK))
+ USTPUTC(CTLESC, q);
+ USTPUTC(c, q);
}
+
+ expdest = q;
}
+
+static void
+strtodest(const char *p, int syntax, int quotes)
+{
+ memtodest(p, strlen(p), syntax, quotes);
+}
+
+
/*
* Add the value of a specialized variable to the stack string.
*/
static void
-varvalue(name, quoted, flags)
- char *name;
- int quoted;
- int flags;
+varvalue(char *name, int quoted, int flags)
{
int num;
char *p;
@@ -5203,7 +5383,7 @@ varvalue(name, quoted, flags)
int sep;
int sepq = 0;
char **ap;
- char const *syntax;
+ int syntax;
int allow_split = flags & EXP_FULL;
int quotes = flags & (EXP_FULL | EXP_CASE);
@@ -5213,7 +5393,7 @@ varvalue(name, quoted, flags)
num = rootpid;
goto numvar;
case '?':
- num = oexitstatus;
+ num = exitstatus;
goto numvar;
case '#':
num = shellparam.nparam;
@@ -5221,12 +5401,12 @@ varvalue(name, quoted, flags)
case '!':
num = backgndpid;
numvar:
- expdest = cvtnum(num, expdest);
+ cvtnum(num);
break;
case '-':
for (i = 0 ; i < NOPTS ; i++) {
- if (optent_val(i))
- STPUTC(optent_letter(optlist[i]), expdest);
+ if (optlist[i])
+ STPUTC(optletters(i), expdest);
}
break;
case '@':
@@ -5238,15 +5418,17 @@ numvar:
case '*':
sep = ifsset() ? ifsval()[0] : ' ';
if (quotes) {
- sepq = syntax[(int) sep] == CCTL;
+ sepq = (SIT(sep, syntax) == CCTL) || (SIT(sep, syntax) == CBACK);
}
param:
for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
strtodest(p, syntax, quotes);
if (*ap && sep) {
+ p = expdest;
if (sepq)
- STPUTC(CTLESC, expdest);
- STPUTC(sep, expdest);
+ STPUTC(CTLESC, p);
+ STPUTC(sep, p);
+ expdest = p;
}
}
break;
@@ -5269,10 +5451,7 @@ param:
*/
static void
-recordregion(start, end, nulonly)
- int start;
- int end;
- int nulonly;
+recordregion(int start, int end, int nulonly)
{
struct ifsregion *ifsp;
@@ -5292,17 +5471,14 @@ recordregion(start, end, nulonly)
}
-
/*
* Break the argument string into pieces based upon IFS and add the
* strings to the argument list. The regions of the string to be
* searched for IFS characters have been stored by recordregion.
*/
static void
-ifsbreakup(string, arglist)
- char *string;
- struct arglist *arglist;
- {
+ifsbreakup(char *string, struct arglist *arglist)
+{
struct ifsregion *ifsp;
struct strlist *sp;
char *start;
@@ -5314,10 +5490,10 @@ ifsbreakup(string, arglist)
start = string;
- ifsspc = 0;
- nulonly = 0;
- realifs = ifsset() ? ifsval() : defifs;
if (ifslastp != NULL) {
+ ifsspc = 0;
+ nulonly = 0;
+ realifs = ifsset() ? ifsval() : defifs;
ifsp = &ifsfirst;
do {
p = string + ifsp->begoff;
@@ -5371,11 +5547,14 @@ ifsbreakup(string, arglist)
p++;
}
} while ((ifsp = ifsp->next) != NULL);
- if (!(*start || (!ifsspc && start > string && nulonly))) {
- return;
- }
+ if (nulonly)
+ goto add;
}
+ if (!*start)
+ return;
+
+add:
sp = (struct strlist *)stalloc(sizeof *sp);
sp->text = start;
*arglist->lastp = sp;
@@ -5383,133 +5562,60 @@ ifsbreakup(string, arglist)
}
static void
-ifsfree()
+ifsfree(void)
{
- while (ifsfirst.next != NULL) {
+ struct ifsregion *p;
+
+ INTOFF;
+ p = ifsfirst.next;
+ do {
struct ifsregion *ifsp;
- INTOFF;
- ifsp = ifsfirst.next->next;
- ckfree(ifsfirst.next);
- ifsfirst.next = ifsp;
- INTON;
- }
+ ifsp = p->next;
+ ckfree(p);
+ p = ifsp;
+ } while (p);
ifslastp = NULL;
ifsfirst.next = NULL;
+ INTON;
}
-/*
- * Add a file name to the list.
- */
-
-static void
-addfname(const char *name)
-{
- char *p;
- struct strlist *sp;
-
- p = sstrdup(name);
- sp = (struct strlist *)stalloc(sizeof *sp);
- sp->text = p;
- *exparg.lastp = sp;
- exparg.lastp = &sp->next;
-}
-
-/*
- * Expand shell metacharacters. At this point, the only control characters
- * should be escapes. The results are stored in the list exparg.
- */
-
-#if defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN) && !defined(GLOB_BROKEN)
-static void
-expandmeta(str, flag)
- struct strlist *str;
- int flag;
-{
- const char *p;
- glob_t pglob;
- /* TODO - EXP_REDIR */
-
- while (str) {
- if (fflag)
- goto nometa;
- p = preglob(str->text);
- INTOFF;
- switch (glob(p, 0, 0, &pglob)) {
- case 0:
- if(pglob.gl_pathv[1]==0 && !strcmp(p, pglob.gl_pathv[0]))
- goto nometa2;
- addglob(&pglob);
- globfree(&pglob);
- INTON;
- break;
- case GLOB_NOMATCH:
-nometa2:
- globfree(&pglob);
- INTON;
-nometa:
- *exparg.lastp = str;
- rmescapes(str->text);
- exparg.lastp = &str->next;
- break;
- default: /* GLOB_NOSPACE */
- error("Out of space");
- }
- str = str->next;
- }
-}
-
-
-/*
- * Add the result of glob(3) to the list.
- */
-
-static void
-addglob(pglob)
- const glob_t *pglob;
-{
- char **p = pglob->gl_pathv;
-
- do {
- addfname(*p);
- } while (*++p);
-}
-
+static void expmeta(char *, char *);
+static struct strlist *expsort(struct strlist *);
+static struct strlist *msort(struct strlist *, int);
-#else /* defined(__GLIBC__) && !defined(FNMATCH_BROKEN) && !defined(GLOB_BROKEN) */
static char *expdir;
static void
-expandmeta(str, flag)
- struct strlist *str;
- int flag;
+expandmeta(struct strlist *str, int flag)
{
- char *p;
- struct strlist **savelastp;
- struct strlist *sp;
- char c;
+ static const char metachars[] = {
+ '*', '?', '[', 0
+ };
/* TODO - EXP_REDIR */
while (str) {
+ struct strlist **savelastp;
+ struct strlist *sp;
+ char *p;
+
if (fflag)
goto nometa;
- p = str->text;
- for (;;) { /* fast check for meta chars */
- if ((c = *p++) == '\0')
- goto nometa;
- if (c == '*' || c == '?' || c == '[' || c == '!')
- break;
- }
+ if (!strpbrk(str->text, metachars))
+ goto nometa;
savelastp = exparg.lastp;
+
INTOFF;
- if (expdir == NULL) {
+ p = preglob(str->text, 0, RMESCAPE_ALLOC | RMESCAPE_HEAP);
+ {
int i = strlen(str->text);
expdir = ckmalloc(i < 2048 ? 2048 : i); /* XXX */
}
- expmeta(expdir, str->text);
+ expmeta(expdir, p);
ckfree(expdir);
- expdir = NULL;
+ if (p != str->text)
+ ckfree(p);
INTON;
if (exparg.lastp == savelastp) {
/*
@@ -5530,19 +5636,31 @@ nometa:
}
}
+/*
+ * Add a file name to the list.
+ */
+
+static void
+addfname(const char *name)
+{
+ struct strlist *sp;
+
+ sp = (struct strlist *)stalloc(sizeof *sp);
+ sp->text = sstrdup(name);
+ *exparg.lastp = sp;
+ exparg.lastp = &sp->next;
+}
+
/*
* Do metacharacter (i.e. *, ?, [...]) expansion.
*/
static void
-expmeta(enddir, name)
- char *enddir;
- char *name;
- {
+expmeta(char *enddir, char *name)
+{
char *p;
const char *cp;
- char *q;
char *start;
char *endname;
int metaflag;
@@ -5554,17 +5672,15 @@ expmeta(enddir, name)
metaflag = 0;
start = name;
- for (p = name ; ; p++) {
+ for (p = name; *p; p++) {
if (*p == '*' || *p == '?')
metaflag = 1;
else if (*p == '[') {
- q = p + 1;
+ char *q = p + 1;
if (*q == '!')
q++;
for (;;) {
- while (*q == CTLQUOTEMARK)
- q++;
- if (*q == CTLESC)
+ if (*q == '\\')
q++;
if (*q == '/' || *q == '\0')
break;
@@ -5573,46 +5689,36 @@ expmeta(enddir, name)
break;
}
}
- } else if (*p == '!' && p[1] == '!' && (p == name || p[-1] == '/')) {
- metaflag = 1;
- } else if (*p == '\0')
- break;
- else if (*p == CTLQUOTEMARK)
- continue;
- else if (*p == CTLESC)
+ } else if (*p == '\\')
p++;
- if (*p == '/') {
+ else if (*p == '/') {
if (metaflag)
- break;
+ goto out;
start = p + 1;
}
}
+out:
if (metaflag == 0) { /* we've reached the end of the file name */
if (enddir != expdir)
metaflag++;
- for (p = name ; ; p++) {
- if (*p == CTLQUOTEMARK)
- continue;
- if (*p == CTLESC)
+ p = name;
+ do {
+ if (*p == '\\')
p++;
*enddir++ = *p;
- if (*p == '\0')
- break;
- }
+ } while (*p++);
if (metaflag == 0 || lstat(expdir, &statb) >= 0)
addfname(expdir);
return;
}
endname = p;
- if (start != name) {
+ if (name < start) {
p = name;
- while (p < start) {
- while (*p == CTLQUOTEMARK)
- p++;
- if (*p == CTLESC)
+ do {
+ if (*p == '\\')
p++;
*enddir++ = *p++;
- }
+ } while (p < start);
}
if (enddir == expdir) {
cp = ".";
@@ -5634,18 +5740,16 @@ expmeta(enddir, name)
}
matchdot = 0;
p = start;
- while (*p == CTLQUOTEMARK)
- p++;
- if (*p == CTLESC)
+ if (*p == '\\')
p++;
if (*p == '.')
matchdot++;
- while (! int_pending() && (dp = readdir(dirp)) != NULL) {
+ while (! intpending && (dp = readdir(dirp)) != NULL) {
if (dp->d_name[0] == '.' && ! matchdot)
continue;
- if (patmatch(start, dp->d_name, 0)) {
+ if (pmatch(start, dp->d_name)) {
if (atend) {
- strcpy(enddir, dp->d_name);
+ scopy(dp->d_name, enddir);
addfname(expdir);
} else {
for (p = enddir, cp = dp->d_name;
@@ -5660,11 +5764,7 @@ expmeta(enddir, name)
if (! atend)
endname[-1] = '/';
}
-#endif /* defined(__GLIBC__) && !defined(FNMATCH_BROKEN) && !defined(GLOB_BROKEN) */
-
-
-#if !(defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN) && !defined(GLOB_BROKEN))
/*
* Sort the results of file name expansion. It calculates the number of
* strings to sort and then calls msort (short for merge sort) to do the
@@ -5672,9 +5772,8 @@ expmeta(enddir, name)
*/
static struct strlist *
-expsort(str)
- struct strlist *str;
- {
+expsort(struct strlist *str)
+{
int len;
struct strlist *sp;
@@ -5686,9 +5785,7 @@ expsort(str)
static struct strlist *
-msort(list, len)
- struct strlist *list;
- int len;
+msort(struct strlist *list, int len)
{
struct strlist *p, *q = NULL;
struct strlist **lpp;
@@ -5708,7 +5805,12 @@ msort(list, len)
p = msort(p, len - half); /* sort second half */
lpp = &list;
for (;;) {
- if (strcmp(p->text, q->text) < 0) {
+#ifdef BB_LOCALE_SUPPORT
+ if (strcoll(p->text, q->text) < 0)
+#else
+ if (strcmp(p->text, q->text) < 0)
+#endif
+ {
*lpp = p;
lpp = &p->next;
if ((p = *lpp) == NULL) {
@@ -5726,178 +5828,31 @@ msort(list, len)
}
return list;
}
-#endif
-
/*
* Returns true if the pattern matches the string.
*/
-#if defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN)
-/* squoted: string might have quote chars */
-static int
-patmatch(char *pattern, char *string, int squoted)
-{
- const char *p;
- char *q;
-
- p = preglob(pattern);
- q = squoted ? _rmescapes(string, RMESCAPE_ALLOC) : string;
-
- return !fnmatch(p, q, 0);
-}
-
-
-static int
-patmatch2(char *pattern, char *string, int squoted)
-{
- char *p;
- int res;
-
- sstrnleft--;
- p = grabstackstr(expdest);
- res = patmatch(pattern, string, squoted);
- ungrabstackstr(p, expdest);
- return res;
-}
-#else
-static int
-patmatch(char *pattern, char *string, int squoted) {
- return pmatch(pattern, string, squoted);
-}
-
-
-static int
-pmatch(char *pattern, char *string, int squoted)
+static inline int
+patmatch(char *pattern, const char *string)
{
- char *p, *q;
- char c;
-
- p = pattern;
- q = string;
- for (;;) {
- switch (c = *p++) {
- case '\0':
- goto breakloop;
- case CTLESC:
- if (squoted && *q == CTLESC)
- q++;
- if (*q++ != *p++)
- return 0;
- break;
- case CTLQUOTEMARK:
- continue;
- case '?':
- if (squoted && *q == CTLESC)
- q++;
- if (*q++ == '\0')
- return 0;
- break;
- case '*':
- c = *p;
- while (c == CTLQUOTEMARK || c == '*')
- c = *++p;
- if (c != CTLESC && c != CTLQUOTEMARK &&
- c != '?' && c != '*' && c != '[') {
- while (*q != c) {
- if (squoted && *q == CTLESC &&
- q[1] == c)
- break;
- if (*q == '\0')
- return 0;
- if (squoted && *q == CTLESC)
- q++;
- q++;
- }
- }
- do {
- if (pmatch(p, q, squoted))
- return 1;
- if (squoted && *q == CTLESC)
- q++;
- } while (*q++ != '\0');
- return 0;
- case '[': {
- char *endp;
- int invert, found;
- char chr;
-
- endp = p;
- if (*endp == '!')
- endp++;
- for (;;) {
- while (*endp == CTLQUOTEMARK)
- endp++;
- if (*endp == '\0')
- goto dft; /* no matching ] */
- if (*endp == CTLESC)
- endp++;
- if (*++endp == ']')
- break;
- }
- invert = 0;
- if (*p == '!') {
- invert++;
- p++;
- }
- found = 0;
- chr = *q++;
- if (squoted && chr == CTLESC)
- chr = *q++;
- if (chr == '\0')
- return 0;
- c = *p++;
- do {
- if (c == CTLQUOTEMARK)
- continue;
- if (c == CTLESC)
- c = *p++;
- if (*p == '-' && p[1] != ']') {
- p++;
- while (*p == CTLQUOTEMARK)
- p++;
- if (*p == CTLESC)
- p++;
- if (chr >= c && chr <= *p)
- found = 1;
- p++;
- } else {
- if (chr == c)
- found = 1;
- }
- } while ((c = *p++) != ']');
- if (found == invert)
- return 0;
- break;
- }
-dft: default:
- if (squoted && *q == CTLESC)
- q++;
- if (*q++ != c)
- return 0;
- break;
- }
- }
-breakloop:
- if (*q != '\0')
- return 0;
- return 1;
+ return pmatch(preglob(pattern, 0, 0), string);
}
-#endif
-
/*
* Remove any CTLESC characters from a string.
*/
-#if defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(FNMATCH_BROKEN)
static char *
_rmescapes(char *str, int flag)
{
char *p, *q, *r;
static const char qchars[] = { CTLESC, CTLQUOTEMARK, 0 };
+ unsigned inquotes;
+ int notescaped;
+ int globbing;
p = strpbrk(str, qchars);
if (!p) {
@@ -5907,75 +5862,71 @@ _rmescapes(char *str, int flag)
r = str;
if (flag & RMESCAPE_ALLOC) {
size_t len = p - str;
- q = r = stalloc(strlen(p) + len + 1);
+ size_t fulllen = len + strlen(p) + 1;
+
+ if (flag & RMESCAPE_GROW) {
+ r = makestrspace(fulllen, expdest);
+ } else if (flag & RMESCAPE_HEAP) {
+ r = ckmalloc(fulllen);
+ } else {
+ r = stalloc(fulllen);
+ }
+ q = r;
if (len > 0) {
- memcpy(q, str, len);
- q += len;
+ q = mempcpy(q, str, len);
}
}
+ inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;
+ globbing = flag & RMESCAPE_GLOB;
+ notescaped = globbing;
while (*p) {
if (*p == CTLQUOTEMARK) {
+ inquotes = ~inquotes;
p++;
+ notescaped = globbing;
continue;
}
+ if (*p == '\\') {
+ /* naked back slash */
+ notescaped = 0;
+ goto copy;
+ }
if (*p == CTLESC) {
p++;
- if (flag & RMESCAPE_GLOB && *p != '/') {
+ if (notescaped && inquotes && *p != '/') {
*q++ = '\\';
}
}
+ notescaped = globbing;
+copy:
*q++ = *p++;
}
*q = '\0';
- return r;
-}
-#else
-static void
-rmescapes(str)
- char *str;
-{
- char *p, *q;
-
- p = str;
- while (*p != CTLESC && *p != CTLQUOTEMARK) {
- if (*p++ == '\0')
- return;
- }
- q = p;
- while (*p) {
- if (*p == CTLQUOTEMARK) {
- p++;
- continue;
- }
- if (*p == CTLESC)
- p++;
- *q++ = *p++;
+ if (flag & RMESCAPE_GROW) {
+ expdest = r;
+ STADJUST(q - r + 1, expdest);
}
- *q = '\0';
+ return r;
}
-#endif
-
/*
* See if a pattern matches in a case statement.
*/
-static int
-casematch(union node *pattern, const char *val)
+int
+casematch(union node *pattern, char *val)
{
struct stackmark smark;
int result;
- char *p;
setstackmark(&smark);
argbackq = pattern->narg.backquote;
STARTSTACKSTR(expdest);
ifslastp = NULL;
argstr(pattern->narg.text, EXP_TILDE | EXP_CASE);
- STPUTC('\0', expdest);
- p = grabstackstr(expdest);
- result = patmatch(p, (char *)val, 0);
+ STACKSTRNUL(expdest);
+ result = patmatch(stackblock(), val);
popstackmark(&smark);
return result;
}
@@ -5984,198 +5935,154 @@ casematch(union node *pattern, const char *val)
* Our own itoa().
*/
-static char *
-cvtnum(num, buf)
- int num;
- char *buf;
- {
+static int
+cvtnum(long num)
+{
int len;
- CHECKSTRSPACE(32, buf);
- len = sprintf(buf, "%d", num);
- STADJUST(len, buf);
- return buf;
-}
-/*
- * Editline and history functions (and glue).
- */
-static int histcmd(argc, argv)
- int argc;
- char **argv;
-{
- error("not compiled with history support");
- /* NOTREACHED */
+ expdest = makestrspace(32, expdest);
+ len = fmtstr(expdest, 32, "%ld", num);
+ STADJUST(len, expdest);
+ return len;
}
-
-struct redirtab {
- struct redirtab *next;
- short renamed[10]; /* Current ash support only 0-9 descriptors */
- /* char on arm (and others) can't be negative */
-};
-
-static struct redirtab *redirlist;
-
-extern char **environ;
-
-
-
-/*
- * Initialization code.
- */
-
static void
-init(void) {
-
- /* from cd.c: */
- {
- setpwd(0, 0);
- }
-
- /* from input.c: */
- {
- basepf.nextc = basepf.buf = basebuf;
- }
-
- /* from var.c: */
- {
- char **envp;
- char ppid[32];
-
- initvar();
- for (envp = environ ; *envp ; envp++) {
- if (strchr(*envp, '=')) {
- setvareq(*envp, VEXPORT|VTEXTFIXED);
- }
- }
+varunset(const char *end, const char *var, const char *umsg, int varflags)
+{
+ const char *msg;
+ const char *tail;
- snprintf(ppid, sizeof(ppid), "%d", (int) getppid());
- setvar("PPID", ppid, 0);
- }
+ tail = nullstr;
+ msg = "parameter not set";
+ if (umsg) {
+ if (*end == CTLENDVAR) {
+ if (varflags & VSNUL)
+ tail = " or null";
+ } else
+ msg = umsg;
+ }
+ error("%.*s: %s%s", end - var - 1, var, msg, tail);
}
+/* $NetBSD: input.c,v 1.37 2002/11/24 22:35:40 christos Exp $ */
/*
- * This routine is called when an error or an interrupt occurs in an
- * interactive shell and control is returned to the main command loop.
+ * This implements the input routines used by the parser.
*/
-/* 1 == check for aliases, 2 == also check for assignments */
-static int checkalias; /* also used in no alias mode for check assignments */
-
-static void
-reset(void) {
-
- /* from eval.c: */
- {
- evalskip = 0;
- loopnest = 0;
- funcnest = 0;
- }
+#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
+#define IBUFSIZ (BUFSIZ + 1)
- /* from input.c: */
- {
- if (exception != EXSHELLPROC)
- parselleft = parsenleft = 0; /* clear input buffer */
- popallfiles();
- }
+static void pushfile(void);
- /* from parser.c: */
- {
- tokpushback = 0;
- checkkwd = 0;
- checkalias = 0;
- }
+/*
+ * Read a line from the script.
+ */
- /* from redir.c: */
- {
- while (redirlist)
- popredir();
- }
+static inline char *
+pfgets(char *line, int len)
+{
+ char *p = line;
+ int nleft = len;
+ int c;
+ while (--nleft > 0) {
+ c = pgetc2();
+ if (c == PEOF) {
+ if (p == line)
+ return NULL;
+ break;
+ }
+ *p++ = c;
+ if (c == '\n')
+ break;
+ }
+ *p = '\0';
+ return line;
}
-
/*
- * This file implements the input routines used by the parser.
+ * Read a character from the script, returning PEOF on end of file.
+ * Nul characters in the input are silently discarded.
*/
-#ifdef BB_FEATURE_COMMAND_EDITING
-static const char * cmdedit_prompt;
-static inline void putprompt(const char *s) {
- cmdedit_prompt = s;
+#define pgetc_as_macro() (--parsenleft >= 0? *parsenextc++ : preadbuffer())
+
+#ifdef BB_ASH_OPTIMIZE_FOR_SIZE
+#define pgetc_macro() pgetc()
+static int
+pgetc(void)
+{
+ return pgetc_as_macro();
}
#else
-static inline void putprompt(const char *s) {
- out2str(s);
+#define pgetc_macro() pgetc_as_macro()
+static int
+pgetc(void)
+{
+ return pgetc_macro();
}
#endif
-#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
-
-
/*
* Same as pgetc(), but ignores PEOA.
*/
-
-#ifdef ASH_ALIAS
-static int
-pgetc2()
+#ifdef BB_ASH_ALIAS
+static int pgetc2(void)
{
int c;
+
do {
c = pgetc_macro();
} while (c == PEOA);
return c;
}
#else
-static inline int pgetc2() { return pgetc_macro(); }
+static inline int pgetc2(void)
+{
+ return pgetc_macro();
+}
#endif
-/*
- * Read a line from the script.
- */
-static inline char *
-pfgets(char *line, int len)
+#ifdef BB_FEATURE_COMMAND_EDITING
+static const char *cmdedit_prompt;
+static inline void putprompt(const char *s)
{
- char *p = line;
- int nleft = len;
- int c;
-
- while (--nleft > 0) {
- c = pgetc2();
- if (c == PEOF) {
- if (p == line)
- return NULL;
- break;
- }
- *p++ = c;
- if (c == '\n')
- break;
- }
- *p = '\0';
- return line;
+ cmdedit_prompt = s;
+}
+#else
+static inline void putprompt(const char *s)
+{
+ out2str(s);
}
+#endif
static inline int
preadfd(void)
{
- int nr;
- char *buf = parsefile->buf;
- parsenextc = buf;
+ int nr;
+ char *buf = parsefile->buf;
+ parsenextc = buf;
retry:
#ifdef BB_FEATURE_COMMAND_EDITING
- {
- if (!iflag || parsefile->fd)
- nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
- else {
- nr = cmdedit_read_input((char*)cmdedit_prompt, buf);
- }
+ if (!iflag || parsefile->fd)
+ nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
+ else {
+ nr = cmdedit_read_input((char *) cmdedit_prompt, buf);
+ if(nr == 0) {
+ /* Ctrl+C presend */
+ raise(SIGINT);
+ goto retry;
+ }
+ if(nr < 0) {
+ /* Ctrl+D presend */
+ nr = 0;
+ }
}
#else
nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
@@ -6196,39 +6103,6 @@ retry:
return nr;
}
-static void
-popstring(void)
-{
- struct strpush *sp = parsefile->strpush;
-
- INTOFF;
-#ifdef ASH_ALIAS
- if (sp->ap) {
- if (parsenextc[-1] == ' ' || parsenextc[-1] == '\t') {
- if (!checkalias) {
- checkalias = 1;
- }
- }
- if (sp->string != sp->ap->val) {
- ckfree(sp->string);
- }
-
- sp->ap->flag &= ~ALIASINUSE;
- if (sp->ap->flag & ALIASDEAD) {
- unalias(sp->ap->name);
- }
- }
-#endif
- parsenextc = sp->prevstring;
- parsenleft = sp->prevnleft;
-/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
- parsefile->strpush = sp->prev;
- if (sp != &(parsefile->basestrpush))
- ckfree(sp);
- INTON;
-}
-
-
/*
* Refill the input buffer and return the next input character:
*
@@ -6239,7 +6113,7 @@ popstring(void)
* 4) Process input up to the next newline, deleting nul characters.
*/
-static int
+int
preadbuffer(void)
{
char *p, *q;
@@ -6247,7 +6121,7 @@ preadbuffer(void)
char savec;
while (parsefile->strpush) {
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
if (parsenleft == -1 && parsefile->strpush->ap &&
parsenextc[-1] != ' ' && parsenextc[-1] != '\t') {
return PEOA;
@@ -6278,11 +6152,11 @@ again:
p++; /* Skip nul */
goto check;
-
case '\n':
parsenleft = q - parsenextc;
more = 0; /* Stop processing here */
break;
+
}
*q++ = *p++;
@@ -6307,16 +6181,29 @@ check:
return *parsenextc++;
}
+/*
+ * Undo the last call to pgetc. Only one character may be pushed back.
+ * PEOF may be pushed back.
+ */
+
+void
+pungetc(void)
+{
+ parsenleft++;
+ parsenextc--;
+}
/*
* Push a string back onto the input at this current parsefile level.
* We handle aliases this way.
*/
-static void
-pushstring(char *s, int len, void *ap)
+void
+pushstring(char *s, void *ap)
{
struct strpush *sp;
+ size_t len;
+ len = strlen(s);
INTOFF;
/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
if (parsefile->strpush) {
@@ -6327,7 +6214,7 @@ pushstring(char *s, int len, void *ap)
sp = parsefile->strpush = &(parsefile->basestrpush);
sp->prevstring = parsenextc;
sp->prevnleft = parsenleft;
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
sp->ap = (struct alias *)ap;
if (ap) {
((struct alias *)ap)->flag |= ALIASINUSE;
@@ -6339,6 +6226,81 @@ pushstring(char *s, int len, void *ap)
INTON;
}
+void
+popstring(void)
+{
+ struct strpush *sp = parsefile->strpush;
+
+ INTOFF;
+#ifdef BB_ASH_ALIAS
+ if (sp->ap) {
+ if (parsenextc[-1] == ' ' || parsenextc[-1] == '\t') {
+ checkkwd |= CHKALIAS;
+ }
+ if (sp->string != sp->ap->val) {
+ ckfree(sp->string);
+ }
+ sp->ap->flag &= ~ALIASINUSE;
+ if (sp->ap->flag & ALIASDEAD) {
+ unalias(sp->ap->name);
+ }
+ }
+#endif
+ parsenextc = sp->prevstring;
+ parsenleft = sp->prevnleft;
+/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+ parsefile->strpush = sp->prev;
+ if (sp != &(parsefile->basestrpush))
+ ckfree(sp);
+ INTON;
+}
+
+/*
+ * Set the input to take input from a file. If push is set, push the
+ * old input onto the stack first.
+ */
+
+void
+setinputfile(const char *fname, int push)
+{
+ int fd;
+ int fd2;
+
+ INTOFF;
+ if ((fd = open(fname, O_RDONLY)) < 0)
+ error("Can't open %s", fname);
+ if (fd < 10) {
+ fd2 = ash_copyfd(fd, 10);
+ close(fd);
+ if (fd2 < 0)
+ error("Out of file descriptors");
+ fd = fd2;
+ }
+ setinputfd(fd, push);
+ INTON;
+}
+
+
+/*
+ * Like setinputfile, but takes an open file descriptor. Call this with
+ * interrupts off.
+ */
+
+static void
+setinputfd(int fd, int push)
+{
+ (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
+ if (push) {
+ pushfile();
+ parsefile->buf = 0;
+ }
+ parsefile->fd = fd;
+ if (parsefile->buf == NULL)
+ parsefile->buf = ckmalloc(IBUFSIZ);
+ parselleft = parsenleft = 0;
+ plinno = 1;
+}
+
/*
* Like setinputfile, but takes input from a string.
@@ -6357,14 +6319,14 @@ setinputstring(char *string)
}
-
/*
* To handle the "." command, a stack of input files is used. Pushfile
* adds a new entry to the stack and popfile restores the previous level.
*/
static void
-pushfile(void) {
+pushfile(void)
+{
struct parsefile *pf;
parsefile->nleft = parsenleft;
@@ -6379,105 +6341,218 @@ pushfile(void) {
parsefile = pf;
}
-#ifdef JOBS
-static void restartjob (struct job *);
-#endif
-static void freejob (struct job *);
-static struct job *getjob (const char *);
-static int dowait (int, struct job *);
-static void waitonint(int);
+
+static void
+popfile(void)
+{
+ struct parsefile *pf = parsefile;
+
+ INTOFF;
+ if (pf->fd >= 0)
+ close(pf->fd);
+ if (pf->buf)
+ ckfree(pf->buf);
+ while (pf->strpush)
+ popstring();
+ parsefile = pf->prev;
+ ckfree(pf);
+ parsenleft = parsefile->nleft;
+ parselleft = parsefile->lleft;
+ parsenextc = parsefile->nextc;
+ plinno = parsefile->linno;
+ INTON;
+}
/*
- * We keep track of whether or not fd0 has been redirected. This is for
- * background commands, where we want to redirect fd0 to /dev/null only
- * if it hasn't already been redirected.
-*/
-static int fd0_redirected = 0;
+ * Return to top level.
+ */
-/* Return true if fd 0 has already been redirected at least once. */
-static inline int
-fd0_redirected_p () {
- return fd0_redirected != 0;
+static void
+popallfiles(void)
+{
+ while (parsefile != &basepf)
+ popfile();
+}
+
+
+/*
+ * Close the file(s) that the shell is reading commands from. Called
+ * after a fork is done.
+ */
+
+static void
+closescript(void)
+{
+ popallfiles();
+ if (parsefile->fd > 0) {
+ close(parsefile->fd);
+ parsefile->fd = 0;
+ }
}
-static void dupredirect (const union node *, int, int fd1dup);
+/* $NetBSD: jobs.c,v 1.56 2002/11/25 12:13:03 agc Exp $ */
+
+/* mode flags for set_curjob */
+#define CUR_DELETE 2
+#define CUR_RUNNING 1
+#define CUR_STOPPED 0
+
+/* mode flags for dowait */
+#define DOWAIT_NORMAL 0
+#define DOWAIT_BLOCK 1
+
+/* array of jobs */
+static struct job *jobtab;
+/* size of array */
+static unsigned njobs;
+#if JOBS
+/* pgrp of shell on invocation */
+static int initialpgrp;
+static int ttyfd = -1;
+#endif
+/* current job */
+static struct job *curjob;
+/* number of presumed living untracked jobs */
+static int jobless;
+
+static void set_curjob(struct job *, unsigned);
+#if JOBS
+static int restartjob(struct job *, int);
+static void xtcsetpgrp(int, pid_t);
+static char *commandtext(union node *);
+static void cmdlist(union node *, int);
+static void cmdtxt(union node *);
+static void cmdputs(const char *);
+static void showpipe(struct job *, FILE *);
+#endif
+static int sprint_status(char *, int, int);
+static void freejob(struct job *);
+static struct job *getjob(const char *, int);
+static struct job *growjobtab(void);
+static void forkchild(struct job *, union node *, int);
+static void forkparent(struct job *, union node *, int, pid_t);
+static int dowait(int, struct job *);
+static int getstatus(struct job *);
+
+static void
+set_curjob(struct job *jp, unsigned mode)
+{
+ struct job *jp1;
+ struct job **jpp, **curp;
+
+ /* first remove from list */
+ jpp = curp = &curjob;
+ do {
+ jp1 = *jpp;
+ if (jp1 == jp)
+ break;
+ jpp = &jp1->prev_job;
+ } while (1);
+ *jpp = jp1->prev_job;
+ /* Then re-insert in correct position */
+ jpp = curp;
+ switch (mode) {
+ default:
+#ifdef DEBUG
+ abort();
+#endif
+ case CUR_DELETE:
+ /* job being deleted */
+ break;
+ case CUR_RUNNING:
+ /* newly created job or backgrounded job,
+ put after all stopped jobs. */
+ do {
+ jp1 = *jpp;
+#ifdef JOBS
+ if (!jp1 || jp1->state != JOBSTOPPED)
+#endif
+ break;
+ jpp = &jp1->prev_job;
+ } while (1);
+ /* FALLTHROUGH */
#ifdef JOBS
+ case CUR_STOPPED:
+#endif
+ /* newly stopped job - becomes curjob */
+ jp->prev_job = *jpp;
+ *jpp = jp;
+ break;
+ }
+}
+
+#if JOBS
/*
* Turn job control on and off.
*
* Note: This code assumes that the third arg to ioctl is a character
* pointer, which is true on Berkeley systems but not System V. Since
* System V doesn't have job control yet, this isn't a problem now.
+ *
+ * Called with interrupts off.
*/
-
-
-static void setjobctl(int enable)
+void
+setjobctl(int on)
{
-#ifdef OLD_TTY_DRIVER
- int ldisc;
-#endif
+ int fd;
+ int pgrp;
- if (enable == jobctl || rootshell == 0)
+ if (on == jobctl || rootshell == 0)
return;
- if (enable) {
+ if (on) {
+ int ofd;
+ ofd = fd = open(_PATH_TTY, O_RDWR);
+ if (fd < 0) {
+ fd += 3;
+ while (!isatty(fd) && --fd >= 0)
+ ;
+ }
+ fd = fcntl(fd, F_DUPFD, 10);
+ close(ofd);
+ if (fd < 0)
+ goto out;
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
do { /* while we are in the background */
-#ifdef OLD_TTY_DRIVER
- if (ioctl(2, TIOCGPGRP, (char *)&initialpgrp) < 0) {
-#else
- initialpgrp = tcgetpgrp(2);
- if (initialpgrp < 0) {
-#endif
- out2str("sh: can't access tty; job control turned off\n");
- mflag = 0;
- return;
- }
- if (initialpgrp == -1)
- initialpgrp = getpgrp();
- else if (initialpgrp != getpgrp()) {
- killpg(initialpgrp, SIGTTIN);
- continue;
+ if ((pgrp = tcgetpgrp(fd)) < 0) {
+out:
+ sh_warnx("can't access tty; job control turned off");
+ mflag = on = 0;
+ goto close;
}
- } while (0);
-#ifdef OLD_TTY_DRIVER
- if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
- out2str("sh: need new tty driver to run job control; job control turned off\n");
- mflag = 0;
- return;
- }
-#endif
+ if (pgrp == getpgrp())
+ break;
+ killpg(0, SIGTTIN);
+ } while (1);
+ initialpgrp = pgrp;
+
setsignal(SIGTSTP);
setsignal(SIGTTOU);
setsignal(SIGTTIN);
- setpgid(0, rootpid);
-#ifdef OLD_TTY_DRIVER
- ioctl(2, TIOCSPGRP, (char *)&rootpid);
-#else
- tcsetpgrp(2, rootpid);
-#endif
- } else { /* turning job control off */
- setpgid(0, initialpgrp);
-#ifdef OLD_TTY_DRIVER
- ioctl(2, TIOCSPGRP, (char *)&initialpgrp);
-#else
- tcsetpgrp(2, initialpgrp);
-#endif
+ pgrp = rootpid;
+ setpgid(0, pgrp);
+ xtcsetpgrp(fd, pgrp);
+ } else {
+ /* turning job control off */
+ fd = ttyfd;
+ pgrp = initialpgrp;
+ xtcsetpgrp(fd, pgrp);
+ setpgid(0, pgrp);
setsignal(SIGTSTP);
setsignal(SIGTTOU);
setsignal(SIGTTIN);
+close:
+ close(fd);
+ fd = -1;
}
- jobctl = enable;
+ ttyfd = fd;
+ jobctl = on;
}
-#endif
-
-#ifdef JOBS
static int
-killcmd(argc, argv)
- int argc;
- char **argv;
+killcmd(int argc, char **argv)
{
int signo = -1;
int list = 0;
@@ -6493,13 +6568,17 @@ usage:
);
}
- if (*argv[1] == '-') {
- signo = decode_signal(argv[1] + 1, 1);
+ if (**++argv == '-') {
+ signo = decode_signal(*argv + 1, 1);
if (signo < 0) {
int c;
while ((c = nextopt("ls:")) != '\0')
switch (c) {
+ default:
+#ifdef DEBUG
+ abort();
+#endif
case 'l':
list = 1;
break;
@@ -6512,133 +6591,255 @@ usage:
);
}
break;
-#ifdef DEBUG
- default:
- error(
- "nextopt returned character code 0%o", c);
-#endif
- }
+ }
+ argv = argptr;
} else
- argptr++;
+ argv++;
}
if (!list && signo < 0)
signo = SIGTERM;
- if ((signo < 0 || !*argptr) ^ list) {
+ if ((signo < 0 || !*argv) ^ list) {
goto usage;
}
if (list) {
const char *name;
- if (!*argptr) {
- out1str("0\n");
+ if (!*argv) {
for (i = 1; i < NSIG; i++) {
name = u_signal_names(0, &i, 1);
- if(name)
- printf(snlfmt, name);
+ if (name)
+ out1fmt(snlfmt, name);
}
return 0;
}
name = u_signal_names(*argptr, &signo, -1);
if (name)
- printf(snlfmt, name);
+ out1fmt(snlfmt, name);
else
- error("invalid signal number or exit status: %s",
- *argptr);
+ error("invalid signal number or exit status: %s", *argptr);
return 0;
}
+ i = 0;
do {
- if (**argptr == '%') {
- jp = getjob(*argptr);
- if (jp->jobctl == 0)
- error("job %s not created under job control",
- *argptr);
+ if (**argv == '%') {
+ jp = getjob(*argv, 0);
pid = -jp->ps[0].pid;
} else
- pid = atoi(*argptr);
- if (kill(pid, signo) != 0)
- error("%s: %m", *argptr);
- } while (*++argptr);
+ pid = number(*argv);
+ if (kill(pid, signo) != 0) {
+ sh_warnx("%m\n");
+ i = 1;
+ }
+ } while (*++argv);
- return 0;
+ return i;
}
+#endif /* JOBS */
+#if defined(JOBS) || defined(DEBUG)
static int
-fgcmd(argc, argv)
- int argc;
- char **argv;
+jobno(const struct job *jp)
{
- struct job *jp;
- int pgrp;
- int status;
-
- jp = getjob(argv[1]);
- if (jp->jobctl == 0)
- error("job not created under job control");
- pgrp = jp->ps[0].pid;
-#ifdef OLD_TTY_DRIVER
- ioctl(2, TIOCSPGRP, (char *)&pgrp);
-#else
- tcsetpgrp(2, pgrp);
-#endif
- restartjob(jp);
- INTOFF;
- status = waitforjob(jp);
- INTON;
- return status;
+ return jp - jobtab + 1;
}
+#endif
-
+#ifdef JOBS
static int
-bgcmd(argc, argv)
- int argc;
- char **argv;
+fgcmd(int argc, char **argv)
{
struct job *jp;
+ FILE *out;
+ int mode;
+ int retval;
+ mode = (**argv == 'f') ? FORK_FG : FORK_BG;
+ nextopt(nullstr);
+ argv = argptr;
+ out = stdout;
do {
- jp = getjob(*++argv);
- if (jp->jobctl == 0)
- error("job not created under job control");
- restartjob(jp);
- } while (--argc > 1);
- return 0;
+ jp = getjob(*argv, 1);
+ if (mode == FORK_BG) {
+ set_curjob(jp, CUR_RUNNING);
+ fprintf(out, "[%d] ", jobno(jp));
+ }
+ outstr(jp->ps->cmd, out);
+ showpipe(jp, out);
+ retval = restartjob(jp, mode);
+ } while (*argv && *++argv);
+ return retval;
}
+static int bgcmd(int, char **) __attribute__((__alias__("fgcmd")));
-static void
-restartjob(jp)
- struct job *jp;
+
+static int
+restartjob(struct job *jp, int mode)
{
struct procstat *ps;
int i;
+ int status;
+ pid_t pgid;
- if (jp->state == JOBDONE)
- return;
INTOFF;
- killpg(jp->ps[0].pid, SIGCONT);
- for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) {
+ if (jp->state == JOBDONE)
+ goto out;
+ jp->state = JOBRUNNING;
+ pgid = jp->ps->pid;
+ if (mode == FORK_FG)
+ xtcsetpgrp(ttyfd, pgid);
+ killpg(pgid, SIGCONT);
+ ps = jp->ps;
+ i = jp->nprocs;
+ do {
if (WIFSTOPPED(ps->status)) {
ps->status = -1;
- jp->state = 0;
}
- }
+ } while (ps++, --i);
+out:
+ status = (mode == FORK_FG) ? waitforjob(jp) : 0;
INTON;
+ return status;
}
#endif
-static void showjobs(int change);
+static int
+sprint_status(char *s, int status, int sigonly)
+{
+ int col;
+ int st;
+
+ col = 0;
+ if (!WIFEXITED(status)) {
+#if JOBS
+ if (WIFSTOPPED(status))
+ st = WSTOPSIG(status);
+ else
+#endif
+ st = WTERMSIG(status);
+ if (sigonly) {
+ if (st == SIGINT || st == SIGPIPE)
+ goto out;
+#if JOBS
+ if (WIFSTOPPED(status))
+ goto out;
+#endif
+ }
+ st &= 0x7f;
+ col = fmtstr(s, 32, strsignal(st));
+ if (WCOREDUMP(status)) {
+ col += fmtstr(s + col, 16, " (core dumped)");
+ }
+ } else if (!sigonly) {
+ st = WEXITSTATUS(status);
+ if (st)
+ col = fmtstr(s, 16, "Done(%d)", st);
+ else
+ col = fmtstr(s, 16, "Done");
+ }
+
+out:
+ return col;
+}
+
+#if JOBS
+static void
+showjob(FILE *out, struct job *jp, int mode)
+{
+ struct procstat *ps;
+ struct procstat *psend;
+ int col;
+ int indent;
+ char s[80];
+
+ ps = jp->ps;
+
+ if (mode & SHOW_PGID) {
+ /* just output process (group) id of pipeline */
+ fprintf(out, "%d\n", ps->pid);
+ return;
+ }
+
+ col = fmtstr(s, 16, "[%d] ", jobno(jp));
+ indent = col;
+
+ if (jp == curjob)
+ s[col - 2] = '+';
+ else if (curjob && jp == curjob->prev_job)
+ s[col - 2] = '-';
+
+ if (mode & SHOW_PID)
+ col += fmtstr(s + col, 16, "%d ", ps->pid);
+
+ psend = ps + jp->nprocs;
+
+ if (jp->state == JOBRUNNING) {
+ scopy("Running", s + col);
+ col += strlen("Running");
+ } else {
+ int status = psend[-1].status;
+#if JOBS
+ if (jp->state == JOBSTOPPED)
+ status = jp->stopstatus;
+#endif
+ col += sprint_status(s + col, status, 0);
+ }
+
+ goto start;
+
+ do {
+ /* for each process */
+ col = fmtstr(s, 48, " |\n%*c%d ", indent, ' ', ps->pid) - 3;
+
+start:
+ fprintf(out, "%s%*c%s",
+ s, 33 - col >= 0 ? 33 - col : 0, ' ', ps->cmd
+ );
+ if (!(mode & SHOW_PID)) {
+ showpipe(jp, out);
+ break;
+ }
+ if (++ps == psend) {
+ outcslow('\n', out);
+ break;
+ }
+ } while (1);
+
+ jp->changed = 0;
+
+ if (jp->state == JOBDONE) {
+ TRACE(("showjob: freeing job %d\n", jobno(jp)));
+ freejob(jp);
+ }
+}
static int
-jobscmd(argc, argv)
- int argc;
- char **argv;
+jobscmd(int argc, char **argv)
{
- showjobs(0);
+ int mode, m;
+ FILE *out;
+
+ mode = 0;
+ while ((m = nextopt("lp")))
+ if (m == 'l')
+ mode = SHOW_PID;
+ else
+ mode = SHOW_PGID;
+
+ out = stdout;
+ argv = argptr;
+ if (*argv)
+ do
+ showjob(out, getjob(*argv,0), mode);
+ while (*++argv);
+ else
+ showjobs(out, mode);
+
return 0;
}
@@ -6646,81 +6847,25 @@ jobscmd(argc, argv)
/*
* Print a list of jobs. If "change" is nonzero, only print jobs whose
* statuses have changed since the last call to showjobs.
- *
- * If the shell is interrupted in the process of creating a job, the
- * result may be a job structure containing zero processes. Such structures
- * will be freed here.
*/
static void
-showjobs(change)
- int change;
+showjobs(FILE *out, int mode)
{
- int jobno;
- int procno;
- int i;
struct job *jp;
- struct procstat *ps;
- int col;
- char s[64];
- TRACE(("showjobs(%d) called\n", change));
- while (dowait(0, (struct job *)NULL) > 0);
- for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) {
- if (! jp->used)
- continue;
- if (jp->nprocs == 0) {
- freejob(jp);
- continue;
- }
- if (change && ! jp->changed)
- continue;
- procno = jp->nprocs;
- for (ps = jp->ps ; ; ps++) { /* for each process */
- if (ps == jp->ps)
- snprintf(s, 64, "[%d] %ld ", jobno,
- (long)ps->pid);
- else
- snprintf(s, 64, " %ld ",
- (long)ps->pid);
- out1str(s);
- col = strlen(s);
- s[0] = '\0';
- if (ps->status == -1) {
- /* don't print anything */
- } else if (WIFEXITED(ps->status)) {
- snprintf(s, 64, "Exit %d",
- WEXITSTATUS(ps->status));
- } else {
-#ifdef JOBS
- if (WIFSTOPPED(ps->status))
- i = WSTOPSIG(ps->status);
- else /* WIFSIGNALED(ps->status) */
-#endif
- i = WTERMSIG(ps->status);
- if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F])
- strcpy(s, sys_siglist[i & 0x7F]);
- else
- snprintf(s, 64, "Signal %d", i & 0x7F);
- if (WCOREDUMP(ps->status))
- strcat(s, " (core dumped)");
- }
- out1str(s);
- col += strlen(s);
- printf(
- "%*c%s\n", 30 - col >= 0 ? 30 - col : 0, ' ',
- ps->cmd
- );
- if (--procno <= 0)
- break;
- }
- jp->changed = 0;
- if (jp->state == JOBDONE) {
- freejob(jp);
- }
+ TRACE(("showjobs(%x) called\n", mode));
+
+ /* If not even one one job changed, there is nothing to do */
+ while (dowait(DOWAIT_NORMAL, NULL) > 0)
+ continue;
+
+ for (jp = curjob; jp; jp = jp->prev_job) {
+ if (!(mode & SHOW_CHANGED) || jp->changed)
+ showjob(out, jp, mode);
}
}
-
+#endif /* JOBS */
/*
* Mark a job structure as unused.
@@ -6729,7 +6874,7 @@ showjobs(change)
static void
freejob(struct job *jp)
{
- const struct procstat *ps;
+ struct procstat *ps;
int i;
INTOFF;
@@ -6740,66 +6885,70 @@ freejob(struct job *jp)
if (jp->ps != &jp->ps0)
ckfree(jp->ps);
jp->used = 0;
-#ifdef JOBS
- if (curjob == jp - jobtab + 1)
- curjob = 0;
-#endif
+ set_curjob(jp, CUR_DELETE);
INTON;
}
-
static int
-waitcmd(argc, argv)
- int argc;
- char **argv;
+waitcmd(int argc, char **argv)
{
struct job *job;
- int status, retval;
+ int retval;
struct job *jp;
- if (--argc > 0) {
-start:
- job = getjob(*++argv);
- } else {
- job = NULL;
- }
- for (;;) { /* loop until process terminated or stopped */
- if (job != NULL) {
- if (job->state) {
- status = job->ps[job->nprocs - 1].status;
- if (! iflag)
- freejob(job);
- if (--argc) {
- goto start;
- }
- if (WIFEXITED(status))
- retval = WEXITSTATUS(status);
-#ifdef JOBS
- else if (WIFSTOPPED(status))
- retval = WSTOPSIG(status) + 128;
-#endif
- else {
- /* XXX: limits number of signals */
- retval = WTERMSIG(status) + 128;
- }
- return retval;
- }
- } else {
- for (jp = jobtab ; ; jp++) {
- if (jp >= jobtab + njobs) { /* no running procs */
- return 0;
+ EXSIGON();
+
+ nextopt(nullstr);
+ retval = 0;
+
+ argv = argptr;
+ if (!*argv) {
+ /* wait for all jobs */
+ for (;;) {
+ jp = curjob;
+ while (1) {
+ if (!jp) {
+ /* no running procs */
+ goto out;
}
- if (jp->used && jp->state == 0)
+ if (jp->state == JOBRUNNING)
break;
+ jp->waited = 1;
+ jp = jp->prev_job;
}
- }
- if (dowait(2, 0) < 0 && errno == EINTR) {
- return 129;
+ dowait(DOWAIT_BLOCK, 0);
}
}
-}
+ retval = 127;
+ do {
+ if (**argv != '%') {
+ pid_t pid = number(*argv);
+ job = curjob;
+ goto start;
+ do {
+ if (job->ps[job->nprocs - 1].pid == pid)
+ break;
+ job = job->prev_job;
+start:
+ if (!job)
+ goto repeat;
+ } while (1);
+ } else
+ job = getjob(*argv, 0);
+ /* loop until process terminated or stopped */
+ while (job->state == JOBRUNNING)
+ dowait(DOWAIT_BLOCK, 0);
+ job->waited = 1;
+ retval = getstatus(job);
+repeat:
+ ;
+ } while (*++argv);
+
+out:
+ return retval;
+}
/*
@@ -6807,113 +6956,175 @@ start:
*/
static struct job *
-getjob(const char *name)
+getjob(const char *name, int getctl)
{
- int jobno;
struct job *jp;
- int pid;
- int i;
+ struct job *found;
+ const char *err_msg = "No such job: %s";
+ unsigned num;
+ int c;
+ const char *p;
+ char *(*match)(const char *, const char *);
- if (name == NULL) {
-#ifdef JOBS
+ jp = curjob;
+ p = name;
+ if (!p)
+ goto currentjob;
+
+ if (*p != '%')
+ goto err;
+
+ c = *++p;
+ if (!c)
+ goto currentjob;
+
+ if (!p[1]) {
+ if (c == '+' || c == '%') {
currentjob:
- if ((jobno = curjob) == 0 || jobtab[jobno - 1].used == 0)
- error("No current job");
- return &jobtab[jobno - 1];
-#else
- error("No current job");
-#endif
- } else if (name[0] == '%') {
- if (is_digit(name[1])) {
- jobno = number(name + 1);
- if (jobno > 0 && jobno <= njobs
- && jobtab[jobno - 1].used != 0)
- return &jobtab[jobno - 1];
-#ifdef JOBS
- } else if (name[1] == '%' && name[2] == '\0') {
- goto currentjob;
-#endif
- } else {
- struct job *found = NULL;
- for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
- if (jp->used && jp->nprocs > 0
- && prefix(name + 1, jp->ps[0].cmd)) {
- if (found)
- error("%s: ambiguous", name);
- found = jp;
- }
- }
- if (found)
- return found;
+ err_msg = "No current job";
+ goto check;
+ } else if (c == '-') {
+ if (jp)
+ jp = jp->prev_job;
+ err_msg = "No previous job";
+check:
+ if (!jp)
+ goto err;
+ goto gotit;
}
- } else if (is_number(name, &pid)) {
- for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
- if (jp->used && jp->nprocs > 0
- && jp->ps[jp->nprocs - 1].pid == pid)
- return jp;
+ }
+
+ if (is_number(p)) {
+ num = atoi(p);
+ if (num < njobs) {
+ jp = jobtab + num - 1;
+ if (jp->used)
+ goto gotit;
+ goto err;
}
}
- error("No such job: %s", name);
- /* NOTREACHED */
-}
+ match = prefix;
+ if (*p == '?') {
+ match = strstr;
+ p++;
+ }
+
+ found = 0;
+ while (1) {
+ if (!jp)
+ goto err;
+ if (match(jp->ps[0].cmd, p)) {
+ if (found)
+ goto err;
+ found = jp;
+ err_msg = "%s: ambiguous";
+ }
+ jp = jp->prev_job;
+ }
+
+gotit:
+#if JOBS
+ err_msg = "job %s not created under job control";
+ if (getctl && jp->jobctl == 0)
+ goto err;
+#endif
+ return jp;
+err:
+ error(err_msg, name);
+}
/*
- * Return a new job structure,
+ * Return a new job structure.
+ * Called with interrupts off.
*/
static struct job *
-makejob(const union node *node, int nprocs)
+makejob(union node *node, int nprocs)
{
int i;
struct job *jp;
for (i = njobs, jp = jobtab ; ; jp++) {
if (--i < 0) {
- INTOFF;
- if (njobs == 0) {
- jobtab = ckmalloc(4 * sizeof jobtab[0]);
- } else {
- jp = ckmalloc((njobs + 4) * sizeof jobtab[0]);
- memcpy(jp, jobtab, njobs * sizeof jp[0]);
- /* Relocate `ps' pointers */
- for (i = 0; i < njobs; i++)
- if (jp[i].ps == &jobtab[i].ps0)
- jp[i].ps = &jp[i].ps0;
- ckfree(jobtab);
- jobtab = jp;
- }
- jp = jobtab + njobs;
- for (i = 4 ; --i >= 0 ; jobtab[njobs++].used = 0);
- INTON;
+ jp = growjobtab();
break;
}
if (jp->used == 0)
break;
+ if (jp->state != JOBDONE || !jp->waited)
+ continue;
+#if JOBS
+ if (jobctl)
+ continue;
+#endif
+ freejob(jp);
+ break;
}
- INTOFF;
- jp->state = 0;
- jp->used = 1;
- jp->changed = 0;
- jp->nprocs = 0;
-#ifdef JOBS
- jp->jobctl = jobctl;
+ memset(jp, 0, sizeof(*jp));
+#if JOBS
+ if (jobctl)
+ jp->jobctl = 1;
#endif
+ jp->prev_job = curjob;
+ curjob = jp;
+ jp->used = 1;
+ jp->ps = &jp->ps0;
if (nprocs > 1) {
jp->ps = ckmalloc(nprocs * sizeof (struct procstat));
- } else {
- jp->ps = &jp->ps0;
}
- INTON;
TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
- jp - jobtab + 1));
+ jobno(jp)));
+ return jp;
+}
+
+static struct job *
+growjobtab(void)
+{
+ size_t len;
+ ptrdiff_t offset;
+ struct job *jp, *jq;
+
+ len = njobs * sizeof(*jp);
+ jq = jobtab;
+ jp = ckrealloc(jq, len + 4 * sizeof(*jp));
+
+ offset = (char *)jp - (char *)jq;
+ if (offset) {
+ /* Relocate pointers */
+ size_t l = len;
+
+ jq = (struct job *)((char *)jq + l);
+ while (l) {
+ l -= sizeof(*jp);
+ jq--;
+#define joff(p) ((struct job *)((char *)(p) + l))
+#define jmove(p) (p) = (void *)((char *)(p) + offset)
+ if (likely(joff(jp)->ps == &jq->ps0))
+ jmove(joff(jp)->ps);
+ if (joff(jp)->prev_job)
+ jmove(joff(jp)->prev_job);
+ }
+ if (curjob)
+ jmove(curjob);
+#undef joff
+#undef jmove
+ }
+
+ njobs += 4;
+ jobtab = jp;
+ jp = (struct job *)((char *)jp + len);
+ jq = jp + 3;
+ do {
+ jq->used = 0;
+ } while (--jq >= jp);
return jp;
}
/*
- * Fork of a subshell. If we are doing job control, give the subshell its
+ * Fork off a subshell. If we are doing job control, give the subshell its
* own process group. Jp is a job structure that the job is to be added to.
* N is the command that will be evaluated by the child. Both jp and n may
* be NULL. The mode parameter can be one of the following:
@@ -6925,117 +7136,114 @@ makejob(const union node *node, int nprocs)
* When job control is turned off, background processes have their standard
* input redirected to /dev/null (except for the second and later processes
* in a pipeline).
+ *
+ * Called with interrupts off.
*/
-
-
-static int
-forkshell(struct job *jp, const union node *n, int mode)
+static inline void
+forkchild(struct job *jp, union node *n, int mode)
{
- int pid;
-#ifdef JOBS
- int pgrp;
-#endif
- const char *devnull = _PATH_DEVNULL;
- const char *nullerr = "Can't open %s";
+ int wasroot;
- TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n,
- mode));
- INTOFF;
- pid = fork();
- if (pid == -1) {
- TRACE(("Fork failed, errno=%d\n", errno));
- INTON;
- error("Cannot fork");
- }
- if (pid == 0) {
- struct job *p;
- int wasroot;
- int i;
+ TRACE(("Child shell %d\n", getpid()));
+ wasroot = rootshell;
+ rootshell = 0;
- TRACE(("Child shell %d\n", getpid()));
- wasroot = rootshell;
- rootshell = 0;
- closescript();
- INTON;
- clear_traps();
-#ifdef JOBS
- jobctl = 0; /* do job control only in root shell */
- if (wasroot && mode != FORK_NOJOB && mflag) {
- if (jp == NULL || jp->nprocs == 0)
- pgrp = getpid();
- else
- pgrp = jp->ps[0].pid;
- setpgid(0, pgrp);
- if (mode == FORK_FG) {
- /*** this causes superfluous TIOCSPGRPS ***/
-#ifdef OLD_TTY_DRIVER
- if (ioctl(2, TIOCSPGRP, (char *)&pgrp) < 0)
- error("TIOCSPGRP failed, errno=%d", errno);
-#else
- if (tcsetpgrp(2, pgrp) < 0)
- error("tcsetpgrp failed, errno=%d", errno);
-#endif
- }
- setsignal(SIGTSTP);
- setsignal(SIGTTOU);
- } else if (mode == FORK_BG) {
- ignoresig(SIGINT);
- ignoresig(SIGQUIT);
- if ((jp == NULL || jp->nprocs == 0) &&
- ! fd0_redirected_p ()) {
- close(0);
- if (open(devnull, O_RDONLY) != 0)
- error(nullerr, devnull);
- }
- }
-#else
- if (mode == FORK_BG) {
- ignoresig(SIGINT);
- ignoresig(SIGQUIT);
- if ((jp == NULL || jp->nprocs == 0) &&
- ! fd0_redirected_p ()) {
- close(0);
- if (open(devnull, O_RDONLY) != 0)
- error(nullerr, devnull);
- }
- }
+ closescript();
+ clear_traps();
+#if JOBS
+ /* do job control only in root shell */
+ jobctl = 0;
+ if (mode != FORK_NOJOB && jp->jobctl && wasroot) {
+ pid_t pgrp;
+
+ if (jp->nprocs == 0)
+ pgrp = getpid();
+ else
+ pgrp = jp->ps[0].pid;
+ /* This can fail because we are doing it in the parent also */
+ (void)setpgid(0, pgrp);
+ if (mode == FORK_FG)
+ xtcsetpgrp(ttyfd, pgrp);
+ setsignal(SIGTSTP);
+ setsignal(SIGTTOU);
+ } else
#endif
- for (i = njobs, p = jobtab ; --i >= 0 ; p++)
- if (p->used)
- freejob(p);
- if (wasroot && iflag) {
- setsignal(SIGINT);
- setsignal(SIGQUIT);
- setsignal(SIGTERM);
+ if (mode == FORK_BG) {
+ ignoresig(SIGINT);
+ ignoresig(SIGQUIT);
+ if (jp->nprocs == 0) {
+ close(0);
+ if (open(_PATH_DEVNULL, O_RDONLY) != 0)
+ error("Can't open %s", _PATH_DEVNULL);
}
- return pid;
}
-#ifdef JOBS
- if (rootshell && mode != FORK_NOJOB && mflag) {
- if (jp == NULL || jp->nprocs == 0)
+ if (wasroot && iflag) {
+ setsignal(SIGINT);
+ setsignal(SIGQUIT);
+ setsignal(SIGTERM);
+ }
+ for (jp = curjob; jp; jp = jp->prev_job)
+ freejob(jp);
+ jobless = 0;
+}
+
+static inline void
+forkparent(struct job *jp, union node *n, int mode, pid_t pid)
+{
+ TRACE(("In parent shell: child = %d\n", pid));
+ if (!jp) {
+ while (jobless && dowait(DOWAIT_NORMAL, 0) > 0);
+ jobless++;
+ return;
+ }
+#if JOBS
+ if (mode != FORK_NOJOB && jp->jobctl) {
+ int pgrp;
+
+ if (jp->nprocs == 0)
pgrp = pid;
else
pgrp = jp->ps[0].pid;
- setpgid(pid, pgrp);
+ /* This can fail because we are doing it in the child also */
+ (void)setpgid(pid, pgrp);
}
#endif
- if (mode == FORK_BG)
+ if (mode == FORK_BG) {
backgndpid = pid; /* set $! */
+ set_curjob(jp, CUR_RUNNING);
+ }
if (jp) {
struct procstat *ps = &jp->ps[jp->nprocs++];
ps->pid = pid;
ps->status = -1;
ps->cmd = nullstr;
- if (iflag && rootshell && n)
+#if JOBS
+ if (jobctl && n)
ps->cmd = commandtext(n);
+#endif
}
- INTON;
- TRACE(("In parent shell: child = %d\n", pid));
- return pid;
}
+static int
+forkshell(struct job *jp, union node *n, int mode)
+{
+ int pid;
+ TRACE(("forkshell(%%%d, %p, %d) called\n", jobno(jp), n, mode));
+ pid = fork();
+ if (pid < 0) {
+ TRACE(("Fork failed, errno=%d", errno));
+ if (jp)
+ freejob(jp);
+ error("Cannot fork");
+ }
+ if (pid == 0)
+ forkchild(jp, n, mode);
+ else
+ forkparent(jp, n, mode, pid);
+ return pid;
+}
/*
* Wait for job to finish.
@@ -7054,91 +7262,41 @@ forkshell(struct job *jp, const union node *n, int mode)
* exit on interrupt; unless these processes terminate themselves by
* sending a signal to themselves (instead of calling exit) they will
* confuse this approach.
+ *
+ * Called with interrupts off.
*/
-static int
+int
waitforjob(struct job *jp)
{
-#ifdef JOBS
- int mypgrp = getpgrp();
-#endif
- int status;
int st;
- struct sigaction act, oact;
- INTOFF;
- intreceived = 0;
-#ifdef JOBS
- if (!jobctl) {
-#else
- if (!iflag) {
-#endif
- sigaction(SIGINT, 0, &act);
- act.sa_handler = waitonint;
- sigaction(SIGINT, &act, &oact);
- }
- TRACE(("waitforjob(%%%d) called\n", jp - jobtab + 1));
- while (jp->state == 0) {
- dowait(1, jp);
- }
-#ifdef JOBS
- if (!jobctl) {
-#else
- if (!iflag) {
-#endif
- sigaction(SIGINT, &oact, 0);
- if (intreceived && trap[SIGINT]) kill(getpid(), SIGINT);
- }
-#ifdef JOBS
- if (jp->jobctl) {
-#ifdef OLD_TTY_DRIVER
- if (ioctl(2, TIOCSPGRP, (char *)&mypgrp) < 0)
- error("TIOCSPGRP failed, errno=%d\n", errno);
-#else
- if (tcsetpgrp(2, mypgrp) < 0)
- error("tcsetpgrp failed, errno=%d\n", errno);
-#endif
+ TRACE(("waitforjob(%%%d) called\n", jobno(jp)));
+ while (jp->state == JOBRUNNING) {
+ dowait(DOWAIT_BLOCK, jp);
}
- if (jp->state == JOBSTOPPED)
- curjob = jp - jobtab + 1;
-#endif
- status = jp->ps[jp->nprocs - 1].status;
- /* convert to 8 bits */
- if (WIFEXITED(status))
- st = WEXITSTATUS(status);
-#ifdef JOBS
- else if (WIFSTOPPED(status))
- st = WSTOPSIG(status) + 128;
-#endif
- else
- st = WTERMSIG(status) + 128;
-#ifdef JOBS
+ st = getstatus(jp);
+#if JOBS
if (jp->jobctl) {
+ xtcsetpgrp(ttyfd, rootpid);
/*
* This is truly gross.
* If we're doing job control, then we did a TIOCSPGRP which
* caused us (the shell) to no longer be in the controlling
* session -- so we wouldn't have seen any ^C/SIGINT. So, we
* intuit from the subprocess exit status whether a SIGINT
- * occured, and if so interrupt ourselves. Yuck. - mycroft
+ * occurred, and if so interrupt ourselves. Yuck. - mycroft
*/
- if (WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
+ if (jp->sigint)
raise(SIGINT);
}
if (jp->state == JOBDONE)
-
#endif
freejob(jp);
- INTON;
return st;
}
-
-/*
- * Wait for a process to terminate.
- */
-
/*
* Do a wait system call. If job control is compiled in, we accept
* stopped processes. If block is zero, we return a value of zero
@@ -7161,15 +7319,19 @@ waitforjob(struct job *jp)
* then checking to see whether it was called. If there are any
* children to be waited for, it will be.
*
+ * If neither SYSV nor BSD is defined, we don't implement nonblocking
+ * waits at all. In this case, the user will not be informed when
+ * a background process until the next time she runs a real program
+ * (as opposed to running a builtin command or just typing return),
+ * and the jobs command may give out of date information.
*/
static inline int
waitproc(int block, int *status)
{
- int flags;
+ int flags = 0;
- flags = 0;
-#ifdef JOBS
+#if JOBS
if (jobctl)
flags |= WUNTRACED;
#endif
@@ -7178,353 +7340,485 @@ waitproc(int block, int *status)
return wait3(status, flags, (struct rusage *)NULL);
}
+/*
+ * Wait for a process to terminate.
+ */
+
static int
dowait(int block, struct job *job)
{
int pid;
int status;
- struct procstat *sp;
struct job *jp;
struct job *thisjob;
- int done;
- int stopped;
- int core;
- int sig;
+ int state;
TRACE(("dowait(%d) called\n", block));
- do {
- pid = waitproc(block, &status);
- TRACE(("wait returns %d, status=%d\n", pid, status));
- } while (!(block & 2) && pid == -1 && errno == EINTR);
+ pid = waitproc(block, &status);
+ TRACE(("wait returns pid %d, status=%d\n", pid, status));
if (pid <= 0)
return pid;
INTOFF;
thisjob = NULL;
- for (jp = jobtab ; jp < jobtab + njobs ; jp++) {
- if (jp->used) {
- done = 1;
- stopped = 1;
- for (sp = jp->ps ; sp < jp->ps + jp->nprocs ; sp++) {
- if (sp->pid == -1)
- continue;
- if (sp->pid == pid) {
- TRACE(("Changing status of proc %d from 0x%x to 0x%x\n", pid, sp->status, status));
- sp->status = status;
- thisjob = jp;
- }
- if (sp->status == -1)
- stopped = 0;
- else if (WIFSTOPPED(sp->status))
- done = 0;
+ for (jp = curjob; jp; jp = jp->prev_job) {
+ struct procstat *sp;
+ struct procstat *spend;
+ if (jp->state == JOBDONE)
+ continue;
+ state = JOBDONE;
+ spend = jp->ps + jp->nprocs;
+ sp = jp->ps;
+ do {
+ if (sp->pid == pid) {
+ TRACE(("Job %d: changing status of proc %d from 0x%x to 0x%x\n", jobno(jp), pid, sp->status, status));
+ sp->status = status;
+ thisjob = jp;
}
- if (stopped) { /* stopped or done */
- int state = done? JOBDONE : JOBSTOPPED;
- if (jp->state != state) {
- TRACE(("Job %d: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state));
- jp->state = state;
+ if (sp->status == -1)
+ state = JOBRUNNING;
#ifdef JOBS
- if (done && curjob == jp - jobtab + 1)
- curjob = 0; /* no current job */
-#endif
- }
+ if (state == JOBRUNNING)
+ continue;
+ if (WIFSTOPPED(sp->status)) {
+ jp->stopstatus = sp->status;
+ state = JOBSTOPPED;
}
- }
+#endif
+ } while (++sp < spend);
+ if (thisjob)
+ goto gotjob;
}
- INTON;
- if (! rootshell || ! iflag || (job && thisjob == job)) {
- core = WCOREDUMP(status);
#ifdef JOBS
- if (WIFSTOPPED(status)) sig = WSTOPSIG(status);
- else
+ if (!WIFSTOPPED(status))
#endif
- if (WIFEXITED(status)) sig = 0;
- else sig = WTERMSIG(status);
- if (sig != 0 && sig != SIGINT && sig != SIGPIPE) {
- if (thisjob != job)
- out2fmt("%d: ", pid);
+ jobless--;
+ goto out;
+
+gotjob:
+ if (state != JOBRUNNING) {
+ thisjob->changed = 1;
+
+ if (thisjob->state != state) {
+ TRACE(("Job %d: changing state from %d to %d\n", jobno(thisjob), thisjob->state, state));
+ thisjob->state = state;
#ifdef JOBS
- if (sig == SIGTSTP && rootshell && iflag)
- out2fmt("%%%ld ",
- (long)(job - jobtab + 1));
+ if (state == JOBSTOPPED) {
+ set_curjob(thisjob, CUR_STOPPED);
+ }
#endif
- if (sig < NSIG && sys_siglist[sig])
- out2str(sys_siglist[sig]);
- else
- out2fmt("Signal %d", sig);
- if (core)
- out2str(" - core dumped");
- out2c('\n');
- } else {
- TRACE(("Not printing status: status=%d, sig=%d\n",
- status, sig));
}
- } else {
- TRACE(("Not printing status, rootshell=%d, job=0x%x\n", rootshell, job));
- if (thisjob)
- thisjob->changed = 1;
}
- return pid;
-}
+out:
+ INTON;
+ if (thisjob && thisjob == job) {
+ char s[48 + 1];
+ int len;
+
+ len = sprint_status(s, status, 1);
+ if (len) {
+ s[len] = '\n';
+ s[len + 1] = 0;
+ out2str(s);
+ }
+ }
+ return pid;
+}
/*
* return 1 if there are stopped jobs, otherwise 0
*/
-static int
+
+int
stoppedjobs(void)
{
- int jobno;
struct job *jp;
+ int retval;
+ retval = 0;
if (job_warning)
- return (0);
- for (jobno = 1, jp = jobtab; jobno <= njobs; jobno++, jp++) {
- if (jp->used == 0)
- continue;
- if (jp->state == JOBSTOPPED) {
- out2str("You have stopped jobs.\n");
- job_warning = 2;
- return (1);
- }
+ goto out;
+ jp = curjob;
+ if (jp && jp->state == JOBSTOPPED) {
+ out2str("You have stopped jobs.\n");
+ job_warning = 2;
+ retval++;
}
- return (0);
+out:
+ return retval;
}
/*
* Return a string identifying a command (to be printed by the
- * jobs command.
+ * jobs command).
*/
+#if JOBS
static char *cmdnextc;
-static int cmdnleft;
-#define MAXCMDTEXT 200
-static void
-cmdputs(const char *s)
+static char *
+commandtext(union node *n)
{
- const char *p;
- char *q;
- char c;
- int subtype = 0;
+ char *name;
- if (cmdnleft <= 0)
- return;
- p = s;
- q = cmdnextc;
- while ((c = *p++) != '\0') {
- if (c == CTLESC)
- *q++ = *p++;
- else if (c == CTLVAR) {
- *q++ = '$';
- if (--cmdnleft > 0)
- *q++ = '{';
- subtype = *p++;
- } else if (c == '=' && subtype != 0) {
- *q++ = "}-+?="[(subtype & VSTYPE) - VSNORMAL];
- subtype = 0;
- } else if (c == CTLENDVAR) {
- *q++ = '}';
- } else if (c == CTLBACKQ || c == CTLBACKQ+CTLQUOTE)
- cmdnleft++; /* ignore it */
- else
- *q++ = c;
- if (--cmdnleft <= 0) {
- *q++ = '.';
- *q++ = '.';
- *q++ = '.';
- break;
- }
- }
- cmdnextc = q;
+ STARTSTACKSTR(cmdnextc);
+ cmdtxt(n);
+ name = stackblock();
+ TRACE(("commandtext: name %p, end %p\n\t\"%s\"\n",
+ name, cmdnextc, cmdnextc));
+ return savestr(name);
}
-
static void
-cmdtxt(const union node *n)
+cmdtxt(union node *n)
{
union node *np;
struct nodelist *lp;
const char *p;
- int i;
char s[2];
- if (n == NULL)
- return;
switch (n->type) {
- case NSEMI:
- cmdtxt(n->nbinary.ch1);
- cmdputs("; ");
- cmdtxt(n->nbinary.ch2);
- break;
- case NAND:
- cmdtxt(n->nbinary.ch1);
- cmdputs(" && ");
- cmdtxt(n->nbinary.ch2);
- break;
- case NOR:
- cmdtxt(n->nbinary.ch1);
- cmdputs(" || ");
- cmdtxt(n->nbinary.ch2);
- break;
+ default:
+#if DEBUG
+ abort();
+#endif
case NPIPE:
- for (lp = n->npipe.cmdlist ; lp ; lp = lp->next) {
+ lp = n->npipe.cmdlist;
+ for (;;) {
cmdtxt(lp->n);
- if (lp->next)
- cmdputs(" | ");
+ lp = lp->next;
+ if (!lp)
+ break;
+ cmdputs(" | ");
}
break;
- case NSUBSHELL:
- cmdputs("(");
- cmdtxt(n->nredir.n);
- cmdputs(")");
- break;
+ case NSEMI:
+ p = "; ";
+ goto binop;
+ case NAND:
+ p = " && ";
+ goto binop;
+ case NOR:
+ p = " || ";
+binop:
+ cmdtxt(n->nbinary.ch1);
+ cmdputs(p);
+ n = n->nbinary.ch2;
+ goto donode;
case NREDIR:
case NBACKGND:
- cmdtxt(n->nredir.n);
+ n = n->nredir.n;
+ goto donode;
+ case NNOT:
+ cmdputs("!");
+ n = n->nnot.com;
+donode:
+ cmdtxt(n);
break;
case NIF:
cmdputs("if ");
cmdtxt(n->nif.test);
cmdputs("; then ");
- cmdtxt(n->nif.ifpart);
- cmdputs("...");
- break;
+ n = n->nif.ifpart;
+ if (n->nif.elsepart) {
+ cmdtxt(n);
+ cmdputs("; else ");
+ n = n->nif.elsepart;
+ }
+ p = "; fi";
+ goto dotail;
+ case NSUBSHELL:
+ cmdputs("(");
+ n = n->nredir.n;
+ p = ")";
+ goto dotail;
case NWHILE:
- cmdputs("while ");
+ p = "while ";
goto until;
case NUNTIL:
- cmdputs("until ");
+ p = "until ";
until:
+ cmdputs(p);
cmdtxt(n->nbinary.ch1);
+ n = n->nbinary.ch2;
+ p = "; done";
+dodo:
cmdputs("; do ");
- cmdtxt(n->nbinary.ch2);
- cmdputs("; done");
- break;
+dotail:
+ cmdtxt(n);
+ goto dotail2;
case NFOR:
cmdputs("for ");
cmdputs(n->nfor.var);
- cmdputs(" in ...");
- break;
- case NCASE:
- cmdputs("case ");
- cmdputs(n->ncase.expr->narg.text);
- cmdputs(" in ...");
- break;
+ cmdputs(" in ");
+ cmdlist(n->nfor.args, 1);
+ n = n->nfor.body;
+ p = "; done";
+ goto dodo;
case NDEFUN:
cmdputs(n->narg.text);
- cmdputs("() ...");
- break;
+ p = "() { ... }";
+ goto dotail2;
case NCMD:
- for (np = n->ncmd.args ; np ; np = np->narg.next) {
- cmdtxt(np);
- if (np->narg.next)
- cmdputs(spcstr);
- }
- for (np = n->ncmd.redirect ; np ; np = np->nfile.next) {
- cmdputs(spcstr);
- cmdtxt(np);
- }
+ cmdlist(n->ncmd.args, 1);
+ cmdlist(n->ncmd.redirect, 0);
break;
case NARG:
- cmdputs(n->narg.text);
+ p = n->narg.text;
+dotail2:
+ cmdputs(p);
break;
+ case NHERE:
+ case NXHERE:
+ p = "<<...";
+ goto dotail2;
+ case NCASE:
+ cmdputs("case ");
+ cmdputs(n->ncase.expr->narg.text);
+ cmdputs(" in ");
+ for (np = n->ncase.cases; np; np = np->nclist.next) {
+ cmdtxt(np->nclist.pattern);
+ cmdputs(") ");
+ cmdtxt(np->nclist.body);
+ cmdputs(";; ");
+ }
+ p = "esac";
+ goto dotail2;
case NTO:
- p = ">"; i = 1; goto redir;
+ p = ">";
+ goto redir;
+ case NCLOBBER:
+ p = ">|";
+ goto redir;
case NAPPEND:
- p = ">>"; i = 1; goto redir;
+ p = ">>";
+ goto redir;
case NTOFD:
- p = ">&"; i = 1; goto redir;
- case NTOOV:
- p = ">|"; i = 1; goto redir;
+ p = ">&";
+ goto redir;
case NFROM:
- p = "<"; i = 0; goto redir;
+ p = "<";
+ goto redir;
case NFROMFD:
- p = "<&"; i = 0; goto redir;
+ p = "<&";
+ goto redir;
case NFROMTO:
- p = "<>"; i = 0; goto redir;
+ p = "<>";
redir:
- if (n->nfile.fd != i) {
- s[0] = n->nfile.fd + '0';
- s[1] = '\0';
- cmdputs(s);
- }
+ s[0] = n->nfile.fd + '0';
+ s[1] = '\0';
+ cmdputs(s);
cmdputs(p);
if (n->type == NTOFD || n->type == NFROMFD) {
s[0] = n->ndup.dupfd + '0';
- s[1] = '\0';
- cmdputs(s);
+ p = s;
+ goto dotail2;
} else {
- cmdtxt(n->nfile.fname);
+ n = n->nfile.fname;
+ goto donode;
}
- break;
- case NHERE:
- case NXHERE:
- cmdputs("<<...");
- break;
- default:
- cmdputs("???");
- break;
}
}
+static void
+cmdlist(union node *np, int sep)
+{
+ for (; np; np = np->narg.next) {
+ if (!sep)
+ cmdputs(spcstr);
+ cmdtxt(np);
+ if (sep && np->narg.next)
+ cmdputs(spcstr);
+ }
+}
-static char *
-commandtext(const union node *n)
+static void
+cmdputs(const char *s)
{
- char *name;
+ const char *p, *str;
+ char c, cc[2] = " ";
+ char *nextc;
+ int subtype = 0;
+ int quoted = 0;
+ static const char *const vstype[16] = {
+ nullstr, "}", "-", "+", "?", "=",
+ "#", "##", "%", "%%"
+ };
- cmdnextc = name = ckmalloc(MAXCMDTEXT);
- cmdnleft = MAXCMDTEXT - 4;
- cmdtxt(n);
- *cmdnextc = '\0';
- return name;
+ nextc = makestrspace((strlen(s) + 1) * 8, cmdnextc);
+ p = s;
+ while ((c = *p++) != 0) {
+ str = 0;
+ switch (c) {
+ case CTLESC:
+ c = *p++;
+ break;
+ case CTLVAR:
+ subtype = *p++;
+ if ((subtype & VSTYPE) == VSLENGTH)
+ str = "${#";
+ else
+ str = "${";
+ if (!(subtype & VSQUOTE) != !(quoted & 1)) {
+ quoted ^= 1;
+ c = '"';
+ } else
+ goto dostr;
+ break;
+ case CTLENDVAR:
+ quoted >>= 1;
+ subtype = 0;
+ if (quoted & 1) {
+ str = "\"}";
+ goto dostr;
+ }
+ c = '}';
+ break;
+ case CTLBACKQ:
+ str = "$(...)";
+ goto dostr;
+ case CTLBACKQ+CTLQUOTE:
+ str = "\"$(...)\"";
+ goto dostr;
+#ifdef BB_ASH_MATH_SUPPORT
+ case CTLARI:
+ str = "$((";
+ goto dostr;
+ case CTLENDARI:
+ str = "))";
+ goto dostr;
+#endif
+ case CTLQUOTEMARK:
+ quoted ^= 1;
+ c = '"';
+ break;
+ case '=':
+ if (subtype == 0)
+ break;
+ str = vstype[subtype & VSTYPE];
+ if (subtype & VSNUL)
+ c = ':';
+ else
+ c = *str++;
+ if (c != '}')
+ quoted <<= 1;
+ break;
+ case '\'':
+ case '\\':
+ case '"':
+ case '$':
+ /* These can only happen inside quotes */
+ cc[0] = c;
+ str = cc;
+ c = '\\';
+ break;
+ default:
+ break;
+ }
+ USTPUTC(c, nextc);
+ if (!str)
+ continue;
+dostr:
+ while ((c = *str++)) {
+ USTPUTC(c, nextc);
+ }
+ }
+ if (quoted & 1) {
+ USTPUTC('"', nextc);
+ }
+ *nextc = 0;
+ cmdnextc = nextc;
}
-static void waitonint(int sig) {
- intreceived = 1;
- return;
+static void
+showpipe(struct job *jp, FILE *out)
+{
+ struct procstat *sp;
+ struct procstat *spend;
+
+ spend = jp->ps + jp->nprocs;
+ for (sp = jp->ps + 1; sp < spend; sp++)
+ fprintf(out, " | %s", sp->cmd);
+ outcslow('\n', out);
+ flushall();
+}
+
+static void
+xtcsetpgrp(int fd, pid_t pgrp)
+{
+ if (tcsetpgrp(fd, pgrp))
+ error("Cannot set tty process group (%m)");
+}
+#endif /* JOBS */
+
+static int
+getstatus(struct job *job) {
+ int status;
+ int retval;
+
+ status = job->ps[job->nprocs - 1].status;
+ retval = WEXITSTATUS(status);
+ if (!WIFEXITED(status)) {
+#if JOBS
+ retval = WSTOPSIG(status);
+ if (!WIFSTOPPED(status))
+#endif
+ {
+ /* XXX: limits number of signals */
+ retval = WTERMSIG(status);
+#if JOBS
+ if (retval == SIGINT)
+ job->sigint = 1;
+#endif
+ }
+ retval += 128;
+ }
+ TRACE(("getstatus: job %d, nproc %d, status %x, retval %x\n",
+ jobno(job), job->nprocs, status, retval));
+ return retval;
}
+
+#ifdef BB_ASH_MAIL
+/* $NetBSD: mail.c,v 1.15 2002/11/24 22:35:40 christos Exp $ */
+
/*
* Routines to check for mail. (Perhaps make part of main.c?)
*/
-
#define MAXMBOXES 10
-
-static int nmboxes; /* number of mailboxes */
-static time_t mailtime[MAXMBOXES]; /* times of mailboxes */
+/* times of mailboxes */
+static time_t mailtime[MAXMBOXES];
+/* Set if MAIL or MAILPATH is changed. */
+static int mail_var_path_changed;
/*
- * Print appropriate message(s) if mail has arrived. If the argument is
- * nozero, then the value of MAIL has changed, so we just update the
- * values.
+ * Print appropriate message(s) if mail has arrived.
+ * If mail_var_path_changed is set,
+ * then the value of MAIL has mail_var_path_changed,
+ * so we just update the values.
*/
static void
-chkmail(int silent)
+chkmail(void)
{
- int i;
const char *mpath;
char *p;
char *q;
+ time_t *mtp;
struct stackmark smark;
struct stat statb;
- if (silent)
- nmboxes = 10;
- if (nmboxes == 0)
- return;
setstackmark(&smark);
- mpath = mpathset()? mpathval() : mailval();
- for (i = 0 ; i < nmboxes ; i++) {
+ mpath = mpathset() ? mpathval() : mailval();
+ for (mtp = mailtime; mtp < mailtime + MAXMBOXES; mtp++) {
p = padvance(&mpath, nullstr);
if (p == NULL)
break;
@@ -7536,31 +7830,42 @@ chkmail(int silent)
abort();
#endif
q[-1] = '\0'; /* delete trailing '/' */
- if (stat(p, &statb) < 0)
- statb.st_size = 0;
- if (statb.st_size > mailtime[i] && ! silent) {
- out2fmt(snlfmt,
- pathopt? pathopt : "you have mail");
+ if (stat(p, &statb) < 0) {
+ *mtp = 0;
+ continue;
+ }
+ if (!mail_var_path_changed && statb.st_mtime != *mtp) {
+ fprintf(
+ stderr, snlfmt,
+ pathopt ? pathopt : "you have mail"
+ );
}
- mailtime[i] = statb.st_size;
+ *mtp = statb.st_mtime;
}
- nmboxes = i;
+ mail_var_path_changed = 0;
popstackmark(&smark);
}
-#define PROFILE 0
+
+static void
+changemail(const char *val)
+{
+ mail_var_path_changed++;
+}
+
+#endif /* BB_ASH_MAIL */
+
+/* $NetBSD: main.c,v 1.46 2002/12/11 19:12:18 christos Exp $ */
+
#if PROFILE
static short profile_buf[16384];
extern int etext();
#endif
-static void read_profile (const char *);
-static void cmdloop (int);
-static void options (int);
-static void setoption (int, int);
-static void procargs (int, char **);
+static int isloginsh;
+static void read_profile(const char *);
/*
* Main routine. We initialize things, parse the arguments, execute
@@ -7571,65 +7876,48 @@ static void procargs (int, char **);
*/
int
-ash_main(argc, argv)
- int argc;
- char **argv;
+ash_main(int argc, char **argv)
{
+ char *shinit;
+ volatile int state;
struct jmploc jmploc;
struct stackmark smark;
- volatile int state;
- const char *shinit;
-
- BLTINCMD = find_builtin("builtin");
- EXECCMD = find_builtin("exec");
- EVALCMD = find_builtin("eval");
-#ifndef BB_FEATURE_SH_FANCY_PROMPT
- unsetenv("PS1");
- unsetenv("PS2");
+#ifdef __GLIBC__
+ dash_errno = __errno_location();
#endif
#if PROFILE
monitor(4, etext, profile_buf, sizeof profile_buf, 50);
#endif
-#if defined(linux) || defined(__GNU__)
- signal(SIGCHLD, SIG_DFL);
-#endif
state = 0;
if (setjmp(jmploc.loc)) {
- INTOFF;
- /*
- * When a shell procedure is executed, we raise the
- * exception EXSHELLPROC to clean up before executing
- * the shell procedure.
- */
- switch (exception) {
- case EXSHELLPROC:
- rootpid = getpid();
- rootshell = 1;
- minusc = NULL;
- state = 3;
- break;
+ int status;
+ int e;
+ reset();
+
+ e = exception;
+ switch (exception) {
case EXEXEC:
- exitstatus = exerrno;
+ status = exerrno;
break;
case EXERROR:
- exitstatus = 2;
+ status = 2;
break;
default:
+ status = exitstatus;
break;
}
+ exitstatus = status;
- if (exception != EXSHELLPROC) {
- if (state == 0 || iflag == 0 || ! rootshell)
- exitshell(exitstatus);
- }
- reset();
- if (exception == EXINT) {
- out2c('\n');
+ if (e == EXEXIT || state == 0 || iflag == 0 || ! rootshell)
+ exitshell();
+
+ if (e == EXINT) {
+ outcslow('\n', stderr);
}
popstackmark(&smark);
FORCEINTON; /* enable interrupts */
@@ -7652,7 +7940,23 @@ ash_main(argc, argv)
init();
setstackmark(&smark);
procargs(argc, argv);
- if (argv[0] && argv[0][0] == '-') {
+#ifdef BB_FEATURE_COMMAND_SAVEHISTORY
+ if ( iflag ) {
+ const char *hp = lookupvar("HISTFILE");
+
+ if(hp == NULL ) {
+ hp = lookupvar("HOME");
+ if(hp != NULL) {
+ char *defhp = concat_path_file(hp, ".ash_history");
+ setvar("HISTFILE", defhp, 0);
+ free(defhp);
+ }
+ }
+ }
+#endif
+ if (argv[0] && argv[0][0] == '-')
+ isloginsh = 1;
+ if (isloginsh) {
state = 1;
read_profile("/etc/profile");
state1:
@@ -7661,44 +7965,43 @@ state1:
}
state2:
state = 3;
+ if (
#ifndef linux
- if (getuid() == geteuid() && getgid() == getegid()) {
+ getuid() == geteuid() && getgid() == getegid() &&
#endif
+ iflag
+ ) {
if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
- state = 3;
read_profile(shinit);
}
-#ifndef linux
}
-#endif
state3:
state = 4;
- if (sflag == 0 || minusc) {
- static int sigs[] = {
- SIGINT, SIGQUIT, SIGHUP,
-#ifdef SIGTSTP
- SIGTSTP,
-#endif
- SIGPIPE
- };
-#define SIGSSIZE (sizeof(sigs)/sizeof(sigs[0]))
- int i;
-
- for (i = 0; i < SIGSSIZE; i++)
- setsignal(sigs[i]);
- }
-
if (minusc)
evalstring(minusc, 0);
if (sflag || minusc == NULL) {
+#ifdef BB_FEATURE_COMMAND_SAVEHISTORY
+ if ( iflag ) {
+ const char *hp = lookupvar("HISTFILE");
+
+ if(hp != NULL )
+ load_history ( hp );
+ }
+#endif
state4: /* XXX ??? - why isn't this before the "if" statement */
cmdloop(1);
}
#if PROFILE
monitor(0);
#endif
- exitshell(exitstatus);
+#if GPROF
+ {
+ extern void _mcleanup(void);
+ _mcleanup();
+ }
+#endif
+ exitshell();
/* NOTREACHED */
}
@@ -7721,12 +8024,16 @@ cmdloop(int top)
for (;;) {
if (pendingsigs)
dotrap();
+#if JOBS
+ if (jobctl)
+ showjobs(stderr, SHOW_CHANGED);
+#endif
inter = 0;
if (iflag && top) {
inter++;
- showjobs(1);
- chkmail(0);
- flushall();
+#ifdef BB_ASH_MAIL
+ chkmail();
+#endif
}
n = parsecmd(inter);
/* showtree(n); DEBUG */
@@ -7755,14 +8062,12 @@ cmdloop(int top)
}
-
/*
* Read /etc/profile or .profile. Return on error.
*/
static void
-read_profile(name)
- const char *name;
+read_profile(const char *name)
{
int fd;
int xflag_set = 0;
@@ -7792,13 +8097,12 @@ read_profile(name)
}
-
/*
* Read a file containing shell functions.
*/
static void
-readcmdfile(const char *name)
+readcmdfile(char *name)
{
int fd;
@@ -7813,26 +8117,23 @@ readcmdfile(const char *name)
}
-
/*
- * Take commands from a file. To be compatable we should do a path
+ * Take commands from a file. To be compatible we should do a path
* search for the file, which is necessary to find sub-commands.
*/
-
static inline char *
-find_dot_file(mybasename)
- char *mybasename;
+find_dot_file(char *name)
{
char *fullname;
const char *path = pathval();
struct stat statb;
/* don't try this for absolute or relative paths */
- if (strchr(mybasename, '/'))
- return mybasename;
+ if (strchr(name, '/'))
+ return name;
- while ((fullname = padvance(&path, mybasename)) != NULL) {
+ while ((fullname = padvance(&path, name)) != NULL) {
if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) {
/*
* Don't bother freeing here, since it will
@@ -7844,21 +8145,15 @@ find_dot_file(mybasename)
}
/* not found in the PATH */
- error("%s: not found", mybasename);
+ error(not_found_msg, name);
/* NOTREACHED */
}
-static int
-dotcmd(argc, argv)
- int argc;
- char **argv;
+int
+dotcmd(int argc, char **argv)
{
- struct strlist *sp;
exitstatus = 0;
- for (sp = cmdenviron; sp ; sp = sp->next)
- setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED);
-
if (argc >= 2) { /* That's what SVR2 does */
char *fullname;
struct stackmark smark;
@@ -7876,66 +8171,110 @@ dotcmd(argc, argv)
static int
-exitcmd(argc, argv)
- int argc;
- char **argv;
+exitcmd(int argc, char **argv)
{
if (stoppedjobs())
return 0;
if (argc > 1)
exitstatus = number(argv[1]);
- else
- exitstatus = oexitstatus;
- exitshell(exitstatus);
+ exraise(EXEXIT);
/* NOTREACHED */
}
+/* $NetBSD: memalloc.c,v 1.27 2003/01/22 20:36:04 dsl Exp $ */
+
+/*
+ * Same for malloc, realloc, but returns an error when out of space.
+ */
+
+static pointer
+ckrealloc(pointer p, size_t nbytes)
+{
+ p = realloc(p, nbytes);
+ if (p == NULL)
+ error(memory_exhausted);
+ return p;
+}
+
+static pointer
+ckmalloc(size_t nbytes)
+{
+ return ckrealloc(NULL, nbytes);
+}
+
+/*
+ * Make a copy of a string in safe storage.
+ */
+
+static char *
+savestr(const char *s)
+{
+ char *p = strdup(s);
+ if (!p)
+ error(memory_exhausted);
+ return p;
+}
+
+
+/*
+ * Parse trees for commands are allocated in lifo order, so we use a stack
+ * to make this more efficient, and also to avoid all sorts of exception
+ * handling code to handle interrupts in the middle of a parse.
+ *
+ * The size 504 was chosen because the Ultrix malloc handles that size
+ * well.
+ */
+
+
static pointer
-stalloc(int nbytes)
+stalloc(size_t nbytes)
{
char *p;
+ size_t aligned;
- nbytes = ALIGN(nbytes);
- if (nbytes > stacknleft) {
- int blocksize;
+ aligned = SHELL_ALIGN(nbytes);
+ if (aligned > stacknleft) {
+ size_t len;
+ size_t blocksize;
struct stack_block *sp;
- blocksize = nbytes;
+ blocksize = aligned;
if (blocksize < MINSIZE)
blocksize = MINSIZE;
+ len = sizeof(struct stack_block) - MINSIZE + blocksize;
+ if (len < blocksize)
+ error(memory_exhausted);
INTOFF;
- sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + blocksize);
+ sp = ckmalloc(len);
sp->prev = stackp;
stacknxt = sp->space;
stacknleft = blocksize;
+ sstrend = stacknxt + blocksize;
stackp = sp;
INTON;
}
p = stacknxt;
- stacknxt += nbytes;
- stacknleft -= nbytes;
+ stacknxt += aligned;
+ stacknleft -= aligned;
return p;
}
-static void
+void
stunalloc(pointer p)
{
#ifdef DEBUG
- if (p == NULL) { /*DEBUG */
+ if (!p || (stacknxt < (char *)p) || ((char *)p < stackp->space)) {
write(2, "stunalloc\n", 10);
abort();
}
#endif
- if (!(stacknxt >= (char *)p && (char *)p >= stackp->space)) {
- p = stackp->space;
- }
stacknleft += stacknxt - (char *)p;
stacknxt = p;
}
-static void
+void
setstackmark(struct stackmark *mark)
{
mark->stackp = stackp;
@@ -7946,7 +8285,7 @@ setstackmark(struct stackmark *mark)
}
-static void
+void
popstackmark(struct stackmark *mark)
{
struct stack_block *sp;
@@ -7960,6 +8299,7 @@ popstackmark(struct stackmark *mark)
}
stacknxt = mark->stacknxt;
stacknleft = mark->stacknleft;
+ sstrend = mark->stacknxt + mark->stacknleft;
INTON;
}
@@ -7974,61 +8314,69 @@ popstackmark(struct stackmark *mark)
* part of the block that has been used.
*/
-static void
-growstackblock(void) {
- char *p;
- int newlen = ALIGN(stacknleft * 2 + 100);
- char *oldspace = stacknxt;
- int oldlen = stacknleft;
- struct stack_block *sp;
- struct stack_block *oldstackp;
+void
+growstackblock(void)
+{
+ size_t newlen;
+
+ newlen = stacknleft * 2;
+ if (newlen < stacknleft)
+ error(memory_exhausted);
+ if (newlen < 128)
+ newlen += 128;
if (stacknxt == stackp->space && stackp != &stackbase) {
+ struct stack_block *oldstackp;
+ struct stackmark *xmark;
+ struct stack_block *sp;
+ struct stack_block *prevstackp;
+ size_t grosslen;
+
INTOFF;
oldstackp = stackp;
sp = stackp;
- stackp = sp->prev;
- sp = ckrealloc((pointer)sp, sizeof(struct stack_block) - MINSIZE + newlen);
- sp->prev = stackp;
+ prevstackp = sp->prev;
+ grosslen = newlen + sizeof(struct stack_block) - MINSIZE;
+ sp = ckrealloc((pointer)sp, grosslen);
+ sp->prev = prevstackp;
stackp = sp;
stacknxt = sp->space;
stacknleft = newlen;
- {
- /* Stack marks pointing to the start of the old block
- * must be relocated to point to the new block
- */
- struct stackmark *xmark;
- xmark = markp;
- while (xmark != NULL && xmark->stackp == oldstackp) {
- xmark->stackp = stackp;
- xmark->stacknxt = stacknxt;
- xmark->stacknleft = stacknleft;
- xmark = xmark->marknext;
- }
+ sstrend = sp->space + newlen;
+
+ /*
+ * Stack marks pointing to the start of the old block
+ * must be relocated to point to the new block
+ */
+ xmark = markp;
+ while (xmark != NULL && xmark->stackp == oldstackp) {
+ xmark->stackp = stackp;
+ xmark->stacknxt = stacknxt;
+ xmark->stacknleft = stacknleft;
+ xmark = xmark->marknext;
}
INTON;
} else {
- p = stalloc(newlen);
- memcpy(p, oldspace, oldlen);
- stacknxt = p; /* free the space */
- stacknleft += newlen; /* we just allocated */
+ char *oldspace = stacknxt;
+ int oldlen = stacknleft;
+ char *p = stalloc(newlen);
+
+ /* free the space we just allocated */
+ stacknxt = memcpy(p, oldspace, oldlen);
+ stacknleft += newlen;
}
}
-
-
static inline void
-grabstackblock(int len)
+grabstackblock(size_t len)
{
- len = ALIGN(len);
+ len = SHELL_ALIGN(len);
stacknxt += len;
stacknleft -= len;
}
-
-
/*
- * The following routines are somewhat easier to use that the above.
+ * The following routines are somewhat easier to use than the above.
* The user declares a variable of type STACKSTR, which may be declared
* to be a register. The macro STARTSTACKSTR initializes things. Then
* the user uses the macro STPUTC to add characters to the string. In
@@ -8045,511 +8393,158 @@ grabstackblock(int len)
* is space for at least one character.
*/
-
-static char *
-growstackstr(void) {
- int len = stackblocksize();
+void *
+growstackstr(void)
+{
+ size_t len = stackblocksize();
if (herefd >= 0 && len >= 1024) {
xwrite(herefd, stackblock(), len);
- sstrnleft = len - 1;
return stackblock();
}
growstackblock();
- sstrnleft = stackblocksize() - len - 1;
return stackblock() + len;
}
-
/*
* Called from CHECKSTRSPACE.
*/
-static char *
-makestrspace(size_t newlen) {
- int len = stackblocksize() - sstrnleft;
- do {
- growstackblock();
- sstrnleft = stackblocksize() - len;
- } while (sstrnleft < newlen);
- return stackblock() + len;
-}
-
-
-
-static void
-ungrabstackstr(char *s, char *p)
+char *
+makestrspace(size_t newlen, char *p)
{
- stacknleft += stacknxt - s;
- stacknxt = s;
- sstrnleft = stacknleft - (p - s);
-}
-/*
- * Miscelaneous builtins.
- */
-
-
-#undef rflag
-
-//#ifdef __GLIBC__
-static mode_t getmode(const void *, mode_t);
-static void *setmode(const char *);
-//#endif
-
-#if !defined(__GLIBC__) || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
-typedef long rlim_t;
-#endif
-
-
+ size_t len = p - stacknxt;
+ size_t size = stackblocksize();
-/*
- * The read builtin. The -e option causes backslashes to escape the
- * following character.
- *
- * This uses unbuffered input, which may be avoidable in some cases.
- */
-
-static int
-readcmd(argc, argv)
- int argc;
- char **argv;
-{
- char **ap;
- int backslash;
- char c;
- int rflag;
- char *prompt;
- const char *ifs;
- char *p;
- int startword;
- int status;
- int i;
-
- rflag = 0;
- prompt = NULL;
- while ((i = nextopt("p:r")) != '\0') {
- if (i == 'p')
- prompt = optionarg;
- else
- rflag = 1;
- }
- if (prompt && isatty(0)) {
- putprompt(prompt);
- flushall();
- }
- if (*(ap = argptr) == NULL)
- error("arg count");
- if ((ifs = bltinlookup("IFS")) == NULL)
- ifs = defifs;
- status = 0;
- startword = 1;
- backslash = 0;
- STARTSTACKSTR(p);
for (;;) {
- if (read(0, &c, 1) != 1) {
- status = 1;
- break;
- }
- if (c == '\0')
- continue;
- if (backslash) {
- backslash = 0;
- if (c != '\n')
- STPUTC(c, p);
- continue;
- }
- if (!rflag && c == '\\') {
- backslash++;
- continue;
- }
- if (c == '\n')
+ size_t nleft;
+
+ size = stackblocksize();
+ nleft = size - len;
+ if (nleft >= newlen)
break;
- if (startword && *ifs == ' ' && strchr(ifs, c)) {
- continue;
- }
- startword = 0;
- if (backslash && c == '\\') {
- if (read(0, &c, 1) != 1) {
- status = 1;
- break;
- }
- STPUTC(c, p);
- } else if (ap[1] != NULL && strchr(ifs, c) != NULL) {
- STACKSTRNUL(p);
- setvar(*ap, stackblock(), 0);
- ap++;
- startword = 1;
- STARTSTACKSTR(p);
- } else {
- STPUTC(c, p);
- }
+ growstackblock();
}
- STACKSTRNUL(p);
- /* Remove trailing blanks */
- while (stackblock() <= --p && strchr(ifs, *p) != NULL)
- *p = '\0';
- setvar(*ap, stackblock(), 0);
- while (*++ap != NULL)
- setvar(*ap, nullstr, 0);
- return status;
+ return stackblock() + len;
}
-
-
-static int
-umaskcmd(argc, argv)
- int argc;
- char **argv;
+char *
+stnputs(const char *s, size_t n, char *p)
{
- char *ap;
- int mask;
- int i;
- int symbolic_mode = 0;
-
- while (nextopt("S") != '\0') {
- symbolic_mode = 1;
- }
-
- INTOFF;
- mask = umask(0);
- umask(mask);
- INTON;
-
- if ((ap = *argptr) == NULL) {
- if (symbolic_mode) {
- char u[4], g[4], o[4];
-
- i = 0;
- if ((mask & S_IRUSR) == 0)
- u[i++] = 'r';
- if ((mask & S_IWUSR) == 0)
- u[i++] = 'w';
- if ((mask & S_IXUSR) == 0)
- u[i++] = 'x';
- u[i] = '\0';
-
- i = 0;
- if ((mask & S_IRGRP) == 0)
- g[i++] = 'r';
- if ((mask & S_IWGRP) == 0)
- g[i++] = 'w';
- if ((mask & S_IXGRP) == 0)
- g[i++] = 'x';
- g[i] = '\0';
-
- i = 0;
- if ((mask & S_IROTH) == 0)
- o[i++] = 'r';
- if ((mask & S_IWOTH) == 0)
- o[i++] = 'w';
- if ((mask & S_IXOTH) == 0)
- o[i++] = 'x';
- o[i] = '\0';
-
- printf("u=%s,g=%s,o=%s\n", u, g, o);
- } else {
- printf("%.4o\n", mask);
- }
- } else {
- if (is_digit((unsigned char)*ap)) {
- mask = 0;
- do {
- if (*ap >= '8' || *ap < '0')
- error("Illegal number: %s", argv[1]);
- mask = (mask << 3) + (*ap - '0');
- } while (*++ap != '\0');
- umask(mask);
- } else {
- void *set;
-
- INTOFF;
- if ((set = setmode(ap)) != 0) {
- mask = getmode(set, ~mask & 0777);
- ckfree(set);
- }
- INTON;
- if (!set)
- error("Illegal mode: %s", ap);
+ p = makestrspace(n, p);
+ p = mempcpy(p, s, n);
+ return p;
+}
- umask(~mask & 0777);
- }
- }
- return 0;
+char *
+stputs(const char *s, char *p)
+{
+ return stnputs(s, strlen(s), p);
}
+/* $NetBSD: mystring.c,v 1.15 2002/11/24 22:35:42 christos Exp $ */
+
/*
- * ulimit builtin
+ * String functions.
*
- * This code, originally by Doug Gwyn, Doug Kingston, Eric Gisin, and
- * Michael Rendell was ripped from pdksh 5.0.8 and hacked for use with
- * ash by J.T. Conklin.
- *
- * Public domain.
+ * number(s) Convert a string of digits to an integer.
+ * is_number(s) Return true if s is a string of digits.
*/
-struct limits {
- const char *name;
- int cmd;
- int factor; /* multiply by to get rlim_{cur,max} values */
- char option;
-};
-
-static const struct limits limits[] = {
-#ifdef RLIMIT_CPU
- { "time(seconds)", RLIMIT_CPU, 1, 't' },
-#endif
-#ifdef RLIMIT_FSIZE
- { "file(blocks)", RLIMIT_FSIZE, 512, 'f' },
-#endif
-#ifdef RLIMIT_DATA
- { "data(kbytes)", RLIMIT_DATA, 1024, 'd' },
-#endif
-#ifdef RLIMIT_STACK
- { "stack(kbytes)", RLIMIT_STACK, 1024, 's' },
-#endif
-#ifdef RLIMIT_CORE
- { "coredump(blocks)", RLIMIT_CORE, 512, 'c' },
-#endif
-#ifdef RLIMIT_RSS
- { "memory(kbytes)", RLIMIT_RSS, 1024, 'm' },
-#endif
-#ifdef RLIMIT_MEMLOCK
- { "locked memory(kbytes)", RLIMIT_MEMLOCK, 1024, 'l' },
-#endif
-#ifdef RLIMIT_NPROC
- { "process(processes)", RLIMIT_NPROC, 1, 'p' },
-#endif
-#ifdef RLIMIT_NOFILE
- { "nofiles(descriptors)", RLIMIT_NOFILE, 1, 'n' },
-#endif
-#ifdef RLIMIT_VMEM
- { "vmemory(kbytes)", RLIMIT_VMEM, 1024, 'v' },
-#endif
-#ifdef RLIMIT_SWAP
- { "swap(kbytes)", RLIMIT_SWAP, 1024, 'w' },
-#endif
- { (char *) 0, 0, 0, '\0' }
-};
-
-static int
-ulimitcmd(argc, argv)
- int argc;
- char **argv;
-{
- int c;
- rlim_t val = 0;
- enum { SOFT = 0x1, HARD = 0x2 }
- how = SOFT | HARD;
- const struct limits *l;
- int set, all = 0;
- int optc, what;
- struct rlimit limit;
-
- what = 'f';
- while ((optc = nextopt("HSatfdsmcnpl")) != '\0')
- switch (optc) {
- case 'H':
- how = HARD;
- break;
- case 'S':
- how = SOFT;
- break;
- case 'a':
- all = 1;
- break;
- default:
- what = optc;
- }
-
- for (l = limits; l->name && l->option != what; l++)
- ;
- if (!l->name)
- error("internal error (%c)", what);
-
- set = *argptr ? 1 : 0;
- if (set) {
- char *p = *argptr;
-
- if (all || argptr[1])
- error("too many arguments");
- if (strcmp(p, "unlimited") == 0)
- val = RLIM_INFINITY;
- else {
- val = (rlim_t) 0;
-
- while ((c = *p++) >= '0' && c <= '9')
- {
- val = (val * 10) + (long)(c - '0');
- if (val < (rlim_t) 0)
- break;
- }
- if (c)
- error("bad number");
- val *= l->factor;
- }
- }
- if (all) {
- for (l = limits; l->name; l++) {
- getrlimit(l->cmd, &limit);
- if (how & SOFT)
- val = limit.rlim_cur;
- else if (how & HARD)
- val = limit.rlim_max;
-
- printf("%-20s ", l->name);
- if (val == RLIM_INFINITY)
- printf("unlimited\n");
- else
- {
- val /= l->factor;
- printf("%lld\n", (long long) val);
- }
- }
- return 0;
- }
-
- getrlimit(l->cmd, &limit);
- if (set) {
- if (how & HARD)
- limit.rlim_max = val;
- if (how & SOFT)
- limit.rlim_cur = val;
- if (setrlimit(l->cmd, &limit) < 0)
- error("error setting limit (%m)");
- } else {
- if (how & SOFT)
- val = limit.rlim_cur;
- else if (how & HARD)
- val = limit.rlim_max;
-
- if (val == RLIM_INFINITY)
- printf("unlimited\n");
- else
- {
- val /= l->factor;
- printf("%lld\n", (long long) val);
- }
- }
- return 0;
-}
/*
* prefix -- see if pfx is a prefix of string.
*/
-static int
-prefix(char const *pfx, char const *string)
+char *
+prefix(const char *string, const char *pfx)
{
while (*pfx) {
if (*pfx++ != *string++)
return 0;
}
- return 1;
+ return (char *) string;
}
+
/*
- * Return true if s is a string of digits, and save munber in intptr
- * nagative is bad
+ * Convert a string of digits to an integer, printing an error message on
+ * failure.
*/
-static int
-is_number(const char *p, int *intptr)
+int
+number(const char *s)
{
- int ret = 0;
-
- do {
- if (! is_digit(*p))
- return 0;
- ret *= 10;
- ret += digit_val(*p);
- p++;
- } while (*p != '\0');
- *intptr = ret;
- return 1;
+ if (! is_number(s))
+ error(illnum, s);
+ return atoi(s);
}
+
/*
- * Convert a string of digits to an integer, printing an error message on
- * failure.
+ * Check for a valid number. This should be elsewhere.
*/
-static int
-number(const char *s)
+int
+is_number(const char *p)
{
- int i;
- if (! is_number(s, &i))
- error("Illegal number: %s", s);
- return i;
+ do {
+ if (! is_digit(*p))
+ return 0;
+ } while (*++p != '\0');
+ return 1;
}
+
/*
* Produce a possibly single quoted string suitable as input to the shell.
* The return string is allocated on the stack.
*/
-static char *
+char *
single_quote(const char *s) {
char *p;
STARTSTACKSTR(p);
do {
- char *q = p;
- size_t len1, len1p, len2, len2p;
+ char *q;
+ size_t len;
- len1 = strcspn(s, "'");
- len2 = strspn(s + len1, "'");
+ len = strchrnul(s, '\'') - s;
- len1p = len1 ? len1 + 2 : len1;
- switch (len2) {
- case 0:
- len2p = 0;
- break;
- case 1:
- len2p = 2;
- break;
- default:
- len2p = len2 + 2;
- }
+ q = p = makestrspace(len + 3, p);
- CHECKSTRSPACE(len1p + len2p + 1, p);
+ *q++ = '\'';
+ q = mempcpy(q, s, len);
+ *q++ = '\'';
+ s += len;
- if (len1) {
- *p = '\'';
- q = p + 1 + len1;
- memcpy(p + 1, s, len1);
- *q++ = '\'';
- s += len1;
- }
+ STADJUST(q - p, p);
- switch (len2) {
- case 0:
- break;
- case 1:
- *q++ = '\\';
- *q = '\'';
- s++;
+ len = strspn(s, "'");
+ if (!len)
break;
- default:
- *q = '"';
- q += 1 + len2;
- memcpy(q + 1, s, len2);
- *q = '"';
- s += len2;
- }
- STADJUST(len1p + len2p, p);
+ q = p = makestrspace(len + 3, p);
+
+ *q++ = '"';
+ q = mempcpy(q, s, len);
+ *q++ = '"';
+ s += len;
+
+ STADJUST(q - p, p);
} while (*s);
USTPUTC(0, p);
- return grabstackstr(p);
+ return stackblock();
}
/*
* Like strdup but works with the ash stack.
*/
-static char *
+char *
sstrdup(const char *p)
{
size_t len = strlen(p) + 1;
@@ -8557,30 +8552,13 @@ sstrdup(const char *p)
}
-/*
- * Routine for dealing with parsed shell commands.
- */
-
-
-static void sizenodelist (const struct nodelist *);
-static struct nodelist *copynodelist (const struct nodelist *);
-static char *nodesavestr (const char *);
-
static void
-calcsize(const union node *n)
+calcsize(union node *n)
{
if (n == NULL)
return;
funcblocksize += nodesize[n->type];
switch (n->type) {
- case NSEMI:
- case NAND:
- case NOR:
- case NWHILE:
- case NUNTIL:
- calcsize(n->nbinary.ch2);
- calcsize(n->nbinary.ch1);
- break;
case NCMD:
calcsize(n->ncmd.redirect);
calcsize(n->ncmd.args);
@@ -8595,6 +8573,14 @@ calcsize(const union node *n)
calcsize(n->nredir.redirect);
calcsize(n->nredir.n);
break;
+ case NAND:
+ case NOR:
+ case NSEMI:
+ case NWHILE:
+ case NUNTIL:
+ calcsize(n->nbinary.ch2);
+ calcsize(n->nbinary.ch1);
+ break;
case NIF:
calcsize(n->nif.elsepart);
calcsize(n->nif.ifpart);
@@ -8621,10 +8607,10 @@ calcsize(const union node *n)
calcsize(n->narg.next);
break;
case NTO:
+ case NCLOBBER:
case NFROM:
case NFROMTO:
case NAPPEND:
- case NTOOV:
calcsize(n->nfile.fname);
calcsize(n->nfile.next);
break;
@@ -8644,11 +8630,12 @@ calcsize(const union node *n)
};
}
+
static void
-sizenodelist(const struct nodelist *lp)
+sizenodelist(struct nodelist *lp)
{
while (lp) {
- funcblocksize += ALIGN(sizeof(struct nodelist));
+ funcblocksize += SHELL_ALIGN(sizeof(struct nodelist));
calcsize(lp->n);
lp = lp->next;
}
@@ -8656,7 +8643,7 @@ sizenodelist(const struct nodelist *lp)
static union node *
-copynode(const union node *n)
+copynode(union node *n)
{
union node *new;
@@ -8665,19 +8652,10 @@ copynode(const union node *n)
new = funcblock;
funcblock = (char *) funcblock + nodesize[n->type];
switch (n->type) {
- case NSEMI:
- case NAND:
- case NOR:
- case NWHILE:
- case NUNTIL:
- new->nbinary.ch2 = copynode(n->nbinary.ch2);
- new->nbinary.ch1 = copynode(n->nbinary.ch1);
- break;
case NCMD:
new->ncmd.redirect = copynode(n->ncmd.redirect);
new->ncmd.args = copynode(n->ncmd.args);
new->ncmd.assign = copynode(n->ncmd.assign);
- new->ncmd.backgnd = n->ncmd.backgnd;
break;
case NPIPE:
new->npipe.cmdlist = copynodelist(n->npipe.cmdlist);
@@ -8689,6 +8667,14 @@ copynode(const union node *n)
new->nredir.redirect = copynode(n->nredir.redirect);
new->nredir.n = copynode(n->nredir.n);
break;
+ case NAND:
+ case NOR:
+ case NSEMI:
+ case NWHILE:
+ case NUNTIL:
+ new->nbinary.ch2 = copynode(n->nbinary.ch2);
+ new->nbinary.ch1 = copynode(n->nbinary.ch1);
+ break;
case NIF:
new->nif.elsepart = copynode(n->nif.elsepart);
new->nif.ifpart = copynode(n->nif.ifpart);
@@ -8715,10 +8701,10 @@ copynode(const union node *n)
new->narg.next = copynode(n->narg.next);
break;
case NTO:
+ case NCLOBBER:
case NFROM:
case NFROMTO:
case NAPPEND:
- case NTOOV:
new->nfile.fname = copynode(n->nfile.fname);
new->nfile.fd = n->nfile.fd;
new->nfile.next = copynode(n->nfile.next);
@@ -8741,12 +8727,12 @@ copynode(const union node *n)
break;
};
new->type = n->type;
- return new;
+ return new;
}
static struct nodelist *
-copynodelist(const struct nodelist *lp)
+copynodelist(struct nodelist *lp)
{
struct nodelist *start;
struct nodelist **lpp;
@@ -8754,7 +8740,8 @@ copynodelist(const struct nodelist *lp)
lpp = &start;
while (lp) {
*lpp = funcblock;
- funcblock = (char *) funcblock + ALIGN(sizeof(struct nodelist));
+ funcblock = (char *) funcblock +
+ SHELL_ALIGN(sizeof(struct nodelist));
(*lpp)->n = copynode(lp->n);
lp = lp->next;
lpp = &(*lpp)->next;
@@ -8765,98 +8752,127 @@ copynodelist(const struct nodelist *lp)
static char *
-nodesavestr(const char *s)
+nodesavestr(char *s)
{
- const char *p = s;
- char *q = funcstring;
char *rtn = funcstring;
- while ((*q++ = *p++) != '\0')
- continue;
- funcstring = q;
+ funcstring = stpcpy(funcstring, s) + 1;
return rtn;
}
-#ifdef ASH_GETOPTS
-static int getopts (char *, char *, char **, int *, int *);
-#endif
+
+/*
+ * Free a parse tree.
+ */
+
+static void
+freefunc(struct funcnode *f)
+{
+ if (f && --f->count < 0)
+ ckfree(f);
+}
+
+
+static void options(int);
+static void setoption(int, int);
/*
* Process the shell command line arguments.
*/
-static void
-procargs(argc, argv)
- int argc;
- char **argv;
+void
+procargs(int argc, char **argv)
{
int i;
+ const char *xminusc;
+ char **xargv;
- argptr = argv;
+ xargv = argv;
+ arg0 = xargv[0];
if (argc > 0)
- argptr++;
+ xargv++;
for (i = 0; i < NOPTS; i++)
- optent_val(i) = 2;
+ optlist[i] = 2;
+ argptr = xargv;
options(1);
- if (*argptr == NULL && minusc == NULL)
+ xargv = argptr;
+ xminusc = minusc;
+ if (*xargv == NULL) {
+ if (xminusc)
+ error("-c requires an argument");
sflag = 1;
+ }
if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1))
iflag = 1;
if (mflag == 2)
mflag = iflag;
for (i = 0; i < NOPTS; i++)
- if (optent_val(i) == 2)
- optent_val(i) = 0;
- arg0 = argv[0];
- if (sflag == 0 && minusc == NULL) {
- commandname = argv[0];
- arg0 = *argptr++;
- setinputfile(arg0, 0);
+ if (optlist[i] == 2)
+ optlist[i] = 0;
+#if DEBUG == 2
+ debug = 1;
+#endif
+ /* POSIX 1003.2: first arg after -c cmd is $0, remainder $1... */
+ if (xminusc) {
+ minusc = *xargv++;
+ if (*xargv)
+ goto setarg0;
+ } else if (!sflag) {
+ setinputfile(*xargv, 0);
+setarg0:
+ arg0 = *xargv++;
commandname = arg0;
}
- /* POSIX 1003.2: first arg after -c cmd is $0, remainder $1... */
- if (argptr && minusc && *argptr)
- arg0 = *argptr++;
- shellparam.p = argptr;
+ shellparam.p = xargv;
+#ifdef BB_ASH_GETOPTS
shellparam.optind = 1;
shellparam.optoff = -1;
+#endif
/* assert(shellparam.malloc == 0 && shellparam.nparam == 0); */
- while (*argptr) {
+ while (*xargv) {
shellparam.nparam++;
- argptr++;
+ xargv++;
}
optschanged();
}
-
-/*
- * Process shell options. The global variable argptr contains a pointer
- * to the argument list; we advance it past the options.
- */
+void
+optschanged(void)
+{
+#ifdef DEBUG
+ opentrace();
+#endif
+ setinteractive(iflag);
+ setjobctl(mflag);
+}
static inline void
-minus_o(const char *name, int val)
+minus_o(char *name, int val)
{
int i;
if (name == NULL) {
out1str("Current option settings\n");
for (i = 0; i < NOPTS; i++)
- printf("%-16s%s\n", optent_name(optlist[i]),
- optent_val(i) ? "on" : "off");
+ out1fmt("%-16s%s\n", optnames(i),
+ optlist[i] ? "on" : "off");
} else {
for (i = 0; i < NOPTS; i++)
- if (equal(name, optent_name(optlist[i]))) {
- setoption(optent_letter(optlist[i]), val);
+ if (equal(name, optnames(i))) {
+ optlist[i] = val;
return;
}
error("Illegal option -o %s", name);
}
}
+/*
+ * Process shell options. The global variable argptr contains a pointer
+ * to the argument list; we advance it past the options.
+ */
static void
options(int cmdline)
@@ -8890,21 +8906,15 @@ options(int cmdline)
}
while ((c = *p++) != '\0') {
if (c == 'c' && cmdline) {
- char *q;
-#ifdef NOHACK /* removing this code allows sh -ce 'foo' for compat */
- if (*p == '\0')
-#endif
- q = *argptr++;
- if (q == NULL || minusc != NULL)
- error("Bad -c option");
- minusc = q;
-#ifdef NOHACK
- break;
-#endif
+ minusc = p; /* command is after shell args*/
} else if (c == 'o') {
minus_o(*argptr, val);
if (*argptr)
argptr++;
+ } else if (cmdline && (c == '-')) { // long options
+ if (strcmp(p, "login") == 0)
+ isloginsh = 1;
+ break;
} else {
setoption(c, val);
}
@@ -8919,15 +8929,8 @@ setoption(int flag, int val)
int i;
for (i = 0; i < NOPTS; i++)
- if (optent_letter(optlist[i]) == flag) {
- optent_val(i) = val;
- if (val) {
- /* #%$ hack for ksh semantics */
- if (flag == 'V')
- Eflag = 0;
- else if (flag == 'E')
- Vflag = 0;
- }
+ if (optletters(i) == flag) {
+ optlist[i] = val;
return;
}
error("Illegal option -%c", flag);
@@ -8940,7 +8943,7 @@ setoption(int flag, int val)
* Set the shell parameters.
*/
-static void
+void
setparam(char **argv)
{
char **newparam;
@@ -8957,8 +8960,10 @@ setparam(char **argv)
shellparam.malloc = 1;
shellparam.nparam = nparam;
shellparam.p = newparam;
+#ifdef BB_ASH_GETOPTS
shellparam.optind = 1;
shellparam.optoff = -1;
+#endif
}
@@ -8966,7 +8971,7 @@ setparam(char **argv)
* Free the list of positional parameters.
*/
-static void
+void
freeparam(volatile struct shparam *param)
{
char **ap;
@@ -8984,10 +8989,8 @@ freeparam(volatile struct shparam *param)
* The shift builtin command.
*/
-static int
-shiftcmd(argc, argv)
- int argc;
- char **argv;
+int
+shiftcmd(int argc, char **argv)
{
int n;
char **ap1, **ap2;
@@ -9005,8 +9008,10 @@ shiftcmd(argc, argv)
}
ap2 = shellparam.p;
while ((*ap2++ = *ap1++) != NULL);
+#ifdef BB_ASH_GETOPTS
shellparam.optind = 1;
shellparam.optoff = -1;
+#endif
INTON;
return 0;
}
@@ -9017,13 +9022,11 @@ shiftcmd(argc, argv)
* The set command builtin.
*/
-static int
-setcmd(argc, argv)
- int argc;
- char **argv;
+int
+setcmd(int argc, char **argv)
{
if (argc == 1)
- return showvarscmd(argc, argv);
+ return showvars(nullstr, 0, VUNSET);
INTOFF;
options(0);
optschanged();
@@ -9035,118 +9038,55 @@ setcmd(argc, argv)
}
+#ifdef BB_ASH_GETOPTS
static void
-getoptsreset(const char *value)
+getoptsreset(value)
+ const char *value;
{
shellparam.optind = number(value);
shellparam.optoff = -1;
}
+#endif
#ifdef BB_LOCALE_SUPPORT
static void change_lc_all(const char *value)
{
- if(value != 0 && *value != 0)
+ if (value != 0 && *value != 0)
setlocale(LC_ALL, value);
}
static void change_lc_ctype(const char *value)
{
- if(value != 0 && *value != 0)
+ if (value != 0 && *value != 0)
setlocale(LC_CTYPE, value);
}
#endif
-#ifdef ASH_GETOPTS
-/*
- * The getopts builtin. Shellparam.optnext points to the next argument
- * to be processed. Shellparam.optptr points to the next character to
- * be processed in the current argument. If shellparam.optnext is NULL,
- * then it's the first time getopts has been called.
- */
-
+#ifdef BB_ASH_GETOPTS
static int
-getoptscmd(argc, argv)
- int argc;
- char **argv;
-{
- char **optbase;
-
- if (argc < 3)
- error("Usage: getopts optstring var [arg]");
- else if (argc == 3) {
- optbase = shellparam.p;
- if (shellparam.optind > shellparam.nparam + 1) {
- shellparam.optind = 1;
- shellparam.optoff = -1;
- }
- }
- else {
- optbase = &argv[3];
- if (shellparam.optind > argc - 2) {
- shellparam.optind = 1;
- shellparam.optoff = -1;
- }
- }
-
- return getopts(argv[1], argv[2], optbase, &shellparam.optind,
- &shellparam.optoff);
-}
-
-/*
- * Safe version of setvar, returns 1 on success 0 on failure.
- */
-
-static int
-setvarsafe(name, val, flags)
- const char *name, *val;
- int flags;
-{
- struct jmploc jmploc;
- struct jmploc *volatile savehandler = handler;
- int err = 0;
-#ifdef __GNUC__
- (void) &err;
-#endif
-
- if (setjmp(jmploc.loc))
- err = 1;
- else {
- handler = &jmploc;
- setvar(name, val, flags);
- }
- handler = savehandler;
- return err;
-}
-
-static int
-getopts(optstr, optvar, optfirst, myoptind, optoff)
- char *optstr;
- char *optvar;
- char **optfirst;
- int *myoptind;
- int *optoff;
+getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *optoff)
{
char *p, *q;
char c = '?';
int done = 0;
int err = 0;
- char s[10];
- char **optnext = optfirst + *myoptind - 1;
+ char s[12];
+ char **optnext;
- if (*myoptind <= 1 || *optoff < 0 || !(*(optnext - 1)) ||
- strlen(*(optnext - 1)) < *optoff)
+ if(*param_optind < 1)
+ return 1;
+ optnext = optfirst + *param_optind - 1;
+
+ if (*param_optind <= 1 || *optoff < 0 || strlen(optnext[-1]) < *optoff)
p = NULL;
else
- p = *(optnext - 1) + *optoff;
+ p = optnext[-1] + *optoff;
if (p == NULL || *p == '\0') {
/* Current word is done, advance */
- if (optnext == NULL)
- return 1;
p = *optnext;
if (p == NULL || *p != '-' || *++p == '\0') {
atend:
- *myoptind = optnext - optfirst + 1;
p = NULL;
done = 1;
goto out;
@@ -9163,13 +9103,12 @@ atend:
s[0] = c;
s[1] = '\0';
err |= setvarsafe("OPTARG", s, 0);
- }
- else {
- out2fmt("Illegal option -%c\n", c);
+ } else {
+ fprintf(stderr, "Illegal option -%c\n", c);
(void) unsetvar("OPTARG");
}
c = '?';
- goto bad;
+ goto out;
}
if (*++q == ':')
q++;
@@ -9182,43 +9121,71 @@ atend:
s[1] = '\0';
err |= setvarsafe("OPTARG", s, 0);
c = ':';
- }
- else {
- out2fmt("No arg for -%c option\n", c);
+ } else {
+ fprintf(stderr, "No arg for -%c option\n", c);
(void) unsetvar("OPTARG");
c = '?';
}
- goto bad;
+ goto out;
}
if (p == *optnext)
optnext++;
- setvarsafe("OPTARG", p, 0);
+ err |= setvarsafe("OPTARG", p, 0);
p = NULL;
- }
- else
- setvarsafe("OPTARG", "", 0);
- *myoptind = optnext - optfirst + 1;
- goto out;
+ } else
+ err |= setvarsafe("OPTARG", nullstr, 0);
-bad:
- *myoptind = 1;
- p = NULL;
out:
*optoff = p ? p - *(optnext - 1) : -1;
- snprintf(s, sizeof(s), "%d", *myoptind);
+ *param_optind = optnext - optfirst + 1;
+ fmtstr(s, sizeof(s), "%d", *param_optind);
err |= setvarsafe("OPTIND", s, VNOFUNC);
s[0] = c;
s[1] = '\0';
err |= setvarsafe(optvar, s, 0);
if (err) {
- *myoptind = 1;
+ *param_optind = 1;
*optoff = -1;
+ flushall();
exraise(EXERROR);
}
return done;
}
-#endif
+
+/*
+ * The getopts builtin. Shellparam.optnext points to the next argument
+ * to be processed. Shellparam.optptr points to the next character to
+ * be processed in the current argument. If shellparam.optnext is NULL,
+ * then it's the first time getopts has been called.
+ */
+
+int
+getoptscmd(int argc, char **argv)
+{
+ char **optbase;
+
+ if (argc < 3)
+ error("Usage: getopts optstring var [arg]");
+ else if (argc == 3) {
+ optbase = shellparam.p;
+ if (shellparam.optind > shellparam.nparam + 1) {
+ shellparam.optind = 1;
+ shellparam.optoff = -1;
+ }
+ }
+ else {
+ optbase = &argv[3];
+ if (shellparam.optind > argc - 2) {
+ shellparam.optind = 1;
+ shellparam.optoff = -1;
+ }
+ }
+
+ return getopts(argv[1], argv[2], optbase, &shellparam.optind,
+ &shellparam.optoff);
+}
+#endif /* BB_ASH_GETOPTS */
/*
* XXX - should get rid of. have all builtins use getopt(3). the
@@ -9263,53 +9230,92 @@ nextopt(const char *optstring)
return c;
}
-static void
-flushall() {
+
+/* $NetBSD: output.c,v 1.27 2002/11/24 22:35:42 christos Exp $ */
+
+void
+outstr(const char *p, FILE *file)
+{
+ INTOFF;
+ fputs(p, file);
+ INTON;
+}
+
+void
+flushall(void)
+{
INTOFF;
fflush(stdout);
+ fflush(stderr);
INTON;
}
+void
+flushout(FILE *dest)
+{
+ INTOFF;
+ fflush(dest);
+ INTON;
+}
static void
-out2fmt(const char *fmt, ...)
+outcslow(int c, FILE *dest)
+{
+ INTOFF;
+ putc(c, dest);
+ fflush(dest);
+ INTON;
+}
+
+
+static int
+out1fmt(const char *fmt, ...)
+{
+ va_list ap;
+ int r;
+
+ INTOFF;
+ va_start(ap, fmt);
+ r = vprintf(fmt, ap);
+ va_end(ap);
+ INTON;
+ return r;
+}
+
+
+int
+fmtstr(char *outbuf, size_t length, const char *fmt, ...)
{
va_list ap;
+ int ret;
+
va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
+ INTOFF;
+ ret = vsnprintf(outbuf, length, fmt, ap);
va_end(ap);
+ INTON;
+ return ret;
}
+
/*
* Version of write which resumes after a signal is caught.
*/
-static int
-xwrite(int fd, const char *buf, int nbytes)
+static void
+xwrite(int fd, const void *p, size_t n)
{
- int ntry;
- int i;
- int n;
+ ssize_t i;
- n = nbytes;
- ntry = 0;
- for (;;) {
- i = write(fd, buf, n);
- if (i > 0) {
- if ((n -= i) <= 0)
- return nbytes;
- buf += i;
- ntry = 0;
- } else if (i == 0) {
- if (++ntry > 10)
- return nbytes - n;
- } else if (errno != EINTR) {
- return -1;
- }
- }
+ do {
+ i = full_write(fd, p, n);
+ } while (i < 0 && errno == EINTR);
}
+/* $NetBSD: parser.c,v 1.54 2002/11/24 22:35:42 christos Exp $ */
+
+
/*
* Shell command parser.
*/
@@ -9317,7 +9323,6 @@ xwrite(int fd, const char *buf, int nbytes)
#define EOFMARKLEN 79
-
struct heredoc {
struct heredoc *next; /* next here document in list */
union node *here; /* redirection node */
@@ -9325,36 +9330,43 @@ struct heredoc {
int striptabs; /* if set, strip leading tabs */
};
-static struct heredoc *heredoclist; /* list of here documents to read */
-static int parsebackquote; /* nonzero if we are inside backquotes */
-static int doprompt; /* if set, prompt the user */
-static int needprompt; /* true if interactive and at start of line */
-static int lasttoken; /* last token read */
-static char *wordtext; /* text of last word returned by readtoken */
-static struct nodelist *backquotelist;
-static union node *redirnode;
-static struct heredoc *heredoc;
-static int quoteflag; /* set if (part of) last token was quoted */
-static int startlinno; /* line # where last token started */
+static struct heredoc *heredoclist; /* list of here documents to read */
+
+
+static union node *list(int);
+static union node *andor(void);
+static union node *pipeline(void);
+static union node *command(void);
+static union node *simplecmd(void);
+static union node *makename(void);
+static void parsefname(void);
+static void parseheredoc(void);
+static char peektoken(void);
+static int readtoken(void);
+static int xxreadtoken(void);
+static int readtoken1(int firstc, int syntax, char *eofmark, int striptabs);
+static int noexpand(char *);
+static void synexpect(int) __attribute__((__noreturn__));
+static void synerror(const char *) __attribute__((__noreturn__));
+static void setprompt(int);
-static union node *list (int);
-static union node *andor (void);
-static union node *pipeline (void);
-static union node *command (void);
-static union node *simplecmd (void);
-static void parsefname (void);
-static void parseheredoc (void);
-static int peektoken (void);
-static int readtoken (void);
-static int xxreadtoken (void);
-static int readtoken1 (int, char const *, char *, int);
-static int noexpand (char *);
-static void synexpect (int) __attribute__((noreturn));
-static void synerror (const char *) __attribute__((noreturn));
-static void setprompt (int);
+static inline int
+goodname(const char *p)
+{
+ return !*endofname(p);
+}
+
+static inline int
+isassignment(const char *p)
+{
+ const char *q = endofname(p);
+ if (p == q)
+ return 0;
+ return *q == '=';
+}
/*
@@ -9362,7 +9374,7 @@ static void setprompt (int);
* valid parse tree indicating a blank line.)
*/
-static union node *
+union node *
parsecmd(int interact)
{
int t;
@@ -9370,9 +9382,7 @@ parsecmd(int interact)
tokpushback = 0;
doprompt = interact;
if (doprompt)
- setprompt(1);
- else
- setprompt(0);
+ setprompt(doprompt);
needprompt = 0;
t = readtoken();
if (t == TEOF)
@@ -9385,30 +9395,29 @@ parsecmd(int interact)
static union node *
-list(nlflag)
- int nlflag;
+list(int nlflag)
{
union node *n1, *n2, *n3;
int tok;
- checkkwd = 2;
- if (nlflag == 0 && tokendlist[peektoken()])
+ checkkwd = CHKNL | CHKKWD | CHKALIAS;
+ if (nlflag == 2 && peektoken())
return NULL;
n1 = NULL;
for (;;) {
n2 = andor();
tok = readtoken();
if (tok == TBACKGND) {
- if (n2->type == NCMD || n2->type == NPIPE) {
- n2->ncmd.backgnd = 1;
- } else if (n2->type == NREDIR) {
- n2->type = NBACKGND;
+ if (n2->type == NPIPE) {
+ n2->npipe.backgnd = 1;
} else {
- n3 = (union node *)stalloc(sizeof (struct nredir));
- n3->type = NBACKGND;
- n3->nredir.n = n2;
- n3->nredir.redirect = NULL;
- n2 = n3;
+ if (n2->type != NREDIR) {
+ n3 = stalloc(sizeof(struct nredir));
+ n3->nredir.n = n2;
+ n3->nredir.redirect = NULL;
+ n2 = n3;
+ }
+ n2->type = NBACKGND;
}
}
if (n1 == NULL) {
@@ -9429,13 +9438,13 @@ list(nlflag)
case TNL:
if (tok == TNL) {
parseheredoc();
- if (nlflag)
+ if (nlflag == 1)
return n1;
} else {
tokpushback++;
}
- checkkwd = 2;
- if (tokendlist[peektoken()])
+ checkkwd = CHKNL | CHKKWD | CHKALIAS;
+ if (peektoken())
return n1;
break;
case TEOF:
@@ -9445,7 +9454,7 @@ list(nlflag)
pungetc(); /* push back EOF on input */
return n1;
default:
- if (nlflag)
+ if (nlflag == 1)
synexpect(-1);
tokpushback++;
return n1;
@@ -9456,11 +9465,11 @@ list(nlflag)
static union node *
-andor() {
+andor(void)
+{
union node *n1, *n2, *n3;
int t;
- checkkwd = 1;
n1 = pipeline();
for (;;) {
if ((t = readtoken()) == TAND) {
@@ -9471,7 +9480,7 @@ andor() {
tokpushback++;
return n1;
}
- checkkwd = 2;
+ checkkwd = CHKNL | CHKKWD | CHKALIAS;
n2 = pipeline();
n3 = (union node *)stalloc(sizeof (struct nbinary));
n3->type = t;
@@ -9484,7 +9493,8 @@ andor() {
static union node *
-pipeline() {
+pipeline(void)
+{
union node *n1, *n2, *pipenode;
struct nodelist *lp, *prev;
int negate;
@@ -9493,7 +9503,7 @@ pipeline() {
TRACE(("pipeline: entered\n"));
if (readtoken() == TNOT) {
negate = !negate;
- checkkwd = 1;
+ checkkwd = CHKKWD | CHKALIAS;
} else
tokpushback++;
n1 = command();
@@ -9507,7 +9517,7 @@ pipeline() {
do {
prev = lp;
lp = (struct nodelist *)stalloc(sizeof (struct nodelist));
- checkkwd = 2;
+ checkkwd = CHKNL | CHKKWD | CHKALIAS;
lp->n = command();
prev->next = lp;
} while (readtoken() == TPIPE);
@@ -9527,26 +9537,22 @@ pipeline() {
static union node *
-command() {
+command(void)
+{
union node *n1, *n2;
union node *ap, **app;
union node *cp, **cpp;
union node *redir, **rpp;
+ union node **rpp2;
int t;
redir = NULL;
- n1 = NULL;
- rpp = &redir;
-
- /* Check for redirection which may precede command */
- while (readtoken() == TREDIR) {
- *rpp = n2 = redirnode;
- rpp = &n2->nfile.next;
- parsefname();
- }
- tokpushback++;
+ rpp2 = &redir;
switch (readtoken()) {
+ default:
+ synexpect(-1);
+ /* NOTREACHED */
case TIF:
n1 = (union node *)stalloc(sizeof (struct nif));
n1->type = NIF;
@@ -9570,9 +9576,7 @@ command() {
n2->nif.elsepart = NULL;
tokpushback++;
}
- if (readtoken() != TFI)
- synexpect(TFI);
- checkkwd = 1;
+ t = TFI;
break;
case TWHILE:
case TUNTIL: {
@@ -9581,13 +9585,11 @@ command() {
n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL;
n1->nbinary.ch1 = list(0);
if ((got=readtoken()) != TDO) {
-TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
+TRACE(("expecting DO got %s %s\n", tokname(got), got == TWORD ? wordtext : ""));
synexpect(TDO);
}
n1->nbinary.ch2 = list(0);
- if (readtoken() != TDONE)
- synexpect(TDONE);
- checkkwd = 1;
+ t = TDONE;
break;
}
case TFOR:
@@ -9596,7 +9598,7 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
n1 = (union node *)stalloc(sizeof (struct nfor));
n1->type = NFOR;
n1->nfor.var = wordtext;
- checkkwd = 1;
+ checkkwd = CHKKWD | CHKALIAS;
if (readtoken() == TIN) {
app = &ap;
while (readtoken() == TWORD) {
@@ -9612,11 +9614,9 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
if (lasttoken != TNL && lasttoken != TSEMI)
synexpect(-1);
} else {
- static char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE,
- '@', '=', '\0'};
n2 = (union node *)stalloc(sizeof (struct narg));
n2->type = NARG;
- n2->narg.text = argvars;
+ n2->narg.text = (char *)dolatstr;
n2->narg.backquote = NULL;
n2->narg.next = NULL;
n1->nfor.args = n2;
@@ -9627,13 +9627,11 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
if (lasttoken != TNL && lasttoken != TSEMI)
tokpushback++;
}
- checkkwd = 2;
+ checkkwd = CHKNL | CHKKWD | CHKALIAS;
if (readtoken() != TDO)
synexpect(TDO);
n1->nfor.body = list(0);
- if (readtoken() != TDONE)
- synexpect(TDONE);
- checkkwd = 1;
+ t = TDONE;
break;
case TCASE:
n1 = (union node *)stalloc(sizeof (struct ncase));
@@ -9646,13 +9644,15 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
n2->narg.backquote = backquotelist;
n2->narg.next = NULL;
do {
- checkkwd = 1;
+ checkkwd = CHKKWD | CHKALIAS;
} while (readtoken() == TNL);
if (lasttoken != TIN)
- synerror("expecting \"in\"");
+ synexpect(TIN);
cpp = &n1->ncase.cases;
- checkkwd = 2, readtoken();
- do {
+next_case:
+ checkkwd = CHKNL | CHKKWD;
+ t = readtoken();
+ while(t != TESAC) {
if (lasttoken == TLP)
readtoken();
*cpp = cp = (union node *)stalloc(sizeof (struct nclist));
@@ -9663,7 +9663,7 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
ap->type = NARG;
ap->narg.text = wordtext;
ap->narg.backquote = backquotelist;
- if (checkkwd = 2, readtoken() != TPIPE)
+ if (readtoken() != TPIPE)
break;
app = &ap->narg.next;
readtoken();
@@ -9671,59 +9671,44 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
ap->narg.next = NULL;
if (lasttoken != TRP)
synexpect(TRP);
- cp->nclist.body = list(0);
+ cp->nclist.body = list(2);
+
+ cpp = &cp->nclist.next;
- checkkwd = 2;
+ checkkwd = CHKNL | CHKKWD;
if ((t = readtoken()) != TESAC) {
if (t != TENDCASE)
synexpect(TENDCASE);
else
- checkkwd = 2, readtoken();
+ goto next_case;
}
- cpp = &cp->nclist.next;
- } while(lasttoken != TESAC);
+ }
*cpp = NULL;
- checkkwd = 1;
- break;
+ goto redir;
case TLP:
n1 = (union node *)stalloc(sizeof (struct nredir));
n1->type = NSUBSHELL;
n1->nredir.n = list(0);
n1->nredir.redirect = NULL;
- if (readtoken() != TRP)
- synexpect(TRP);
- checkkwd = 1;
+ t = TRP;
break;
case TBEGIN:
n1 = list(0);
- if (readtoken() != TEND)
- synexpect(TEND);
- checkkwd = 1;
+ t = TEND;
break;
- /* Handle an empty command like other simple commands. */
- case TSEMI:
- case TAND:
- case TOR:
- case TNL:
- case TEOF:
- case TRP:
- case TBACKGND:
- /*
- * An empty command before a ; doesn't make much sense, and
- * should certainly be disallowed in the case of `if ;'.
- */
- if (!redir)
- synexpect(-1);
case TWORD:
+ case TREDIR:
tokpushback++;
- n1 = simplecmd();
- return n1;
- default:
- synexpect(-1);
- /* NOTREACHED */
+ return simplecmd();
}
+ if (readtoken() != t)
+ synexpect(t);
+
+redir:
/* Now check for redirection which may follow command */
+ checkkwd = CHKKWD | CHKALIAS;
+ rpp = rpp2;
while (readtoken() == TREDIR) {
*rpp = n2 = redirnode;
rpp = &n2->nfile.next;
@@ -9746,11 +9731,12 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
static union node *
-simplecmd() {
+simplecmd(void) {
union node *args, **app;
union node *n = NULL;
union node *vars, **vpp;
union node **rpp, *redir;
+ int savecheckkwd;
args = NULL;
app = &args;
@@ -9759,21 +9745,22 @@ simplecmd() {
redir = NULL;
rpp = &redir;
- checkalias = 2;
+ savecheckkwd = CHKALIAS;
for (;;) {
+ checkkwd = savecheckkwd;
switch (readtoken()) {
case TWORD:
- case TASSIGN:
n = (union node *)stalloc(sizeof (struct narg));
n->type = NARG;
n->narg.text = wordtext;
n->narg.backquote = backquotelist;
- if (lasttoken == TWORD) {
- *app = n;
- app = &n->narg.next;
- } else {
+ if (savecheckkwd && isassignment(wordtext)) {
*vpp = n;
vpp = &n->narg.next;
+ } else {
+ *app = n;
+ app = &n->narg.next;
+ savecheckkwd = 0;
}
break;
case TREDIR:
@@ -9786,11 +9773,22 @@ simplecmd() {
args && app == &args->narg.next &&
!vars && !redir
) {
+ struct builtincmd *bcmd;
+ const char *name;
+
/* We have a function */
if (readtoken() != TRP)
synexpect(TRP);
+ name = n->narg.text;
+ if (
+ !goodname(name) || (
+ (bcmd = find_builtin(name)) &&
+ IS_BUILTIN_SPECIAL(bcmd)
+ )
+ )
+ synerror("Bad function name");
n->type = NDEFUN;
- checkkwd = 2;
+ checkkwd = CHKNL | CHKKWD | CHKALIAS;
n->narg.next = command();
return n;
}
@@ -9806,7 +9804,6 @@ out:
*rpp = NULL;
n = (union node *)stalloc(sizeof (struct ncmd));
n->type = NCMD;
- n->ncmd.backgnd = 0;
n->ncmd.args = args;
n->ncmd.assign = vars;
n->ncmd.redirect = redir;
@@ -9814,7 +9811,8 @@ out:
}
static union node *
-makename(void) {
+makename(void)
+{
union node *n;
n = (union node *)stalloc(sizeof (struct narg));
@@ -9825,7 +9823,7 @@ makename(void) {
return n;
}
-static void fixredir(union node *n, const char *text, int err)
+void fixredir(union node *n, const char *text, int err)
{
TRACE(("Fix redir %s %d\n", text, err));
if (!err)
@@ -9846,7 +9844,8 @@ static void fixredir(union node *n, const char *text, int err)
static void
-parsefname(void) {
+parsefname(void)
+{
union node *n = redirnode;
if (readtoken() != TWORD)
@@ -9859,10 +9858,6 @@ parsefname(void) {
if (quoteflag == 0)
n->type = NXHERE;
TRACE(("Here document %d\n", n->type));
- if (here->striptabs) {
- while (*wordtext == '\t')
- wordtext++;
- }
if (! noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN)
synerror("Illegal eof marker for << redirection");
rmescapes(wordtext);
@@ -9887,13 +9882,15 @@ parsefname(void) {
*/
static void
-parseheredoc() {
+parseheredoc(void)
+{
struct heredoc *here;
union node *n;
- while (heredoclist) {
- here = heredoclist;
- heredoclist = here->next;
+ here = heredoclist;
+ heredoclist = 0;
+
+ while (here) {
if (needprompt) {
setprompt(2);
needprompt = 0;
@@ -9906,94 +9903,78 @@ parseheredoc() {
n->narg.text = wordtext;
n->narg.backquote = backquotelist;
here->here->nhere.doc = n;
+ here = here->next;
}
}
-static int
-peektoken() {
+static char peektoken(void)
+{
int t;
t = readtoken();
tokpushback++;
- return (t);
+ return tokname_array[t][0];
}
static int
-readtoken() {
+readtoken(void)
+{
int t;
-
-#ifdef ASH_ALIAS
- int savecheckalias = checkalias;
- int savecheckkwd = checkkwd;
- struct alias *ap;
-#endif
-
#ifdef DEBUG
int alreadyseen = tokpushback;
#endif
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
top:
#endif
t = xxreadtoken();
-#ifdef ASH_ALIAS
- checkalias = savecheckalias;
-#endif
-
- if (checkkwd) {
- /*
- * eat newlines
- */
- if (checkkwd == 2) {
- checkkwd = 0;
- while (t == TNL) {
- parseheredoc();
- t = xxreadtoken();
- }
+ /*
+ * eat newlines
+ */
+ if (checkkwd & CHKNL) {
+ while (t == TNL) {
+ parseheredoc();
+ t = xxreadtoken();
}
- checkkwd = 0;
- /*
- * check for keywords
- */
- if (t == TWORD && !quoteflag)
- {
- const char *const *pp;
+ }
- if ((pp = findkwd(wordtext))) {
- lasttoken = t = pp - parsekwd + KWDOFFSET;
- TRACE(("keyword %s recognized\n", tokname[t]));
- goto out;
- }
- }
+ if (t != TWORD || quoteflag) {
+ goto out;
}
+ /*
+ * check for keywords
+ */
+ if (checkkwd & CHKKWD) {
+ const char *const *pp;
- if (t != TWORD) {
- if (t != TREDIR) {
- checkalias = 0;
+ if ((pp = findkwd(wordtext))) {
+ lasttoken = t = pp - tokname_array;
+ TRACE(("keyword %s recognized\n", tokname(t)));
+ goto out;
}
- } else if (checkalias == 2 && isassignment(wordtext)) {
- lasttoken = t = TASSIGN;
-#ifdef ASH_ALIAS
- } else if (checkalias) {
- if (!quoteflag && (ap = lookupalias(wordtext, 1)) != NULL) {
+ }
+
+ if (checkkwd & CHKALIAS) {
+#ifdef BB_ASH_ALIAS
+ struct alias *ap;
+ if ((ap = lookupalias(wordtext, 1)) != NULL) {
if (*ap->val) {
- pushstring(ap->val, strlen(ap->val), ap);
+ pushstring(ap->val, ap);
}
- checkkwd = savecheckkwd;
goto top;
}
- checkalias = 0;
#endif
}
out:
+ checkkwd = 0;
#ifdef DEBUG
if (!alreadyseen)
- TRACE(("token %s %s\n", tokname[t], t == TWORD || t == TASSIGN ? wordtext : ""));
+ TRACE(("token %s %s\n", tokname(t), t == TWORD ? wordtext : ""));
else
- TRACE(("reread token %s %s\n", tokname[t], t == TWORD || t == TASSIGN ? wordtext : ""));
+ TRACE(("reread token %s %s\n", tokname(t), t == TWORD ? wordtext : ""));
#endif
return (t);
}
@@ -10017,10 +9998,94 @@ out:
* have parseword (readtoken1?) handle both words and redirection.]
*/
+#define NEW_xxreadtoken
+#ifdef NEW_xxreadtoken
+
+/* singles must be first! */
+static const char xxreadtoken_chars[7] = { '\n', '(', ')', '&', '|', ';', 0 };
+
+static const char xxreadtoken_tokens[] = {
+ TNL, TLP, TRP, /* only single occurrence allowed */
+ TBACKGND, TPIPE, TSEMI, /* if single occurrence */
+ TEOF, /* corresponds to trailing nul */
+ TAND, TOR, TENDCASE, /* if double occurrence */
+};
+
+#define xxreadtoken_doubles \
+ (sizeof(xxreadtoken_tokens) - sizeof(xxreadtoken_chars))
+#define xxreadtoken_singles \
+ (sizeof(xxreadtoken_chars) - xxreadtoken_doubles - 1)
+
+static int xxreadtoken()
+{
+ int c;
+
+ if (tokpushback) {
+ tokpushback = 0;
+ return lasttoken;
+ }
+ if (needprompt) {
+ setprompt(2);
+ needprompt = 0;
+ }
+ startlinno = plinno;
+ for (;;) { /* until token or start of word found */
+ c = pgetc_macro();
+
+ if ((c != ' ') && (c != '\t')
+#ifdef BB_ASH_ALIAS
+ && (c != PEOA)
+#endif
+ ) {
+ if (c == '#') {
+ while ((c = pgetc()) != '\n' && c != PEOF);
+ pungetc();
+ } else if (c == '\\') {
+ if (pgetc() != '\n') {
+ pungetc();
+ goto READTOKEN1;
+ }
+ startlinno = ++plinno;
+ if (doprompt)
+ setprompt(2);
+ } else {
+ const char *p
+ = xxreadtoken_chars + sizeof(xxreadtoken_chars) - 1;
+
+ if (c != PEOF) {
+ if (c == '\n') {
+ plinno++;
+ needprompt = doprompt;
+ }
+
+ p = strchr(xxreadtoken_chars, c);
+ if (p == NULL) {
+ READTOKEN1:
+ return readtoken1(c, BASESYNTAX, (char *) NULL, 0);
+ }
+
+ if (p - xxreadtoken_chars >= xxreadtoken_singles) {
+ if (pgetc() == *p) { /* double occurrence? */
+ p += xxreadtoken_doubles + 1;
+ } else {
+ pungetc();
+ }
+ }
+ }
+
+ return lasttoken = xxreadtoken_tokens[p - xxreadtoken_chars];
+ }
+ }
+ }
+}
+
+
+#else
#define RETURN(token) return lasttoken = token
static int
-xxreadtoken() {
+xxreadtoken(void)
+{
int c;
if (tokpushback) {
@@ -10036,7 +10101,7 @@ xxreadtoken() {
c = pgetc_macro();
switch (c) {
case ' ': case '\t':
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
case PEOA:
#endif
continue;
@@ -10049,8 +10114,6 @@ xxreadtoken() {
startlinno = ++plinno;
if (doprompt)
setprompt(2);
- else
- setprompt(0);
continue;
}
pungetc();
@@ -10088,7 +10151,7 @@ breakloop:
return readtoken1(c, BASESYNTAX, (char *)NULL, 0);
#undef RETURN
}
-
+#endif /* NEW_xxreadtoken */
/*
@@ -10111,12 +10174,8 @@ breakloop:
#define PARSEARITH() {goto parsearith; parsearith_return:;}
static int
-readtoken1(firstc, syntax, eofmark, striptabs)
- int firstc;
- char const *syntax;
- char *eofmark;
- int striptabs;
- {
+readtoken1(int firstc, int syntax, char *eofmark, int striptabs)
+{
int c = firstc;
char *out;
int len;
@@ -10129,7 +10188,7 @@ readtoken1(firstc, syntax, eofmark, striptabs)
int parenlevel; /* levels of parens in arithmetic */
int dqvarnest; /* levels of variables expansion within double quotes */
int oldstyle;
- char const *prevsyntax; /* syntax before arithmetic */
+ int prevsyntax; /* syntax before arithmetic */
#if __GNUC__
/* Avoid longjmp clobbering */
(void) &out;
@@ -10159,8 +10218,8 @@ readtoken1(firstc, syntax, eofmark, striptabs)
loop: { /* for each line, until end of word */
CHECKEND(); /* set c to PEOF if at end of here document */
for (;;) { /* until end of line or end of word */
- CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */
- switch(syntax[c]) {
+ CHECKSTRSPACE(4, out); /* permit 4 calls to USTPUTC */
+ switch(SIT(c, syntax)) {
case CNL: /* '\n' */
if (syntax == BASESYNTAX)
goto endword; /* exit outer loop */
@@ -10168,66 +10227,65 @@ readtoken1(firstc, syntax, eofmark, striptabs)
plinno++;
if (doprompt)
setprompt(2);
- else
- setprompt(0);
c = pgetc();
goto loop; /* continue outer loop */
case CWORD:
USTPUTC(c, out);
break;
case CCTL:
- if ((eofmark == NULL || dblquote) &&
- dqvarnest == 0)
+ if (eofmark == NULL || dblquote)
USTPUTC(CTLESC, out);
USTPUTC(c, out);
break;
case CBACK: /* backslash */
c = pgetc2();
if (c == PEOF) {
+ USTPUTC(CTLESC, out);
USTPUTC('\\', out);
pungetc();
} else if (c == '\n') {
if (doprompt)
setprompt(2);
- else
- setprompt(0);
} else {
- if (dblquote && c != '\\' && c != '`' && c != '$'
- && (c != '"' || eofmark != NULL))
+ if (
+ dblquote &&
+ c != '\\' && c != '`' &&
+ c != '$' && (
+ c != '"' ||
+ eofmark != NULL
+ )
+ ) {
+ USTPUTC(CTLESC, out);
USTPUTC('\\', out);
- if (SQSYNTAX[c] == CCTL)
+ }
+ if (SIT(c, SQSYNTAX) == CCTL)
USTPUTC(CTLESC, out);
- else if (eofmark == NULL)
- USTPUTC(CTLQUOTEMARK, out);
USTPUTC(c, out);
quotef++;
}
break;
case CSQUOTE:
- if (eofmark == NULL)
- USTPUTC(CTLQUOTEMARK, out);
syntax = SQSYNTAX;
+quotemark:
+ if (eofmark == NULL) {
+ USTPUTC(CTLQUOTEMARK, out);
+ }
break;
case CDQUOTE:
- if (eofmark == NULL)
- USTPUTC(CTLQUOTEMARK, out);
syntax = DQSYNTAX;
dblquote = 1;
- break;
+ goto quotemark;
case CENDQUOTE:
if (eofmark != NULL && arinest == 0 &&
varnest == 0) {
USTPUTC(c, out);
} else {
- if (arinest) {
- syntax = ARISYNTAX;
- dblquote = 0;
- } else if (eofmark == NULL &&
- dqvarnest == 0) {
+ if (dqvarnest == 0) {
syntax = BASESYNTAX;
dblquote = 0;
}
quotef++;
+ goto quotemark;
}
break;
case CVAR: /* '$' */
@@ -10244,7 +10302,7 @@ readtoken1(firstc, syntax, eofmark, striptabs)
USTPUTC(c, out);
}
break;
-#ifdef ASH_MATH_SUPPORT
+#ifdef BB_ASH_MATH_SUPPORT
case CLP: /* '(' in arithmetic */
parenlevel++;
USTPUTC(c, out);
@@ -10285,7 +10343,7 @@ readtoken1(firstc, syntax, eofmark, striptabs)
default:
if (varnest == 0)
goto endword; /* exit outer loop */
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
if (c != PEOA)
#endif
USTPUTC(c, out);
@@ -10295,16 +10353,19 @@ readtoken1(firstc, syntax, eofmark, striptabs)
}
}
endword:
+#ifdef BB_ASH_MATH_SUPPORT
if (syntax == ARISYNTAX)
synerror("Missing '))'");
+#endif
if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
synerror("Unterminated quoted string");
if (varnest != 0) {
startlinno = plinno;
+ /* { */
synerror("Missing '}'");
}
USTPUTC('\0', out);
- len = out - stackblock();
+ len = out - (char *)stackblock();
out = stackblock();
if (eofmark == NULL) {
if ((c == '>' || c == '<')
@@ -10334,7 +10395,7 @@ endword:
checkend: {
if (eofmark) {
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
if (c == PEOA) {
c = pgetc2();
}
@@ -10355,7 +10416,7 @@ checkend: {
plinno++;
needprompt = doprompt;
} else {
- pushstring(line, strlen(line), NULL);
+ pushstring(line, NULL);
}
}
}
@@ -10380,10 +10441,10 @@ parseredir: {
c = pgetc();
if (c == '>')
np->type = NAPPEND;
+ else if (c == '|')
+ np->type = NCLOBBER;
else if (c == '&')
np->type = NTOFD;
- else if (c == '|')
- np->type = NTOOV;
else {
np->type = NTO;
pungetc();
@@ -10442,21 +10503,25 @@ parsesub: {
c = pgetc();
if (
- c <= PEOA ||
+ c <= PEOA_OR_PEOF ||
(c != '(' && c != '{' && !is_name(c) && !is_special(c))
) {
USTPUTC('$', out);
pungetc();
} else if (c == '(') { /* $(command) or $((arith)) */
if (pgetc() == '(') {
+#ifdef BB_ASH_MATH_SUPPORT
PARSEARITH();
+#else
+ synerror("We unsupport $((arith))");
+#endif
} else {
pungetc();
PARSEBACKQNEW();
}
} else {
USTPUTC(CTLVAR, out);
- typeloc = out - stackblock();
+ typeloc = out - (char *)stackblock();
USTPUTC(VSNORMAL, out);
subtype = VSNORMAL;
if (c == '{') {
@@ -10470,14 +10535,14 @@ parsesub: {
else
subtype = 0;
}
- if (c > PEOA && is_name(c)) {
+ if (c > PEOA_OR_PEOF && is_name(c)) {
do {
STPUTC(c, out);
c = pgetc();
- } while (c > PEOA && is_in_name(c));
+ } while (c > PEOA_OR_PEOF && is_in_name(c));
} else if (is_digit(c)) {
do {
- USTPUTC(c, out);
+ STPUTC(c, out);
c = pgetc();
} while (is_digit(c));
}
@@ -10521,10 +10586,10 @@ badsub: synerror("Bad substitution");
}
if (dblquote || arinest)
flags |= VSQUOTE;
- *(stackblock() + typeloc) = subtype | flags;
+ *((char *)stackblock() + typeloc) = subtype | flags;
if (subtype != VSNORMAL) {
varnest++;
- if (dblquote) {
+ if (dblquote || arinest) {
dqvarnest++;
}
}
@@ -10547,7 +10612,7 @@ parsebackq: {
char *volatile str;
struct jmploc jmploc;
struct jmploc *volatile savehandler;
- int savelen;
+ size_t savelen;
int saveprompt;
#ifdef __GNUC__
(void) &saveprompt;
@@ -10563,7 +10628,7 @@ parsebackq: {
}
INTOFF;
str = NULL;
- savelen = out - stackblock();
+ savelen = out - (char *)stackblock();
if (savelen > 0) {
str = ckmalloc(savelen);
memcpy(str, stackblock(), savelen);
@@ -10577,7 +10642,7 @@ parsebackq: {
reread it as input, interpreting it normally. */
char *pout;
int pc;
- int psavelen;
+ size_t psavelen;
char *pstr;
@@ -10596,8 +10661,6 @@ parsebackq: {
plinno++;
if (doprompt)
setprompt(2);
- else
- setprompt(0);
/*
* If eating a newline, avoid putting
* the newline into the new character
@@ -10609,13 +10672,13 @@ parsebackq: {
if (pc != '\\' && pc != '`' && pc != '$'
&& (!dblquote || pc != '"'))
STPUTC('\\', pout);
- if (pc > PEOA) {
+ if (pc > PEOA_OR_PEOF) {
break;
}
/* fall through */
case PEOF:
-#ifdef ASH_ALIAS
+#ifdef BB_ASH_ALIAS
case PEOA:
#endif
startlinno = plinno;
@@ -10633,7 +10696,7 @@ parsebackq: {
}
done:
STPUTC('\0', pout);
- psavelen = pout - stackblock();
+ psavelen = pout - (char *)stackblock();
if (psavelen > 0) {
pstr = grabstackstr(pout);
setinputstring(pstr);
@@ -10651,7 +10714,7 @@ done:
doprompt = 0;
}
- n = list(0);
+ n = list(2);
if (oldstyle)
doprompt = saveprompt;
@@ -10692,6 +10755,7 @@ done:
goto parsebackq_newreturn;
}
+#ifdef BB_ASH_MATH_SUPPORT
/*
* Parse an arithmetic expansion (indicate start of one and set state)
*/
@@ -10714,19 +10778,20 @@ parsearith: {
}
goto parsearith_return;
}
+#endif
} /* end of readtoken */
+
/*
* Returns true if the text contains nothing to expand (no dollar signs
* or backquotes).
*/
static int
-noexpand(text)
- char *text;
- {
+noexpand(char *text)
+{
char *p;
char c;
@@ -10736,7 +10801,7 @@ noexpand(text)
continue;
if (c == CTLESC)
p++;
- else if (BASESYNTAX[(int)c] == CCTL)
+ else if (SIT(c, BASESYNTAX) == CCTL)
return 0;
}
return 1;
@@ -10744,23 +10809,23 @@ noexpand(text)
/*
- * Return true if the argument is a legal variable name (a letter or
- * underscore followed by zero or more letters, underscores, and digits).
+ * Return of a legal variable name (a letter or underscore followed by zero or
+ * more letters, underscores, and digits).
*/
-static int
-goodname(const char *name)
+char *
+endofname(const char *name)
{
- const char *p;
+ char *p;
- p = name;
+ p = (char *) name;
if (! is_name(*p))
- return 0;
+ return p;
while (*++p) {
if (! is_in_name(*p))
- return 0;
+ break;
}
- return 1;
+ return p;
}
@@ -10770,30 +10835,22 @@ goodname(const char *name)
* occur at this point.
*/
-static void
-synexpect(token)
- int token;
+static void synexpect(int token)
{
char msg[64];
+ int l;
- if (token >= 0) {
- snprintf(msg, 64, "%s unexpected (expecting %s)",
- tokname[lasttoken], tokname[token]);
- } else {
- snprintf(msg, 64, "%s unexpected", tokname[lasttoken]);
- }
+ l = sprintf(msg, "%s unexpected", tokname(lasttoken));
+ if (token >= 0)
+ sprintf(msg + l, " (expecting %s)", tokname(token));
synerror(msg);
/* NOTREACHED */
}
-
static void
synerror(const char *msg)
{
- if (commandname)
- out2fmt("%s: %d: ", commandname, startlinno);
- out2fmt("Syntax error: %s\n", msg);
- error((char *)NULL);
+ error("Syntax error: %s", msg);
/* NOTREACHED */
}
@@ -10802,24 +10859,34 @@ synerror(const char *msg)
* called by editline -- any expansions to the prompt
* should be added here.
*/
-static void
-setprompt(int whichprompt)
+
+static void setprompt(int whichprompt)
{
- char *prompt;
- switch (whichprompt) {
+ const char *prompt;
+
+ switch (whichprompt) {
case 1:
prompt = ps1val();
break;
case 2:
prompt = ps2val();
break;
- default: /* 0 */
- prompt = "";
- }
- putprompt(prompt);
+ default: /* 0 */
+ prompt = nullstr;
+ }
+ putprompt(prompt);
}
+static const char *const *findkwd(const char *s)
+{
+ return bsearch(s, tokname_array + KWDOFFSET,
+ (sizeof(tokname_array) / sizeof(const char *)) - KWDOFFSET,
+ sizeof(const char *), pstrcmp);
+}
+
+/* $NetBSD: redir.c,v 1.27 2002/11/24 22:35:42 christos Exp $ */
+
/*
* Code for dealing with input/output redirection.
*/
@@ -10831,7 +10898,6 @@ setprompt(int whichprompt)
# define PIPESIZE PIPE_BUF
#endif
-
/*
* Open a file in noclobber mode.
* The code was copied from bash.
@@ -10897,10 +10963,10 @@ noclobberopen(const char *fname)
*/
static inline int
-openhere(const union node *redir)
+openhere(union node *redir)
{
int pip[2];
- int len = 0;
+ size_t len = 0;
if (pipe(pip) < 0)
error("Pipe call failed");
@@ -10931,9 +10997,8 @@ out:
return pip[0];
}
-
-static inline int
-openredirect(const union node *redir)
+static int
+openredirect(union node *redir)
{
char *fname;
int f;
@@ -10957,27 +11022,16 @@ openredirect(const union node *redir)
goto ecreate;
break;
}
- case NTOOV:
+ /* FALLTHROUGH */
+ case NCLOBBER:
fname = redir->nfile.expfname;
-#ifdef O_CREAT
if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
goto ecreate;
-#else
- if ((f = creat(fname, 0666)) < 0)
- goto ecreate;
-#endif
break;
case NAPPEND:
fname = redir->nfile.expfname;
-#ifdef O_APPEND
if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
goto ecreate;
-#else
- if ((f = open(fname, O_WRONLY)) < 0
- && (f = creat(fname, 0666)) < 0)
- goto ecreate;
- lseek(f, (off_t)0, 2);
-#endif
break;
default:
#ifdef DEBUG
@@ -11001,148 +11055,140 @@ eopen:
error("cannot open %s: %s", fname, errmsg(errno, E_OPEN));
}
+static inline void
+dupredirect(union node *redir, int f)
+{
+ int fd = redir->nfile.fd;
+
+ if (redir->nfile.type == NTOFD || redir->nfile.type == NFROMFD) {
+ if (redir->ndup.dupfd >= 0) { /* if not ">&-" */
+ ash_copyfd(redir->ndup.dupfd, fd);
+ }
+ return;
+ }
+
+ if (f != fd) {
+ ash_copyfd(f, fd);
+ close(f);
+ }
+ return;
+}
/*
* Process a list of redirection commands. If the REDIR_PUSH flag is set,
* old file descriptors are stashed away so that the redirection can be
* undone by calling popredir. If the REDIR_BACKQ flag is set, then the
* standard output, and the standard error if it becomes a duplicate of
- * stdout.
+ * stdout, is saved in memory.
*/
static void
redirect(union node *redir, int flags)
{
union node *n;
- struct redirtab *sv = NULL;
+ struct redirtab *sv;
int i;
int fd;
int newfd;
- int try;
- int fd1dup = flags & REDIR_BACKQ;; /* stdout `cmd` redir to pipe */
-
+ int *p;
+ nullredirs++;
+ if (!redir) {
+ return;
+ }
+ sv = NULL;
+ INTOFF;
if (flags & REDIR_PUSH) {
- sv = ckmalloc(sizeof (struct redirtab));
+ struct redirtab *q;
+ q = ckmalloc(sizeof (struct redirtab));
+ q->next = redirlist;
+ redirlist = q;
+ q->nullredirs = nullredirs - 1;
for (i = 0 ; i < 10 ; i++)
- sv->renamed[i] = EMPTY;
- sv->next = redirlist;
- redirlist = sv;
+ q->renamed[i] = EMPTY;
+ nullredirs = 0;
+ sv = q;
}
- for (n = redir ; n ; n = n->nfile.next) {
+ n = redir;
+ do {
fd = n->nfile.fd;
- try = 0;
if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) &&
n->ndup.dupfd == fd)
continue; /* redirect from/to same file descriptor */
- INTOFF;
newfd = openredirect(n);
- if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) {
- if (newfd == fd) {
- try++;
- } else if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
- switch (errno) {
- case EBADF:
- if (!try) {
- dupredirect(n, newfd, fd1dup);
- try++;
- break;
- }
- /* FALLTHROUGH*/
- default:
- if (newfd >= 0) {
- close(newfd);
- }
- INTON;
+ if (fd == newfd)
+ continue;
+ if (sv && *(p = &sv->renamed[fd]) == EMPTY) {
+ i = fcntl(fd, F_DUPFD, 10);
+
+ if (i == -1) {
+ i = errno;
+ if (i != EBADF) {
+ close(newfd);
+ errno = i;
error("%d: %m", fd);
/* NOTREACHED */
}
- }
- if (!try) {
+ } else {
+ *p = i;
close(fd);
- if (flags & REDIR_PUSH) {
- sv->renamed[fd] = i;
- }
}
- } else if (fd != newfd) {
+ } else {
close(fd);
}
- if (fd == 0)
- fd0_redirected++;
- if (!try)
- dupredirect(n, newfd, fd1dup);
- INTON;
- }
-}
-
-
-static void
-dupredirect(const union node *redir, int f, int fd1dup)
-{
- int fd = redir->nfile.fd;
-
- if(fd==1)
- fd1dup = 0;
- if (redir->nfile.type == NTOFD || redir->nfile.type == NFROMFD) {
- if (redir->ndup.dupfd >= 0) { /* if not ">&-" */
- if (redir->ndup.dupfd!=1 || fd1dup!=1)
- dup_as_newfd(redir->ndup.dupfd, fd);
- }
- return;
- }
-
- if (f != fd) {
- dup_as_newfd(f, fd);
- close(f);
- }
- return;
+ dupredirect(n, newfd);
+ } while ((n = n->nfile.next));
+ INTON;
+ if (flags & REDIR_SAVEFD2 && sv && sv->renamed[2] >= 0)
+ preverrout_fd = sv->renamed[2];
}
-
/*
* Undo the effects of the last redirection.
*/
-static void
-popredir(void)
+void
+popredir(int drop)
{
- struct redirtab *rp = redirlist;
+ struct redirtab *rp;
int i;
+ if (--nullredirs >= 0)
+ return;
INTOFF;
+ rp = redirlist;
for (i = 0 ; i < 10 ; i++) {
if (rp->renamed[i] != EMPTY) {
- if (i == 0)
- fd0_redirected--;
- close(i);
- if (rp->renamed[i] >= 0) {
- dup_as_newfd(rp->renamed[i], i);
- close(rp->renamed[i]);
+ if (!drop) {
+ close(i);
+ ash_copyfd(rp->renamed[i], i);
}
+ close(rp->renamed[i]);
}
}
redirlist = rp->next;
+ nullredirs = rp->nullredirs;
ckfree(rp);
INTON;
}
/*
- * Discard all saved file descriptors.
+ * Undo all redirections. Called on error or interrupt.
*/
-static void
-clearredir(void) {
- struct redirtab *rp;
- int i;
+/*
+ * Discard all saved file descriptors.
+ */
- for (rp = redirlist ; rp ; rp = rp->next) {
- for (i = 0 ; i < 10 ; i++) {
- if (rp->renamed[i] >= 0) {
- close(rp->renamed[i]);
- }
- rp->renamed[i] = EMPTY;
- }
+void
+clearredir(int drop)
+{
+ for (;;) {
+ nullredirs = 0;
+ if (!redirlist)
+ break;
+ popredir(drop);
}
}
@@ -11153,10 +11199,8 @@ clearredir(void) {
* file descriptors left.
*/
-static int
-dup_as_newfd(from, to)
- int from;
- int to;
+int
+ash_copyfd(int from, int to)
{
int newfd;
@@ -11170,446 +11214,39 @@ dup_as_newfd(from, to)
return newfd;
}
-/*#ifdef __weak_alias
-__weak_alias(getmode,_getmode)
-__weak_alias(setmode,_setmode)
-#endif*/
-
-#ifndef S_ISTXT
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#define S_ISTXT __S_ISVTX
-#else
-#define S_ISTXT S_ISVTX
-#endif
-#endif
-
-#define SET_LEN 6 /* initial # of bitcmd struct to malloc */
-#define SET_LEN_INCR 4 /* # of bitcmd structs to add as needed */
-
-typedef struct bitcmd {
- char cmd;
- char cmd2;
- mode_t bits;
-} BITCMD;
-
-#define CMD2_CLR 0x01
-#define CMD2_SET 0x02
-#define CMD2_GBITS 0x04
-#define CMD2_OBITS 0x08
-#define CMD2_UBITS 0x10
-
-static BITCMD *addcmd (BITCMD *, int, int, int, u_int);
-static void compress_mode (BITCMD *);
-#ifdef SETMODE_DEBUG
-static void dumpmode (BITCMD *);
-#endif
-
-/*
- * Given the old mode and an array of bitcmd structures, apply the operations
- * described in the bitcmd structures to the old mode, and return the new mode.
- * Note that there is no '=' command; a strict assignment is just a '-' (clear
- * bits) followed by a '+' (set bits).
- */
-static mode_t
-getmode(bbox, omode)
- const void *bbox;
- mode_t omode;
-{
- const BITCMD *set;
- mode_t clrval, newmode, value;
-
- _DIAGASSERT(bbox != NULL);
-
- set = (const BITCMD *)bbox;
- newmode = omode;
- for (value = 0;; set++)
- switch(set->cmd) {
- /*
- * When copying the user, group or other bits around, we "know"
- * where the bits are in the mode so that we can do shifts to
- * copy them around. If we don't use shifts, it gets real
- * grundgy with lots of single bit checks and bit sets.
- */
- case 'u':
- value = (newmode & S_IRWXU) >> 6;
- goto common;
-
- case 'g':
- value = (newmode & S_IRWXG) >> 3;
- goto common;
-
- case 'o':
- value = newmode & S_IRWXO;
-common: if (set->cmd2 & CMD2_CLR) {
- clrval =
- (set->cmd2 & CMD2_SET) ? S_IRWXO : value;
- if (set->cmd2 & CMD2_UBITS)
- newmode &= ~((clrval<<6) & set->bits);
- if (set->cmd2 & CMD2_GBITS)
- newmode &= ~((clrval<<3) & set->bits);
- if (set->cmd2 & CMD2_OBITS)
- newmode &= ~(clrval & set->bits);
- }
- if (set->cmd2 & CMD2_SET) {
- if (set->cmd2 & CMD2_UBITS)
- newmode |= (value<<6) & set->bits;
- if (set->cmd2 & CMD2_GBITS)
- newmode |= (value<<3) & set->bits;
- if (set->cmd2 & CMD2_OBITS)
- newmode |= value & set->bits;
- }
- break;
-
- case '+':
- newmode |= set->bits;
- break;
-
- case '-':
- newmode &= ~set->bits;
- break;
-
- case 'X':
- if (omode & (S_IFDIR|S_IXUSR|S_IXGRP|S_IXOTH))
- newmode |= set->bits;
- break;
-
- case '\0':
- default:
-#ifdef SETMODE_DEBUG
- (void)printf("getmode:%04o -> %04o\n", omode, newmode);
-#endif
- return (newmode);
- }
-}
-
-#define ADDCMD(a, b, c, d) do { \
- if (set >= endset) { \
- BITCMD *newset; \
- setlen += SET_LEN_INCR; \
- newset = realloc(saveset, sizeof(BITCMD) * setlen); \
- if (newset == NULL) { \
- free(saveset); \
- return (NULL); \
- } \
- set = newset + (set - saveset); \
- saveset = newset; \
- endset = newset + (setlen - 2); \
- } \
- set = addcmd(set, (a), (b), (c), (d)); \
-} while (/*CONSTCOND*/0)
-
-#define STANDARD_BITS (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
-static void *
-setmode(p)
- const char *p;
-{
- int perm, who;
- char op, *ep;
- BITCMD *set, *saveset, *endset;
- sigset_t mysigset, sigoset;
- mode_t mask;
- int equalopdone = 0; /* pacify gcc */
- int permXbits, setlen;
-
- if (!*p)
- return (NULL);
-
- /*
- * Get a copy of the mask for the permissions that are mask relative.
- * Flip the bits, we want what's not set. Since it's possible that
- * the caller is opening files inside a signal handler, protect them
- * as best we can.
- */
- sigfillset(&mysigset);
- (void)sigprocmask(SIG_BLOCK, &mysigset, &sigoset);
- (void)umask(mask = umask(0));
- mask = ~mask;
- (void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
-
- setlen = SET_LEN + 2;
-
- if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
- return (NULL);
- saveset = set;
- endset = set + (setlen - 2);
-
- /*
- * If an absolute number, get it and return; disallow non-octal digits
- * or illegal bits.
- */
- if (is_digit((unsigned char)*p)) {
- perm = (mode_t)strtol(p, &ep, 8);
- if (*ep || perm & ~(STANDARD_BITS|S_ISTXT)) {
- free(saveset);
- return (NULL);
- }
- ADDCMD('=', (STANDARD_BITS|S_ISTXT), perm, mask);
- set->cmd = 0;
- return (saveset);
- }
-
- /*
- * Build list of structures to set/clear/copy bits as described by
- * each clause of the symbolic mode.
- */
- for (;;) {
- /* First, find out which bits might be modified. */
- for (who = 0;; ++p) {
- switch (*p) {
- case 'a':
- who |= STANDARD_BITS;
- break;
- case 'u':
- who |= S_ISUID|S_IRWXU;
- break;
- case 'g':
- who |= S_ISGID|S_IRWXG;
- break;
- case 'o':
- who |= S_IRWXO;
- break;
- default:
- goto getop;
- }
- }
-
-getop: if ((op = *p++) != '+' && op != '-' && op != '=') {
- free(saveset);
- return (NULL);
- }
- if (op == '=')
- equalopdone = 0;
-
- who &= ~S_ISTXT;
- for (perm = 0, permXbits = 0;; ++p) {
- switch (*p) {
- case 'r':
- perm |= S_IRUSR|S_IRGRP|S_IROTH;
- break;
- case 's':
- /*
- * If specific bits where requested and
- * only "other" bits ignore set-id.
- */
- if (who == 0 || (who & ~S_IRWXO))
- perm |= S_ISUID|S_ISGID;
- break;
- case 't':
- /*
- * If specific bits where requested and
- * only "other" bits ignore set-id.
- */
- if (who == 0 || (who & ~S_IRWXO)) {
- who |= S_ISTXT;
- perm |= S_ISTXT;
- }
- break;
- case 'w':
- perm |= S_IWUSR|S_IWGRP|S_IWOTH;
- break;
- case 'X':
- permXbits = S_IXUSR|S_IXGRP|S_IXOTH;
- break;
- case 'x':
- perm |= S_IXUSR|S_IXGRP|S_IXOTH;
- break;
- case 'u':
- case 'g':
- case 'o':
- /*
- * When ever we hit 'u', 'g', or 'o', we have
- * to flush out any partial mode that we have,
- * and then do the copying of the mode bits.
- */
- if (perm) {
- ADDCMD(op, who, perm, mask);
- perm = 0;
- }
- if (op == '=')
- equalopdone = 1;
- if (op == '+' && permXbits) {
- ADDCMD('X', who, permXbits, mask);
- permXbits = 0;
- }
- ADDCMD(*p, who, op, mask);
- break;
-
- default:
- /*
- * Add any permissions that we haven't already
- * done.
- */
- if (perm || (op == '=' && !equalopdone)) {
- if (op == '=')
- equalopdone = 1;
- ADDCMD(op, who, perm, mask);
- perm = 0;
- }
- if (permXbits) {
- ADDCMD('X', who, permXbits, mask);
- permXbits = 0;
- }
- goto apply;
- }
- }
-
-apply: if (!*p)
- break;
- if (*p != ',')
- goto getop;
- ++p;
- }
- set->cmd = 0;
-#ifdef SETMODE_DEBUG
- (void)printf("Before compress_mode()\n");
- dumpmode(saveset);
-#endif
- compress_mode(saveset);
-#ifdef SETMODE_DEBUG
- (void)printf("After compress_mode()\n");
- dumpmode(saveset);
-#endif
- return (saveset);
-}
-
-static BITCMD *
-addcmd(set, op, who, oparg, mask)
- BITCMD *set;
- int oparg, who;
- int op;
- u_int mask;
+int
+redirectsafe(union node *redir, int flags)
{
+ int err;
+ volatile int saveint;
+ struct jmploc *volatile savehandler = handler;
+ struct jmploc jmploc;
- _DIAGASSERT(set != NULL);
-
- switch (op) {
- case '=':
- set->cmd = '-';
- set->bits = who ? who : STANDARD_BITS;
- set++;
-
- op = '+';
- /* FALLTHROUGH */
- case '+':
- case '-':
- case 'X':
- set->cmd = op;
- set->bits = (who ? who : mask) & oparg;
- break;
-
- case 'u':
- case 'g':
- case 'o':
- set->cmd = op;
- if (who) {
- set->cmd2 = ((who & S_IRUSR) ? CMD2_UBITS : 0) |
- ((who & S_IRGRP) ? CMD2_GBITS : 0) |
- ((who & S_IROTH) ? CMD2_OBITS : 0);
- set->bits = (mode_t)~0;
- } else {
- set->cmd2 = CMD2_UBITS | CMD2_GBITS | CMD2_OBITS;
- set->bits = mask;
- }
-
- if (oparg == '+')
- set->cmd2 |= CMD2_SET;
- else if (oparg == '-')
- set->cmd2 |= CMD2_CLR;
- else if (oparg == '=')
- set->cmd2 |= CMD2_SET|CMD2_CLR;
- break;
+ SAVEINT(saveint);
+ if (!(err = setjmp(jmploc.loc) * 2)) {
+ handler = &jmploc;
+ redirect(redir, flags);
}
- return (set + 1);
-}
-
-#ifdef SETMODE_DEBUG
-static void
-dumpmode(set)
- BITCMD *set;
-{
-
- _DIAGASSERT(set != NULL);
-
- for (; set->cmd; ++set)
- (void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
- set->cmd, set->bits, set->cmd2 ? " cmd2:" : "",
- set->cmd2 & CMD2_CLR ? " CLR" : "",
- set->cmd2 & CMD2_SET ? " SET" : "",
- set->cmd2 & CMD2_UBITS ? " UBITS" : "",
- set->cmd2 & CMD2_GBITS ? " GBITS" : "",
- set->cmd2 & CMD2_OBITS ? " OBITS" : "");
+ handler = savehandler;
+ if (err && exception != EXERROR)
+ longjmp(handler->loc, 1);
+ RESTOREINT(saveint);
+ return err;
}
-#endif
-
-/*
- * Given an array of bitcmd structures, compress by compacting consecutive
- * '+', '-' and 'X' commands into at most 3 commands, one of each. The 'u',
- * 'g' and 'o' commands continue to be separate. They could probably be
- * compacted, but it's not worth the effort.
- */
-static void
-compress_mode(set)
- BITCMD *set;
-{
- BITCMD *nset;
- int setbits, clrbits, Xbits, op;
-
- _DIAGASSERT(set != NULL);
- for (nset = set;;) {
- /* Copy over any 'u', 'g' and 'o' commands. */
- while ((op = nset->cmd) != '+' && op != '-' && op != 'X') {
- *set++ = *nset++;
- if (!op)
- return;
- }
+/* $NetBSD: show.c,v 1.24 2003/01/22 20:36:04 dsl Exp $ */
- for (setbits = clrbits = Xbits = 0;; nset++) {
- if ((op = nset->cmd) == '-') {
- clrbits |= nset->bits;
- setbits &= ~nset->bits;
- Xbits &= ~nset->bits;
- } else if (op == '+') {
- setbits |= nset->bits;
- clrbits &= ~nset->bits;
- Xbits &= ~nset->bits;
- } else if (op == 'X')
- Xbits |= nset->bits & ~setbits;
- else
- break;
- }
- if (clrbits) {
- set->cmd = '-';
- set->cmd2 = 0;
- set->bits = clrbits;
- set++;
- }
- if (setbits) {
- set->cmd = '+';
- set->cmd2 = 0;
- set->bits = setbits;
- set++;
- }
- if (Xbits) {
- set->cmd = 'X';
- set->cmd2 = 0;
- set->bits = Xbits;
- set++;
- }
- }
-}
#ifdef DEBUG
-static void shtree (union node *, int, char *, FILE*);
-static void shcmd (union node *, FILE *);
-static void sharg (union node *, FILE *);
-static void indent (int, char *, FILE *);
-static void trstring (char *);
+static void shtree(union node *, int, char *, FILE*);
+static void shcmd(union node *, FILE *);
+static void sharg(union node *, FILE *);
+static void indent(int, char *, FILE *);
+static void trstring(char *);
-static void
-showtree(n)
- union node *n;
+void
+showtree(union node *n)
{
trputs("showtree called\n");
shtree(n, 1, NULL, stdout);
@@ -11617,11 +11254,7 @@ showtree(n)
static void
-shtree(n, ind, pfx, fp)
- union node *n;
- int ind;
- char *pfx;
- FILE *fp;
+shtree(union node *n, int ind, char *pfx, FILE *fp)
{
struct nodelist *lp;
const char *s;
@@ -11670,11 +11303,8 @@ binop:
}
-
static void
-shcmd(cmd, fp)
- union node *cmd;
- FILE *fp;
+shcmd(union node *cmd, FILE *fp)
{
union node *np;
int first;
@@ -11693,9 +11323,9 @@ shcmd(cmd, fp)
putchar(' ');
switch (np->nfile.type) {
case NTO: s = ">"; dftfd = 1; break;
+ case NCLOBBER: s = ">|"; dftfd = 1; break;
case NAPPEND: s = ">>"; dftfd = 1; break;
case NTOFD: s = ">&"; dftfd = 1; break;
- case NTOOV: s = ">|"; dftfd = 1; break;
case NFROM: s = "<"; dftfd = 0; break;
case NFROMFD: s = "<&"; dftfd = 0; break;
case NFROMTO: s = "<>"; dftfd = 0; break;
@@ -11716,17 +11346,14 @@ shcmd(cmd, fp)
static void
-sharg(arg, fp)
- union node *arg;
- FILE *fp;
- {
+sharg(union node *arg, FILE *fp)
+{
char *p;
struct nodelist *bqlist;
int subtype;
if (arg->type != NARG) {
- printf("<node type %d>\n", arg->type);
- fflush(stdout);
+ out1fmt("<node type %d>\n", arg->type);
abort();
}
bqlist = arg->narg.backquote;
@@ -11781,7 +11408,7 @@ sharg(arg, fp)
case VSLENGTH:
break;
default:
- printf("<subtype %d>", subtype);
+ out1fmt("<subtype %d>", subtype);
}
break;
case CTLENDVAR:
@@ -11803,10 +11430,7 @@ sharg(arg, fp)
static void
-indent(amount, pfx, fp)
- int amount;
- char *pfx;
- FILE *fp;
+indent(int amount, char *pfx, FILE *fp)
{
int i;
@@ -11816,7 +11440,6 @@ indent(amount, pfx, fp)
putc('\t', fp);
}
}
-#endif
@@ -11825,61 +11448,54 @@ indent(amount, pfx, fp)
*/
-#ifdef DEBUG
FILE *tracefile;
-#if DEBUG == 2
-static int debug = 1;
-#else
-static int debug = 0;
-#endif
-
-static void
-trputc(c)
- int c;
+void
+trputc(int c)
{
- if (tracefile == NULL)
+ if (debug != 1)
return;
putc(c, tracefile);
- if (c == '\n')
- fflush(tracefile);
}
-static void
+void
trace(const char *fmt, ...)
{
va_list va;
+
+ if (debug != 1)
+ return;
va_start(va, fmt);
- if (tracefile != NULL) {
- (void) vfprintf(tracefile, fmt, va);
- if (strchr(fmt, '\n'))
- (void) fflush(tracefile);
- }
+ (void) vfprintf(tracefile, fmt, va);
va_end(va);
}
+void
+tracev(const char *fmt, va_list va)
+{
+ if (debug != 1)
+ return;
+ (void) vfprintf(tracefile, fmt, va);
+}
+
-static void
-trputs(s)
- const char *s;
+void
+trputs(const char *s)
{
- if (tracefile == NULL)
+ if (debug != 1)
return;
fputs(s, tracefile);
- if (strchr(s, '\n'))
- fflush(tracefile);
}
static void
-trstring(s)
- char *s;
+trstring(char *s)
{
char *p;
char c;
- if (tracefile == NULL)
+ if (debug != 1)
return;
putc('"', tracefile);
for (p = s ; *p ; p++) {
@@ -11913,11 +11529,10 @@ backslash: putc('\\', tracefile);
}
-static void
-trargs(ap)
- char **ap;
+void
+trargs(char **ap)
{
- if (tracefile == NULL)
+ if (debug != 1)
return;
while (*ap) {
trstring(*ap++);
@@ -11926,81 +11541,91 @@ trargs(ap)
else
putc('\n', tracefile);
}
- fflush(tracefile);
}
-static void
-opentrace() {
+void
+opentrace(void)
+{
char s[100];
#ifdef O_APPEND
int flags;
#endif
- if (!debug)
+ if (debug != 1) {
+ if (tracefile)
+ fflush(tracefile);
+ /* leave open because libedit might be using it */
return;
-#ifdef not_this_way
- {
- char *p;
- if ((p = getenv("HOME")) == NULL) {
- if (geteuid() == 0)
- p = "/";
- else
- p = "/tmp";
- }
- strcpy(s, p);
- strcat(s, "/trace");
}
-#else
- strcpy(s, "./trace");
-#endif /* not_this_way */
- if ((tracefile = fopen(s, "a")) == NULL) {
- fprintf(stderr, "Can't open %s\n", s);
- return;
+ scopy("./trace", s);
+ if (tracefile) {
+ if (!freopen(s, "a", tracefile)) {
+ fprintf(stderr, "Can't re-open %s\n", s);
+ debug = 0;
+ return;
+ }
+ } else {
+ if ((tracefile = fopen(s, "a")) == NULL) {
+ fprintf(stderr, "Can't open %s\n", s);
+ debug = 0;
+ return;
+ }
}
#ifdef O_APPEND
if ((flags = fcntl(fileno(tracefile), F_GETFL, 0)) >= 0)
fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND);
#endif
+ setlinebuf(tracefile);
fputs("\nTracing started.\n", tracefile);
- fflush(tracefile);
}
#endif /* DEBUG */
+/* $NetBSD: trap.c,v 1.28 2002/11/24 22:35:43 christos Exp $ */
+
+/*
+ * Sigmode records the current value of the signal handlers for the various
+ * modes. A value of zero means that the current handler is not known.
+ * S_HARD_IGN indicates that the signal was ignored on entry to the shell,
+ */
+
+#define S_DFL 1 /* default signal handling (SIG_DFL) */
+#define S_CATCH 2 /* signal is caught */
+#define S_IGN 3 /* signal is ignored (SIG_IGN) */
+#define S_HARD_IGN 4 /* signal is ignored permenantly */
+#define S_RESET 5 /* temporary - to reset a hard ignored sig */
+
+
+
/*
* The trap builtin.
*/
-static int
-trapcmd(argc, argv)
- int argc;
- char **argv;
+int
+trapcmd(int argc, char **argv)
{
char *action;
char **ap;
int signo;
- if (argc <= 1) {
+ nextopt(nullstr);
+ ap = argptr;
+ if (!*ap) {
for (signo = 0 ; signo < NSIG ; signo++) {
if (trap[signo] != NULL) {
- char *p;
const char *sn;
- p = single_quote(trap[signo]);
- sn = sys_siglist[signo];
- if(sn==NULL)
- sn = u_signal_names(0, &signo, 0);
- if(sn==NULL)
+ sn = u_signal_names(0, &signo, 0);
+ if (sn == NULL)
sn = "???";
- printf("trap -- %s %s\n", p, sn);
- stunalloc(p);
+ out1fmt("trap -- %s %s\n",
+ single_quote(trap[signo]), sn);
}
}
return 0;
}
- ap = argv + 1;
- if (argc == 2)
+ if (!ap[1])
action = NULL;
else
action = *ap++;
@@ -12026,8 +11651,26 @@ trapcmd(argc, argv)
}
+/*
+ * Clear traps on a fork.
+ */
+void
+clear_traps(void)
+{
+ char **tp;
+ for (tp = trap ; tp < &trap[NSIG] ; tp++) {
+ if (*tp && **tp) { /* trap not NULL or SIG_IGN */
+ INTOFF;
+ ckfree(*tp);
+ *tp = NULL;
+ if (tp != &trap[0])
+ setsignal(tp - trap);
+ INTON;
+ }
+ }
+}
/*
@@ -12035,11 +11678,11 @@ trapcmd(argc, argv)
* out what it should be set to.
*/
-static void
+void
setsignal(int signo)
{
int action;
- char *t;
+ char *t, tsig;
struct sigaction act;
if ((t = trap[signo]) == NULL)
@@ -12056,18 +11699,15 @@ setsignal(int signo)
break;
case SIGQUIT:
#ifdef DEBUG
- {
-
if (debug)
break;
- }
#endif
/* FALLTHROUGH */
case SIGTERM:
if (iflag)
action = S_IGN;
break;
-#ifdef JOBS
+#if JOBS
case SIGTSTP:
case SIGTTOU:
if (mflag)
@@ -12078,7 +11718,8 @@ setsignal(int signo)
}
t = &sigmode[signo - 1];
- if (*t == 0) {
+ tsig = *t;
+ if (tsig == 0) {
/*
* current setting unknown
*/
@@ -12093,14 +11734,14 @@ setsignal(int signo)
if (act.sa_handler == SIG_IGN) {
if (mflag && (signo == SIGTSTP ||
signo == SIGTTIN || signo == SIGTTOU)) {
- *t = S_IGN; /* don't hard ignore these */
+ tsig = S_IGN; /* don't hard ignore these */
} else
- *t = S_HARD_IGN;
+ tsig = S_HARD_IGN;
} else {
- *t = S_RESET; /* force to be set */
+ tsig = S_RESET; /* force to be set */
}
}
- if (*t == S_HARD_IGN || *t == action)
+ if (tsig == S_HARD_IGN || tsig == action)
return;
switch (action) {
case S_CATCH:
@@ -12114,7 +11755,7 @@ setsignal(int signo)
}
*t = action;
act.sa_flags = 0;
- sigemptyset(&act.sa_mask);
+ sigfillset(&act.sa_mask);
sigaction(signo, &act, 0);
}
@@ -12122,9 +11763,8 @@ setsignal(int signo)
* Ignore a signal.
*/
-static void
-ignoresig(signo)
- int signo;
+void
+ignoresig(int signo)
{
if (sigmode[signo - 1] != S_IGN && sigmode[signo - 1] != S_HARD_IGN) {
signal(signo, SIG_IGN);
@@ -12137,15 +11777,17 @@ ignoresig(signo)
* Signal handler.
*/
-static void
+void
onsig(int signo)
{
- if (signo == SIGINT && trap[SIGINT] == NULL) {
- onint();
- return;
- }
gotsig[signo - 1] = 1;
- pendingsigs++;
+ pendingsigs = signo;
+
+ if (exsig || (signo == SIGINT && !trap[SIGINT])) {
+ if (!suppressint)
+ onint();
+ intpending = 1;
+ }
}
@@ -12154,56 +11796,125 @@ onsig(int signo)
* handlers while we are executing a trap handler.
*/
-static void
+void
dotrap(void)
{
- int i;
+ char *p;
+ char *q;
int savestatus;
- for (;;) {
- for (i = 1 ; ; i++) {
- if (gotsig[i - 1])
- break;
- if (i >= NSIG - 1)
- goto done;
+ savestatus = exitstatus;
+ q = gotsig;
+ while (pendingsigs = 0, barrier(), (p = memchr(q, 1, NSIG - 1))) {
+ *p = 0;
+ p = trap[p - q + 1];
+ if (!p)
+ continue;
+ evalstring(p, 0);
+ exitstatus = savestatus;
+ }
+}
+
+
+/*
+ * Controls whether the shell is interactive or not.
+ */
+
+void
+setinteractive(int on)
+{
+ static int is_interactive;
+
+ if (++on == is_interactive)
+ return;
+ is_interactive = on;
+ setsignal(SIGINT);
+ setsignal(SIGQUIT);
+ setsignal(SIGTERM);
+#ifndef BB_FEATURE_SH_EXTRA_QUIET
+ if(is_interactive > 1) {
+ /* Looks like they want an interactive shell */
+ static int do_banner;
+
+ if(!do_banner) {
+ out1fmt(
+ "\n\n" BB_BANNER " Built-in shell (ash)\n"
+ "Enter 'help' for a list of built-in commands.\n\n");
+ do_banner++;
+ }
+ }
+#endif
+}
+
+
+#ifndef BB_FEATURE_SH_EXTRA_QUIET
+/*** List the available builtins ***/
+
+static int helpcmd(int argc, char **argv)
+{
+ int col, i;
+
+ out1fmt("\nBuilt-in commands:\n-------------------\n");
+ for (col = 0, i = 0; i < NUMBUILTINS; i++) {
+ col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '),
+ builtincmd[i].name + 1);
+ if (col > 60) {
+ out1fmt("\n");
+ col = 0;
}
- gotsig[i - 1] = 0;
- savestatus=exitstatus;
- evalstring(trap[i], 0);
- exitstatus=savestatus;
}
-done:
- pendingsigs = 0;
+#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+ {
+ extern const struct BB_applet applets[];
+ extern const size_t NUM_APPLETS;
+
+ for (i = 0; i < NUM_APPLETS; i++) {
+
+ col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '), applets[i].name);
+ if (col > 60) {
+ out1fmt("\n");
+ col = 0;
+ }
+ }
+ }
+#endif
+ out1fmt("\n\n");
+ return EXIT_SUCCESS;
}
+#endif /* BB_FEATURE_SH_EXTRA_QUIET */
/*
* Called to exit the shell.
*/
-static void
-exitshell(int status)
+void
+exitshell(void)
{
- struct jmploc loc1, loc2;
+ struct jmploc loc;
char *p;
+ int status;
- TRACE(("exitshell(%d) pid=%d\n", status, getpid()));
- if (setjmp(loc1.loc)) {
- goto l1;
- }
- if (setjmp(loc2.loc)) {
- goto l2;
+ status = exitstatus;
+ TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
+ if (setjmp(loc.loc)) {
+ goto out;
}
- handler = &loc1;
+ handler = &loc;
if ((p = trap[0]) != NULL && *p != '\0') {
trap[0] = NULL;
evalstring(p, 0);
}
-l1: handler = &loc2; /* probably unnecessary */
flushall();
-#ifdef JOBS
- setjobctl(0);
+#ifdef BB_FEATURE_COMMAND_SAVEHISTORY
+ if (iflag && rootshell) {
+ const char *hp = lookupvar("HISTFILE");
+
+ if(hp != NULL )
+ save_history ( hp );
+ }
#endif
-l2: _exit(status);
+out:
+ _exit(status);
/* NOTREACHED */
}
@@ -12215,46 +11926,44 @@ static int decode_signal(const char *string, int minsig)
return name ? signo : -1;
}
-static struct var **hashvar (const char *);
-static void showvars (const char *, int, int);
-static struct var **findvar (struct var **, const char *);
+/* $NetBSD: var.c,v 1.32 2003/01/22 20:36:04 dsl Exp $ */
+
+static struct var *vartab[VTABSIZE];
+
+static int vpcmp(const void *, const void *);
+static struct var **findvar(struct var **, const char *);
/*
* Initialize the varable symbol tables and import the environment
*/
+
+#ifdef BB_ASH_GETOPTS
/*
- * This routine initializes the builtin variables. It is called when the
- * shell is initialized and again when a shell procedure is spawned.
+ * Safe version of setvar, returns 1 on success 0 on failure.
*/
-static void
-initvar() {
- const struct varinit *ip;
- struct var *vp;
- struct var **vpp;
+int
+setvarsafe(const char *name, const char *val, int flags)
+{
+ int err;
+ volatile int saveint;
+ struct jmploc *volatile savehandler = handler;
+ struct jmploc jmploc;
- for (ip = varinit ; (vp = ip->var) != NULL ; ip++) {
- if ((vp->flags & VEXPORT) == 0) {
- vpp = hashvar(ip->text);
- vp->next = *vpp;
- *vpp = vp;
- vp->text = strdup(ip->text);
- vp->flags = ip->flags;
- vp->func = ip->func;
- }
- }
- /*
- * PS1 depends on uid
- */
- if ((vps1.flags & VEXPORT) == 0) {
- vpp = hashvar("PS1=");
- vps1.next = *vpp;
- *vpp = &vps1;
- vps1.text = strdup(geteuid() ? "PS1=$ " : "PS1=# ");
- vps1.flags = VSTRFIXED|VTEXTFIXED;
+ SAVEINT(saveint);
+ if (setjmp(jmploc.loc))
+ err = 1;
+ else {
+ handler = &jmploc;
+ setvar(name, val, flags);
+ err = 0;
}
+ handler = savehandler;
+ RESTOREINT(saveint);
+ return err;
}
+#endif
/*
* Set the value of a variable. The flags argument is ored with the
@@ -12262,237 +11971,201 @@ initvar() {
*/
static void
-setvar(name, val, flags)
- const char *name, *val;
- int flags;
+setvar(const char *name, const char *val, int flags)
{
- const char *p;
- int len;
- int namelen;
+ char *p, *q;
+ size_t namelen;
char *nameeq;
- int isbad;
- int vallen = 0;
+ size_t vallen;
- isbad = 0;
- p = name;
- if (! is_name(*p))
- isbad = 1;
- p++;
- for (;;) {
- if (! is_in_name(*p)) {
- if (*p == '\0' || *p == '=')
- break;
- isbad = 1;
- }
- p++;
- }
+ q = endofname(name);
+ p = strchrnul(q, '=');
namelen = p - name;
- if (isbad)
+ if (!namelen || p != q)
error("%.*s: bad variable name", namelen, name);
- len = namelen + 2; /* 2 is space for '=' and '\0' */
+ vallen = 0;
if (val == NULL) {
flags |= VUNSET;
} else {
- len += vallen = strlen(val);
+ vallen = strlen(val);
}
INTOFF;
- nameeq = ckmalloc(len);
- memcpy(nameeq, name, namelen);
- nameeq[namelen] = '=';
- if (val) {
- memcpy(nameeq + namelen + 1, val, vallen + 1);
- } else {
- nameeq[namelen + 1] = '\0';
+ p = mempcpy(nameeq = ckmalloc(namelen + vallen + 2), name, namelen);
+ *p++ = '\0';
+ if (vallen) {
+ p[-1] = '=';
+ p = mempcpy(p, val, vallen);
}
- setvareq(nameeq, flags);
+ *p = '\0';
+ setvareq(nameeq, flags | VNOSAVE);
INTON;
}
-
/*
* Same as setvar except that the variable and value are passed in
* the first argument as name=value. Since the first argument will
* be actually stored in the table, it should not be a string that
* will go away.
+ * Called with interrupts off.
*/
-static void
-setvareq(s, flags)
- char *s;
- int flags;
+void
+setvareq(char *s, int flags)
{
struct var *vp, **vpp;
vpp = hashvar(s);
flags |= (VEXPORT & (((unsigned) (1 - aflag)) - 1));
- if ((vp = *findvar(vpp, s))) {
+ vp = *findvar(vpp, s);
+ if (vp) {
if (vp->flags & VREADONLY) {
- size_t len = strchr(s, '=') - s;
- error("%.*s: is read only", len, s);
+ if (flags & VNOSAVE)
+ free(s);
+ error("%.*s: is read only", strchrnul(s, '=') - s, s);
}
- INTOFF;
+
+ if (flags & VNOSET)
+ return;
if (vp->func && (flags & VNOFUNC) == 0)
- (*vp->func)(strchr(s, '=') + 1);
+ (*vp->func)(strchrnul(s, '=') + 1);
if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
ckfree(vp->text);
- vp->flags &= ~(VTEXTFIXED|VSTACK|VUNSET);
- vp->flags |= flags;
- vp->text = s;
-
- /*
- * We could roll this to a function, to handle it as
- * a regular variable function callback, but why bother?
- */
- if (iflag && (vp == &vmpath || (vp == &vmail && !mpathset())))
- chkmail(1);
- INTON;
- return;
+ flags |= vp->flags & ~(VTEXTFIXED|VSTACK|VNOSAVE|VUNSET);
+ } else {
+ if (flags & VNOSET)
+ return;
+ /* not found */
+ vp = ckmalloc(sizeof (*vp));
+ vp->next = *vpp;
+ vp->func = NULL;
+ *vpp = vp;
}
- /* not found */
- vp = ckmalloc(sizeof (*vp));
- vp->flags = flags;
+ if (!(flags & (VTEXTFIXED|VSTACK|VNOSAVE)))
+ s = savestr(s);
vp->text = s;
- vp->next = *vpp;
- vp->func = NULL;
- *vpp = vp;
+ vp->flags = flags;
}
-
/*
* Process a linked list of variable assignments.
*/
static void
-listsetvar(mylist)
- struct strlist *mylist;
- {
- struct strlist *lp;
+listsetvar(struct strlist *list_set_var, int flags)
+{
+ struct strlist *lp = list_set_var;
+ if (!lp)
+ return;
INTOFF;
- for (lp = mylist ; lp ; lp = lp->next) {
- setvareq(savestr(lp->text), 0);
- }
+ do {
+ setvareq(lp->text, flags);
+ } while ((lp = lp->next));
INTON;
}
-
/*
* Find the value of a variable. Returns NULL if not set.
*/
-static const char *
-lookupvar(name)
- const char *name;
- {
+static char *
+lookupvar(const char *name)
+{
struct var *v;
if ((v = *findvar(hashvar(name), name)) && !(v->flags & VUNSET)) {
- return strchr(v->text, '=') + 1;
+ return strchrnul(v->text, '=') + 1;
}
return NULL;
}
-
/*
* Search the environment of a builtin command.
*/
-static const char *
+static char *
bltinlookup(const char *name)
{
- const struct strlist *sp;
+ struct strlist *sp;
for (sp = cmdenviron ; sp ; sp = sp->next) {
if (varequal(sp->text, name))
- return strchr(sp->text, '=') + 1;
+ return strchrnul(sp->text, '=') + 1;
}
return lookupvar(name);
}
-
/*
- * Generate a list of exported variables. This routine is used to construct
- * the third argument to execve when executing a program.
+ * Generate a list of variables satisfying the given conditions.
*/
static char **
-environment() {
- int nenv;
+listvars(int on, int off, char ***end)
+{
struct var **vpp;
struct var *vp;
- char **env;
char **ep;
+ int mask;
- nenv = 0;
- for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
- for (vp = *vpp ; vp ; vp = vp->next)
- if (vp->flags & VEXPORT)
- nenv++;
- }
- ep = env = stalloc((nenv + 1) * sizeof *env);
- for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
+ STARTSTACKSTR(ep);
+ vpp = vartab;
+ mask = on | off;
+ do {
for (vp = *vpp ; vp ; vp = vp->next)
- if (vp->flags & VEXPORT)
- *ep++ = vp->text;
- }
- *ep = NULL;
- return env;
+ if ((vp->flags & mask) == on) {
+ if (ep == stackstrend())
+ ep = growstackstr();
+ *ep++ = (char *) vp->text;
+ }
+ } while (++vpp < vartab + VTABSIZE);
+ if (ep == stackstrend())
+ ep = growstackstr();
+ if (end)
+ *end = ep;
+ *ep++ = NULL;
+ return grabstackstr(ep);
}
/*
- * Called when a shell procedure is invoked to clear out nonexported
- * variables. It is also necessary to reallocate variables of with
- * VSTACK set since these are currently allocated on the stack.
+ * POSIX requires that 'set' (but not export or readonly) output the
+ * variables in lexicographic order - by the locale's collating order (sigh).
+ * Maybe we could keep them in an ordered balanced binary tree
+ * instead of hashed lists.
+ * For now just roll 'em through qsort for printing...
*/
-static void
-shprocvar(void) {
- struct var **vpp;
- struct var *vp, **prev;
-
- for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
- for (prev = vpp ; (vp = *prev) != NULL ; ) {
- if ((vp->flags & VEXPORT) == 0) {
- *prev = vp->next;
- if ((vp->flags & VTEXTFIXED) == 0)
- ckfree(vp->text);
- if ((vp->flags & VSTRFIXED) == 0)
- ckfree(vp);
- } else {
- if (vp->flags & VSTACK) {
- vp->text = savestr(vp->text);
- vp->flags &=~ VSTACK;
- }
- prev = &vp->next;
- }
- }
- }
- initvar();
-}
+static int
+showvars(const char *sep_prefix, int on, int off)
+{
+ const char *sep;
+ char **ep, **epend;
+ ep = listvars(on, off, &epend);
+ qsort(ep, epend - ep, sizeof(char *), vpcmp);
+ sep = *sep_prefix ? spcstr : sep_prefix;
-/*
- * Command to list all variables which are set. Currently this command
- * is invoked from the set command when the set command is called without
- * any variables.
- */
+ for (; ep < epend; ep++) {
+ const char *p;
+ const char *q;
+
+ p = strchrnul(*ep, '=');
+ q = nullstr;
+ if (*p)
+ q = single_quote(++p);
+
+ out1fmt("%s%s%.*s%s\n", sep_prefix, sep, (int)(p - *ep), *ep, q);
+ }
-static int
-showvarscmd(argc, argv)
- int argc;
- char **argv;
-{
- showvars(nullstr, VUNSET, VUNSET);
return 0;
}
@@ -12503,31 +12176,28 @@ showvarscmd(argc, argv)
*/
static int
-exportcmd(argc, argv)
- int argc;
- char **argv;
+exportcmd(int argc, char **argv)
{
struct var *vp;
char *name;
const char *p;
+ char **aptr;
int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
- int pflag;
+ int notp;
- listsetvar(cmdenviron);
- pflag = (nextopt("p") == 'p');
- if (argc > 1 && !pflag) {
- while ((name = *argptr++) != NULL) {
+ notp = nextopt("p") - 'p';
+ if (notp && ((name = *(aptr = argptr)))) {
+ do {
if ((p = strchr(name, '=')) != NULL) {
p++;
} else {
if ((vp = *findvar(hashvar(name), name))) {
vp->flags |= flag;
- goto found;
+ continue;
}
}
setvar(name, p, flag);
-found:;
- }
+ } while ((name = *++aptr) != NULL);
} else {
showvars(argv[0], flag, 0);
}
@@ -12536,38 +12206,15 @@ found:;
/*
- * The "local" command.
- */
-
-/* funcnest nonzero if we are currently evaluating a function */
-
-static int
-localcmd(argc, argv)
- int argc;
- char **argv;
-{
- char *name;
-
- if (! funcnest)
- error("Not in a function");
- while ((name = *argptr++) != NULL) {
- mklocal(name);
- }
- return 0;
-}
-
-
-/*
* Make a variable a local variable. When a variable is made local, it's
* value and flags are saved in a localvar structure. The saved values
* will be restored when the shell function returns. We handle the name
* "-" as a special case.
*/
-static void
-mklocal(name)
- char *name;
- {
+static inline void
+mklocal(char *name)
+{
struct localvar *lvp;
struct var **vpp;
struct var *vp;
@@ -12576,26 +12223,28 @@ mklocal(name)
lvp = ckmalloc(sizeof (struct localvar));
if (name[0] == '-' && name[1] == '\0') {
char *p;
- p = ckmalloc(sizeof optet_vals);
- lvp->text = memcpy(p, optet_vals, sizeof optet_vals);
+ p = ckmalloc(sizeof(optlist));
+ lvp->text = memcpy(p, optlist, sizeof(optlist));
vp = NULL;
} else {
+ char *eq;
+
vpp = hashvar(name);
vp = *findvar(vpp, name);
+ eq = strchr(name, '=');
if (vp == NULL) {
- if (strchr(name, '='))
- setvareq(savestr(name), VSTRFIXED);
+ if (eq)
+ setvareq(name, VSTRFIXED);
else
setvar(name, NULL, VSTRFIXED);
vp = *vpp; /* the new variable */
- lvp->text = NULL;
lvp->flags = VUNSET;
} else {
lvp->text = vp->text;
lvp->flags = vp->flags;
vp->flags |= VSTRFIXED|VTEXTFIXED;
- if (strchr(name, '='))
- setvareq(savestr(name), 0);
+ if (eq)
+ setvareq(name, 0);
}
}
lvp->vp = vp;
@@ -12604,26 +12253,48 @@ mklocal(name)
INTON;
}
+/*
+ * The "local" command.
+ */
+
+static int
+localcmd(int argc, char **argv)
+{
+ char *name;
+
+ argv = argptr;
+ while ((name = *argv++) != NULL) {
+ mklocal(name);
+ }
+ return 0;
+}
+
/*
* Called after a function returns.
+ * Interrupts must be off.
*/
static void
-poplocalvars() {
+poplocalvars(void)
+{
struct localvar *lvp;
struct var *vp;
while ((lvp = localvars) != NULL) {
localvars = lvp->next;
vp = lvp->vp;
+ TRACE(("poplocalvar %s", vp ? vp->text : "-"));
if (vp == NULL) { /* $- saved */
- memcpy(optet_vals, lvp->text, sizeof optet_vals);
+ memcpy(optlist, lvp->text, sizeof(optlist));
ckfree(lvp->text);
+ optschanged();
} else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
- (void)unsetvar(vp->text);
+ unsetvar(vp->text);
} else {
- if ((vp->flags & VTEXTFIXED) == 0)
+ if (vp->func)
+ (*vp->func)(strchrnul(lvp->text, '=') + 1);
+ if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
ckfree(vp->text);
vp->flags = lvp->flags;
vp->text = lvp->text;
@@ -12633,54 +12304,35 @@ poplocalvars() {
}
-static int
-setvarcmd(argc, argv)
- int argc;
- char **argv;
-{
- if (argc <= 2)
- return unsetcmd(argc, argv);
- else if (argc == 3)
- setvar(argv[1], argv[2], 0);
- else
- error("List assignment not implemented");
- return 0;
-}
-
-
/*
* The unset builtin command. We unset the function before we unset the
* variable to allow a function to be unset when there is a readonly variable
* with the same name.
*/
-static int
-unsetcmd(argc, argv)
- int argc;
- char **argv;
+int
+unsetcmd(int argc, char **argv)
{
char **ap;
int i;
- int flg_func = 0;
- int flg_var = 0;
+ int flag = 0;
int ret = 0;
while ((i = nextopt("vf")) != '\0') {
- if (i == 'f')
- flg_func = 1;
- else
- flg_var = 1;
+ flag = i;
}
- if (flg_func == 0 && flg_var == 0)
- flg_var = 1;
for (ap = argptr; *ap ; ap++) {
- if (flg_func)
+ if (flag != 'f') {
+ i = unsetvar(*ap);
+ ret |= i;
+ if (!(i & 2))
+ continue;
+ }
+ if (flag != 'v')
unsetfunc(*ap);
- if (flg_var)
- ret |= unsetvar(*ap);
}
- return ret;
+ return ret & 1;
}
@@ -12688,33 +12340,41 @@ unsetcmd(argc, argv)
* Unset the specified variable.
*/
-static int
+int
unsetvar(const char *s)
{
struct var **vpp;
struct var *vp;
+ int retval;
vpp = findvar(hashvar(s), s);
vp = *vpp;
+ retval = 2;
if (vp) {
- if (vp->flags & VREADONLY)
- return (1);
- INTOFF;
- if (*(strchr(vp->text, '=') + 1) != '\0')
- setvar(s, nullstr, 0);
- vp->flags &= ~VEXPORT;
- vp->flags |= VUNSET;
- if ((vp->flags & VSTRFIXED) == 0) {
- if ((vp->flags & VTEXTFIXED) == 0)
+ int flags = vp->flags;
+
+ retval = 1;
+ if (flags & VREADONLY)
+ goto out;
+ if (flags & VUNSET)
+ goto ok;
+ if ((flags & VSTRFIXED) == 0) {
+ INTOFF;
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
ckfree(vp->text);
*vpp = vp->next;
ckfree(vp);
+ INTON;
+ } else {
+ setvar(s, 0, 0);
+ vp->flags &= ~VEXPORT;
}
- INTON;
- return (0);
+ok:
+ retval = 0;
}
- return (0);
+out:
+ return retval;
}
@@ -12737,119 +12397,1099 @@ hashvar(const char *p)
/*
- * Returns true if the two strings specify the same varable. The first
- * variable name is terminated by '='; the second may be terminated by
+ * Compares two strings up to the first = or '\0'. The first
+ * string must be terminated by '='; the second may be terminated by
* either '=' or '\0'.
*/
+int
+varcmp(const char *p, const char *q)
+{
+ int c, d;
+
+ while ((c = *p) == (d = *q)) {
+ if (!c || c == '=')
+ goto out;
+ p++;
+ q++;
+ }
+ if (c == '=')
+ c = 0;
+ if (d == '=')
+ d = 0;
+out:
+ return c - d;
+}
+
static int
-varequal(const char *p, const char *q)
+vpcmp(const void *a, const void *b)
+{
+ return varcmp(*(const char **)a, *(const char **)b);
+}
+
+static struct var **
+findvar(struct var **vpp, const char *name)
{
- while (*p == *q++) {
- if (*p++ == '=')
- return 1;
+ for (; *vpp; vpp = &(*vpp)->next) {
+ if (varequal((*vpp)->text, name)) {
+ break;
+ }
}
- if (*p == '=' && *(q - 1) == '\0')
- return 1;
+ return vpp;
+}
+/* $NetBSD: setmode.c,v 1.29 2003/01/15 23:58:03 kleink Exp $ */
+
+#include <sys/times.h>
+
+static const unsigned char timescmd_str[] = {
+ ' ', offsetof(struct tms, tms_utime),
+ '\n', offsetof(struct tms, tms_stime),
+ ' ', offsetof(struct tms, tms_cutime),
+ '\n', offsetof(struct tms, tms_cstime),
+ 0
+};
+
+static int timescmd(int ac, char **av)
+{
+ long int clk_tck, s, t;
+ const unsigned char *p;
+ struct tms buf;
+
+ clk_tck = sysconf(_SC_CLK_TCK);
+ times(&buf);
+
+ p = timescmd_str;
+ do {
+ t = *(clock_t *)(((char *) &buf) + p[1]);
+ s = t / clk_tck;
+ out1fmt("%ldm%ld.%.3lds%c",
+ s/60, s%60,
+ ((t - s * clk_tck) * 1000) / clk_tck,
+ p[0]);
+ } while (*(p += 2));
+
return 0;
}
-static void
-showvars(const char *myprefix, int mask, int xor)
+#ifdef BB_ASH_MATH_SUPPORT
+static int
+dash_arith(const char *s)
{
- struct var **vpp;
- struct var *vp;
- const char *sep = myprefix == nullstr ? myprefix : spcstr;
+ long result;
+ int errcode = 0;
- for (vpp = vartab ; vpp < vartab + VTABSIZE ; vpp++) {
- for (vp = *vpp ; vp ; vp = vp->next) {
- if ((vp->flags & mask) ^ xor) {
- char *p;
- int len;
+ INTOFF;
+ result = arith(s, &errcode);
+ if (errcode < 0) {
+ if (errcode == -3)
+ error("exponent less than 0");
+ else if (errcode == -2)
+ error("divide by zero");
+ else if (errcode == -5)
+ error("expression recursion loop detected");
+ else
+ synerror(s);
+ }
+ INTON;
- p = strchr(vp->text, '=') + 1;
- len = p - vp->text;
- p = single_quote(p);
+ return (result);
+}
- printf("%s%s%.*s%s\n", myprefix, sep, len,
- vp->text, p);
- stunalloc(p);
+
+/*
+ * The let builtin. partial stolen from GNU Bash, the Bourne Again SHell.
+ * Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 2003 Vladimir Oleynik <dzo@simtreas.ru>
+ */
+
+static int
+letcmd(int argc, char **argv)
+{
+ char **ap;
+ long i;
+
+ ap = argv + 1;
+ if(!*ap)
+ error("expression expected");
+ for (ap = argv + 1; *ap; ap++) {
+ i = dash_arith(*ap);
+ }
+
+ return (!i);
+}
+#endif /* BB_ASH_MATH_SUPPORT */
+
+/* $NetBSD: miscbltin.c,v 1.31 2002/11/24 22:35:41 christos Exp $ */
+
+/*
+ * Miscelaneous builtins.
+ */
+
+#undef rflag
+
+#ifdef __GLIBC__
+#if !defined(__GLIBC__) || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
+typedef enum __rlimit_resource rlim_t;
+#endif
+#endif
+
+
+/*
+ * The read builtin. The -e option causes backslashes to escape the
+ * following character.
+ *
+ * This uses unbuffered input, which may be avoidable in some cases.
+ */
+
+static int
+readcmd(int argc, char **argv)
+{
+ char **ap;
+ int backslash;
+ char c;
+ int rflag;
+ char *prompt;
+ const char *ifs;
+ char *p;
+ int startword;
+ int status;
+ int i;
+
+ rflag = 0;
+ prompt = NULL;
+ while ((i = nextopt("p:r")) != '\0') {
+ if (i == 'p')
+ prompt = optionarg;
+ else
+ rflag = 1;
+ }
+ if (prompt && isatty(0)) {
+ out2str(prompt);
+ }
+ if (*(ap = argptr) == NULL)
+ error("arg count");
+ if ((ifs = bltinlookup("IFS")) == NULL)
+ ifs = defifs;
+ status = 0;
+ startword = 1;
+ backslash = 0;
+ STARTSTACKSTR(p);
+ for (;;) {
+ if (read(0, &c, 1) != 1) {
+ status = 1;
+ break;
+ }
+ if (c == '\0')
+ continue;
+ if (backslash) {
+ backslash = 0;
+ if (c != '\n')
+ goto put;
+ continue;
+ }
+ if (!rflag && c == '\\') {
+ backslash++;
+ continue;
+ }
+ if (c == '\n')
+ break;
+ if (startword && *ifs == ' ' && strchr(ifs, c)) {
+ continue;
+ }
+ startword = 0;
+ if (ap[1] != NULL && strchr(ifs, c) != NULL) {
+ STACKSTRNUL(p);
+ setvar(*ap, stackblock(), 0);
+ ap++;
+ startword = 1;
+ STARTSTACKSTR(p);
+ } else {
+put:
+ STPUTC(c, p);
+ }
+ }
+ STACKSTRNUL(p);
+ /* Remove trailing blanks */
+ while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL)
+ *p = '\0';
+ setvar(*ap, stackblock(), 0);
+ while (*++ap != NULL)
+ setvar(*ap, nullstr, 0);
+ return status;
+}
+
+
+static int umaskcmd(int argc, char **argv)
+{
+ static const char permuser[3] = "ugo";
+ static const char permmode[3] = "rwx";
+ static const short int permmask[] = {
+ S_IRUSR, S_IWUSR, S_IXUSR,
+ S_IRGRP, S_IWGRP, S_IXGRP,
+ S_IROTH, S_IWOTH, S_IXOTH
+ };
+
+ char *ap;
+ mode_t mask;
+ int i;
+ int symbolic_mode = 0;
+
+ while (nextopt("S") != '\0') {
+ symbolic_mode = 1;
+ }
+
+ INTOFF;
+ mask = umask(0);
+ umask(mask);
+ INTON;
+
+ if ((ap = *argptr) == NULL) {
+ if (symbolic_mode) {
+ char buf[18];
+ char *p = buf;
+
+ for (i = 0; i < 3; i++) {
+ int j;
+
+ *p++ = permuser[i];
+ *p++ = '=';
+ for (j = 0; j < 3; j++) {
+ if ((mask & permmask[3 * i + j]) == 0) {
+ *p++ = permmode[j];
+ }
+ }
+ *p++ = ',';
+ }
+ *--p = 0;
+ puts(buf);
+ } else {
+ out1fmt("%.4o\n", mask);
+ }
+ } else {
+ if (is_digit((unsigned char) *ap)) {
+ mask = 0;
+ do {
+ if (*ap >= '8' || *ap < '0')
+ error(illnum, argv[1]);
+ mask = (mask << 3) + (*ap - '0');
+ } while (*++ap != '\0');
+ umask(mask);
+ } else {
+ mask = ~mask & 0777;
+ if (!parse_mode(ap, &mask)) {
+ error("Illegal mode: %s", ap);
}
+ umask(~mask & 0777);
}
}
+ return 0;
}
-static struct var **
-findvar(struct var **vpp, const char *name)
+/*
+ * ulimit builtin
+ *
+ * This code, originally by Doug Gwyn, Doug Kingston, Eric Gisin, and
+ * Michael Rendell was ripped from pdksh 5.0.8 and hacked for use with