Changeset 1770 in MondoRescue for branches/stable/mindi-busybox/coreutils

Timestamp:

Nov 6, 2007, 11:01:53 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Better output for mindi-busybox revision
• Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
• strace useful for debug
• fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
• fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
• fix typo in label-partitions-as-necessary which doesn't seem to work
• Update to busybox 1.7.2
• perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

• next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
• small optimization in mindi on keyboard handling (one single find instead of multiple)
• better interaction for USB device when launching mindi manually
• attempt to automatically guess block disk size for ramdisk
• fix typos in bkphw
• Fix the remaining problem with UUID support for swap partitions
• Updates mondoarchive man page for USB support
• Adds preliminary Hardware support to mindi (Proliant SSSTK)
• Tries to add udev support also for rhel4
• Fix UUID support which was still broken.
• Be conservative in test for the start-nfs script
• Update config file for mindi-busybox for 1.7.2 migration
• Try to run around a busybox bug (1.2.2 pb on inexistant links)
• Add build content for mindi-busybox in pb
• Remove distributions content for mindi-busybox
• Fix a warning on inexistant raidtab
• Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
• Create MONDO_CACHE and use it everywhere + creation at start
• Really never try to eject a USB device
• Fix a issue with &> usage (replaced with 1> and 2>)
• Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
• tty modes correct to avoid sh error messages
• Use ext3 normally and not ext2 instead
• USB device should be corrected after reading (take 1st part)
• Adds a mount_USB_here function derived from mount_CDROM_here
• usb detection place before /dev detection in device name at restore time
• Fix when restoring from USB: media is asked in interactive mode
• Adds USB support for mondorestore
• mount_cdrom => mount_media
• elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
• untar-and-softlink => untar (+ interface change)
• suppress useless softlinks creation/removal in boot process
• avoids udevd messages on groups
• Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
• skip existing big file creation
• seems to work correctly for USB mindi boot
• Adds group and tty link to udev conf
• Always load usb-torage (even 2.6) to initiate USB bus discovery
• Better printing of messages
• Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
• Links were not correctly done as non relative for modules in mindi
• exclusion of modules denied now works
• Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
• Fix bugs for DENY_MODS handling
• Add device /dev/console for udev
• ide-generic should now really be excluded
• Fix a bug in major number for tty
• If udev then adds modprobe/insmod to rootfs
• tty0 is also cretaed with udev
• ide-generic put rather in DENY_MODS
• udevd remove from deplist s handled in mindi directly
• better default for mindi when using --usb
• Handles dynamically linked busybox (in case we want to use it soon ;-)
• Adds fixed devices to create for udev
• ide-generic should not be part of the initrd when using libata v2
• support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
• Improvement in udev support (do not use cl options not available in busybox)
• Udev in mindi
  • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
  • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
  • add support for 64 bits udev
• Try to render MyInsmod silent at boot time
• Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
• We also need vaft format support for USB boot
• Adds libusual support (Ubuntu 7.10 needs it for USB)
• Improve Ubuntu/Debian keyboard detection and support
• pbinit adapted to new pb (0.8.10). Filtering of docs done in it
• Suppress some mondo warnings and errors on USB again
• Tries to fix lack of files in deb mindi package
• Verify should now work for USB devices
• More log/mesages improvement for USB support
• - Supress g_erase_tmpdir_and_scratchdir
• Improve some log messages for USB support
• Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
• Improve mindi-busybox build
• In conformity with pb 0.8.9
• Add support for Ubuntu 7.10 in build process
• Add USB Key button to Menu UI (CD streamer removed)
• Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
• Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
• Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
• Put mondorescue in conformity with new pb filtering rules
• Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
• Unmounting USB device before removal of temporary scratchdir
• Stil refining USB copy back to mondo (one command was not executed)
• No need to have the image subdor in the csratchdir when USB.
• umount the USB partition before attempting to use it
• Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

Location:

branches/stable/mindi-busybox/coreutils

Files:

• Config.in (modified) (74 diffs)
• Kbuild (copied) (copied from branches/2.2.5/mindi-busybox/coreutils/Kbuild )
• Makefile (deleted)
• Makefile.in (deleted)
• basename.c (modified) (3 diffs)
• cal.c (modified) (23 diffs)
• cat.c (modified) (3 diffs)
• catv.c (modified) (2 diffs)
• chgrp.c (modified) (1 diff)
• chmod.c (modified) (2 diffs)
• chown.c (modified) (2 diffs)
• chroot.c (modified) (2 diffs)
• cksum.c (modified) (3 diffs)
• cmp.c (deleted)
• comm.c (modified) (6 diffs)
• cp.c (modified) (5 diffs)
• cut.c (modified) (3 diffs)
• date.c (modified) (8 diffs)
• dd.c (modified) (6 diffs)
• df.c (modified) (4 diffs)
• diff.c (deleted)
• dirname.c (modified) (3 diffs)
• dos2unix.c (modified) (6 diffs)
• du.c (modified) (14 diffs)
• echo.c (modified) (2 diffs)
• env.c (modified) (5 diffs)
• expand.c (copied) (copied from branches/2.2.5/mindi-busybox/coreutils/expand.c )
• expr.c (modified) (23 diffs)
• false.c (modified) (1 diff)
• fold.c (modified) (9 diffs)
• head.c (modified) (7 diffs)
• hostid.c (modified) (2 diffs)
• id.c (modified) (4 diffs)
• install.c (modified) (2 diffs)
• length.c (modified) (1 diff)
• libcoreutils/Kbuild (copied) (copied from branches/2.2.5/mindi-busybox/coreutils/libcoreutils/Kbuild )
• libcoreutils/Makefile (deleted)
• libcoreutils/Makefile.in (deleted)
• libcoreutils/coreutils.h (modified) (2 diffs)
• libcoreutils/cp_mv_stat.c (modified) (2 diffs)
• libcoreutils/getopt_mk_fifo_nod.c (modified) (2 diffs)
• ln.c (modified) (7 diffs)
• logname.c (modified) (2 diffs)
• ls.c (modified) (50 diffs)
• md5_sha1_sum.c (modified) (9 diffs)
• mkdir.c (modified) (2 diffs)
• mkfifo.c (modified) (3 diffs)
• mknod.c (modified) (2 diffs)
• mv.c (modified) (10 diffs)
• nice.c (modified) (1 diff)
• nohup.c (modified) (1 diff)
• od.c (modified) (7 diffs)
• od_bloaty.c (copied) (copied from branches/2.2.5/mindi-busybox/coreutils/od_bloaty.c )
• printenv.c (modified) (2 diffs)
• printf.c (modified) (9 diffs)
• pwd.c (modified) (1 diff)
• readlink.c (copied) (copied from branches/2.2.5/mindi-busybox/coreutils/readlink.c )
• realpath.c (modified) (2 diffs)
• rm.c (modified) (2 diffs)
• rmdir.c (modified) (6 diffs)
• seq.c (modified) (2 diffs)
• sleep.c (modified) (4 diffs)
• sort.c (modified) (6 diffs)
• split.c (copied) (copied from branches/2.2.5/mindi-busybox/coreutils/split.c )
• stat.c (modified) (19 diffs)
• stty.c (modified) (17 diffs)
• sum.c (modified) (1 diff)
• sync.c (modified) (2 diffs)
• tail.c (modified) (14 diffs)
• tee.c (modified) (4 diffs)
• test.c (modified) (23 diffs)
• touch.c (modified) (3 diffs)
• tr.c (modified) (10 diffs)
• true.c (modified) (2 diffs)
• tty.c (modified) (4 diffs)
• uname.c (modified) (7 diffs)
• uniq.c (modified) (6 diffs)
• usleep.c (modified) (2 diffs)
• uudecode.c (modified) (8 diffs)
• uuencode.c (modified) (1 diff)
• watch.c (deleted)
• wc.c (modified) (10 diffs)
• who.c (modified) (2 diffs)
• whoami.c (modified) (2 diffs)
• yes.c (modified) (3 diffs)

branches/stable/mindi-busybox/coreutils/Config.in

@@ -6 +6 @@
 menu "Coreutils"
 
-config CONFIG_BASENAME
+config BASENAME
     bool "basename"
     default n
@@ -14 +14 @@
       to enable the 'basename' utility.
 
-config CONFIG_CAL
+config CAL
     bool "cal"
     default n
@@ -20 +20 @@
       cal is used to display a monthly calender.
 
-config CONFIG_CAT
+config CAT
     bool "cat"
     default n
@@ -27 +27 @@
       output.  Enable this option if you wish to enable the 'cat' utility.
 
-config CONFIG_CATV
+config CATV
     bool "catv"
     default n
@@ -34 +34 @@
       implementations' cat -v option).
 
-config CONFIG_CHGRP
+config CHGRP
     bool "chgrp"
     default n
@@ -40 +40 @@
       chgrp is used to change the group ownership of files.
 
-config CONFIG_CHMOD
+config CHMOD
     bool "chmod"
     default n
@@ -46 +46 @@
       chmod is used to change the access permission of files.
 
-config CONFIG_CHOWN
+config CHOWN
     bool "chown"
     default n
@@ -53 +53 @@
       of files.
 
-config CONFIG_CHROOT
+config CHROOT
     bool "chroot"
     default n
@@ -60 +60 @@
       The default command is `/bin/sh'.
 
-config CONFIG_CKSUM
+config CKSUM
     bool "cksum"
     default n
@@ -66 +66 @@
       cksum is used to calculate the CRC32 checksum of a file.
 
-config CONFIG_CMP
-    bool "cmp"
-    default n
-    help
-      cmp is used to compare two files and returns the result
-      to standard output.
-
-config CONFIG_COMM
+config COMM
     bool "comm"
     default n
@@ -80 +73 @@
       a three-column output.
 
-config CONFIG_CP
+config CP
     bool "cp"
     default n
@@ -86 +79 @@
       cp is used to copy files and directories.
 
-config CONFIG_CUT
+config CUT
     bool "cut"
     default n
@@ -93 +86 @@
       each file to stdout.
 
-config CONFIG_DATE
+config DATE
     bool "date"
     default n
@@ -100 +93 @@
       current time in the given format.
 
-config CONFIG_FEATURE_DATE_ISOFMT
+config FEATURE_DATE_ISOFMT
     bool "Enable ISO date format output (-I)"
     default y
-    depends on CONFIG_DATE
+    depends on DATE
     help
       Enable option (-I) to output an ISO-8601 compliant
       date/time string.
 
-config CONFIG_DD
+config DD
     bool "dd"
     default n
@@ -116 +109 @@
       while optionally performing conversions on it.
 
-config CONFIG_FEATURE_DD_SIGNAL_HANDLING
+config FEATURE_DD_SIGNAL_HANDLING
     bool "Enable DD signal handling for status reporting"
     default y
-    depends on CONFIG_DD
-    help
-      sending a SIGUSR1 signal to a running `dd' process makes it 
-      print to standard error the number of records read and written 
+    depends on DD
+    help
+      sending a SIGUSR1 signal to a running `dd' process makes it
+      print to standard error the number of records read and written
       so far, then to resume copying.
 
-      $ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid 
+      $ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid
       10899206+0 records in 10899206+0 records out
 
-config CONFIG_FEATURE_DD_IBS_OBS
+config FEATURE_DD_IBS_OBS
     bool "Enable ibs, obs and conv options"
     default n
-    depends on CONFIG_DD
+    depends on DD
     help
       Enables support for writing a certain number of bytes in and out,
       at a time, and performing conversions on the data stream.
 
-config CONFIG_DF
+config DF
     bool "df"
     default n
@@ -143 +136 @@
       on filesystems.
 
-config CONFIG_DIFF
-    bool "diff"
-    default n
-    help
-      diff compares two files or directories and outputs the
-      differences between them in a form that can be given to
-      the patch command.
-
-config CONFIG_FEATURE_DIFF_BINARY
-    bool "Enable checks for binary files"
-    default y
-    depends on CONFIG_DIFF
-    help
-      This option enables support for checking for binary files
-      before a comparison is carried out.
-
-config CONFIG_FEATURE_DIFF_DIR
-    bool "Enable directory support"
-    default y
-    depends on CONFIG_DIFF
-    help
-      This option enables support for directory and subdirectory
-      comparison.
-
-config CONFIG_FEATURE_DIFF_MINIMAL
-    bool "Enable -d option to find smaller sets of changes"
-    default n
-    depends on CONFIG_DIFF
-    help
-      Enabling this option allows the use of -d to make diff
-      try hard to find the smallest possible set of changes.
-
-config CONFIG_DIRNAME
+config DIRNAME
     bool "dirname"
     default n
@@ -182 +143 @@
       a file name.
 
-config CONFIG_DOS2UNIX
+config DOS2UNIX
     bool "dos2unix/unix2dos"
     default n
@@ -189 +150 @@
       UNIX format, and vice versa.
 
-config CONFIG_UNIX2DOS
+config UNIX2DOS
     bool
     default y
-    depends on CONFIG_DOS2UNIX
+    depends on DOS2UNIX
     help
       unix2dos is used to convert a text file from UNIX format to
       DOS format, and vice versa.
 
-config CONFIG_DU
+config DU
     bool "du (default blocksize of 512 bytes)"
     default n
@@ -204 +165 @@
       for specified files.
 
-config CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+config FEATURE_DU_DEFAULT_BLOCKSIZE_1K
     bool "Use a default blocksize of 1024 bytes (1K)"
     default y
-    depends on CONFIG_DU
+    depends on DU
     help
       Use a blocksize of (1K) instead of the default 512b.
 
-config CONFIG_ECHO
+config ECHO
     bool "echo (basic SuSv3 version taking no options)"
     default n
@@ -218 +179 @@
 
 # this entry also appears in shell/Config.in, next to the echo builtin
-config CONFIG_FEATURE_FANCY_ECHO
+config FEATURE_FANCY_ECHO
     bool "Enable echo options (-n and -e)"
     default y
-    depends on CONFIG_ECHO
+    depends on ECHO
     help
       This adds options (-n and -e) to echo.
 
-config CONFIG_ENV
+config ENV
     bool "env"
     default n
@@ -233 +194 @@
       environment.
 
-config CONFIG_FEATURE_ENV_LONG_OPTIONS
+config FEATURE_ENV_LONG_OPTIONS
     bool "Enable long options"
     default n
-    depends on CONFIG_ENV && CONFIG_GETOPT_LONG
+    depends on ENV && GETOPT_LONG
     help
       Support long options for the env applet.
 
-config CONFIG_EXPR
+config EXPAND
+    bool "expand"
+    default n
+    help
+      By default, convert all tabs to spaces.
+
+config FEATURE_EXPAND_LONG_OPTIONS
+    bool "Enable long options"
+    default n
+    depends on EXPAND && GETOPT_LONG
+    help
+      Support long options for the expand applet.
+
+config EXPR
     bool "expr"
     default n
@@ -247 +221 @@
       to standard output.
 
-config CONFIG_EXPR_MATH_SUPPORT_64
+config EXPR_MATH_SUPPORT_64
     bool "Extend Posix numbers support to 64 bit"
     default n
-    depends on CONFIG_EXPR
+    depends on EXPR
     help
       Enable 64-bit math support in the expr applet.  This will make
@@ -256 +230 @@
       large numbers.
 
-config CONFIG_FALSE
+config FALSE
     bool "false"
     default n
@@ -262 +236 @@
       false returns an exit code of FALSE (1).
 
-config CONFIG_FOLD
+config FOLD
     bool "fold"
     default n
@@ -268 +242 @@
       Wrap text to fit a specific width.
 
-config CONFIG_HEAD
+config HEAD
     bool "head"
     default n
@@ -275 +249 @@
       from files.
 
-config CONFIG_FEATURE_FANCY_HEAD
+config FEATURE_FANCY_HEAD
     bool "Enable head options (-c, -q, and -v)"
     default n
-    depends on CONFIG_HEAD
+    depends on HEAD
     help
       This enables the head options (-c, -q, and -v).
 
-config CONFIG_HOSTID
+config HOSTID
     bool "hostid"
     default n
@@ -289 +263 @@
       the current host.
 
-config CONFIG_ID
+config ID
     bool "id"
     default n
@@ -295 +269 @@
       id displays the current user and group ID names.
 
-config CONFIG_INSTALL
+config INSTALL
     bool "install"
     default n
@@ -301 +275 @@
       Copy files and set attributes.
 
-config CONFIG_FEATURE_INSTALL_LONG_OPTIONS
+config FEATURE_INSTALL_LONG_OPTIONS
     bool "Enable long options"
     default n
-    depends on CONFIG_INSTALL && CONFIG_GETOPT_LONG
+    depends on INSTALL && GETOPT_LONG
     help
       Support long options for the install applet.
 
-config CONFIG_LENGTH
+config LENGTH
     bool "length"
     default n
@@ -314 +288 @@
       length is used to print out the length of a specified string.
 
-config CONFIG_LN
+config LN
     bool "ln"
     default n
@@ -320 +294 @@
       ln is used to create hard or soft links between files.
 
-config CONFIG_LOGNAME
+config LOGNAME
     bool "logname"
     default n
@@ -326 +300 @@
       logname is used to print the current user's login name.
 
-config CONFIG_LS
+config LS
     bool "ls"
     default n
@@ -332 +306 @@
       ls is used to list the contents of directories.
 
-config CONFIG_FEATURE_LS_FILETYPES
+config FEATURE_LS_FILETYPES
     bool "Enable filetyping options (-p and -F)"
     default y
-    depends on CONFIG_LS
+    depends on LS
     help
       Enable the ls options (-p and -F).
 
-config CONFIG_FEATURE_LS_FOLLOWLINKS
+config FEATURE_LS_FOLLOWLINKS
     bool "Enable symlinks dereferencing (-L)"
     default y
-    depends on CONFIG_LS
+    depends on LS
     help
       Enable the ls option (-L).
 
-config CONFIG_FEATURE_LS_RECURSIVE
+config FEATURE_LS_RECURSIVE
     bool "Enable recursion (-R)"
     default y
-    depends on CONFIG_LS
+    depends on LS
     help
       Enable the ls option (-R).
 
-config CONFIG_FEATURE_LS_SORTFILES
+config FEATURE_LS_SORTFILES
     bool "Sort the file names"
     default y
-    depends on CONFIG_LS
+    depends on LS
     help
       Allow ls to sort file names alphabetically.
 
-config CONFIG_FEATURE_LS_TIMESTAMPS
+config FEATURE_LS_TIMESTAMPS
     bool "Show file timestamps"
     default y
-    depends on CONFIG_LS
+    depends on LS
     help
       Allow ls to display timestamps for files.
 
-config CONFIG_FEATURE_LS_USERNAME
+config FEATURE_LS_USERNAME
     bool "Show username/groupnames"
     default y
-    depends on CONFIG_LS
+    depends on LS
     help
       Allow ls to display username/groupname for files.
 
-config CONFIG_FEATURE_LS_COLOR
+config FEATURE_LS_COLOR
     bool "Allow use of color to identify file types"
     default y
-    depends on CONFIG_LS && CONFIG_GETOPT_LONG
+    depends on LS && GETOPT_LONG
     help
       This enables the --color option to ls.
 
-config CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
+config FEATURE_LS_COLOR_IS_DEFAULT
     bool "Produce colored ls output by default"
     default n
-    depends on CONFIG_FEATURE_LS_COLOR
+    depends on FEATURE_LS_COLOR
     help
       Saying yes here will turn coloring on by default,
@@ -392 +366 @@
       many output screens.
 
-config CONFIG_MD5SUM
+config MD5SUM
     bool "md5sum"
     default n
@@ -398 +372 @@
       md5sum is used to print or check MD5 checksums.
 
-config CONFIG_MKDIR
+config MKDIR
     bool "mkdir"
     default n
@@ -404 +378 @@
       mkdir is used to create directories with the specified names.
 
-config CONFIG_FEATURE_MKDIR_LONG_OPTIONS
+config FEATURE_MKDIR_LONG_OPTIONS
     bool "Enable long options"
     default n
-    depends on CONFIG_MKDIR && CONFIG_GETOPT_LONG
+    depends on MKDIR && GETOPT_LONG
     help
       Support long options for the mkdir applet.
 
-config CONFIG_MKFIFO
+config MKFIFO
     bool "mkfifo"
     default n
@@ -418 +392 @@
       The `mknod' program can also create FIFOs.
 
-config CONFIG_MKNOD
+config MKNOD
     bool "mknod"
     default n
@@ -425 +399 @@
       files with the specified names.
 
-config CONFIG_MV
+config MV
     bool "mv"
     default n
@@ -431 +405 @@
       mv is used to move or rename files or directories.
 
-config CONFIG_FEATURE_MV_LONG_OPTIONS
+config FEATURE_MV_LONG_OPTIONS
     bool "Enable long options"
     default n
-    depends on CONFIG_MV && CONFIG_GETOPT_LONG
+    depends on MV && GETOPT_LONG
     help
       Support long options for the mv applet.
 
-config CONFIG_NICE
+config NICE
     bool "nice"
     default n
@@ -444 +418 @@
       nice runs a program with modified scheduling priority.
 
-config CONFIG_NOHUP
+config NOHUP
     bool "nohup"
     default n
@@ -450 +424 @@
       run a command immune to hangups, with output to a non-tty.
 
-config CONFIG_OD
+config OD
     bool "od"
     default n
@@ -456 +430 @@
       od is used to dump binary files in octal and other formats.
 
-config CONFIG_PRINTENV
+config PRINTENV
     bool "printenv"
     default n
@@ -462 +436 @@
       printenv is used to print all or part of environment.
 
-config CONFIG_PRINTF
+config PRINTF
     bool "printf"
     default n
@@ -469 +443 @@
       It's similar to `echo' except it has more options.
 
-config CONFIG_PWD
+config PWD
     bool "pwd"
     default n
@@ -475 +449 @@
       pwd is used to print the current directory.
 
-config CONFIG_REALPATH
+config READLINK
+    bool "readlink"
+    default n
+    help
+      This program reads a symbolic link and returns the name
+      of the file it points to
+
+config FEATURE_READLINK_FOLLOW
+    bool "Enable canonicalization by following all symlinks (-f)"
+    default n
+    depends on READLINK
+    help
+      Enable the readlink option (-f).
+
+config REALPATH
     bool "realpath"
     default n
@@ -482 +470 @@
       This isn't provided by GNU shellutils, but where else does it belong.
 
-config CONFIG_RM
+config RM
     bool "rm"
     default n
@@ -488 +476 @@
       rm is used to remove files or directories.
 
-config CONFIG_RMDIR
+config RMDIR
     bool "rmdir"
     default n
@@ -494 +482 @@
       rmdir is used to remove empty directories.
 
-config CONFIG_SEQ
+config SEQ
     bool "seq"
     default n
@@ -500 +488 @@
       print a sequence of numbers
 
-config CONFIG_SHA1SUM
+config SHA1SUM
     bool "sha1sum"
     default n
@@ -506 +494 @@
       Compute and check SHA1 message digest
 
-config CONFIG_SLEEP
+config SLEEP
     bool "sleep (single integer arg with no suffix)"
     default n
@@ -512 +500 @@
       sleep is used to pause for a specified number of seconds,
 
-config CONFIG_FEATURE_FANCY_SLEEP
+config FEATURE_FANCY_SLEEP
     bool "Enable multiple integer args and optional time suffixes"
     default n
-    depends on CONFIG_SLEEP
+    depends on SLEEP
     help
       Allow sleep to pause for specified minutes, hours, and days.
 
-config CONFIG_SORT
+config SORT
     bool "sort"
     default n
@@ -525 +513 @@
       sort is used to sort lines of text in specified files.
 
-config CONFIG_FEATURE_SORT_BIG
+config FEATURE_SORT_BIG
     bool "full SuSv3 compliant sort (Support -ktcsbdfiozgM)"
     default y
-    depends on CONFIG_SORT
+    depends on SORT
     help
       Without this, sort only supports  -r, -u, and an integer version
@@ -537 +525 @@
       http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
 
-config CONFIG_STAT
+config SPLIT
+    bool "split"
+    default n
+    help
+      split a file into pieces.
+
+config FEATURE_SPLIT_FANCY
+    bool "fancy extensions"
+    default n
+    depends on SPLIT
+    help
+      Add support for features not required by SUSv3.
+      Supports additional suffixes 'b' for 512 bytes,
+      'g' for 1GiB for the -b option.
+
+config STAT
     bool "stat"
     default n
@@ -543 +546 @@
       display file or filesystem status.
 
-config CONFIG_FEATURE_STAT_FORMAT
+config FEATURE_STAT_FORMAT
     bool "Enable custom formats (-c)"
     default n
-    depends on CONFIG_STAT
+    depends on STAT
     help
       Without this, stat will not support the '-c format' option where
@@ -552 +555 @@
       7k to a nonstatic build on amd64.
 
-config CONFIG_STTY
+config STTY
     bool "stty"
     default n
@@ -558 +561 @@
       stty is used to change and print terminal line settings.
 
-config CONFIG_SUM
+config SUM
     bool "sum"
     default n
@@ -564 +567 @@
       checksum and count the blocks in a file
 
-config CONFIG_SYNC
+config SYNC
     bool "sync"
     default n
@@ -570 +573 @@
       sync is used to flush filesystem buffers.
 
-config CONFIG_TAIL
+config TAIL
     bool "tail"
     default n
@@ -577 +580 @@
       from files.
 
-config CONFIG_FEATURE_FANCY_TAIL
+config FEATURE_FANCY_TAIL
     bool "Enable extra tail options (-q, -s, and -v)"
     default y
-    depends on CONFIG_TAIL
+    depends on TAIL
     help
       The options (-q, -s, and -v) are provided by GNU tail, but
       are not specific in the SUSv3 standard.
 
-config CONFIG_TEE
+config TEE
     bool "tee"
     default n
@@ -592 +595 @@
       to standard output and files.
 
-config CONFIG_FEATURE_TEE_USE_BLOCK_IO
+config FEATURE_TEE_USE_BLOCK_IO
     bool "Enable block i/o (larger/faster) instead of byte i/o."
     default n
-    depends on CONFIG_TEE
+    depends on TEE
     help
       Enable this option for a faster tee, at expense of size.
 
-config CONFIG_TEST
+config TEST
     bool "test"
     default n
@@ -607 +610 @@
       has test built in, ash can build it in optionally.
 
-config CONFIG_FEATURE_TEST_64
+config FEATURE_TEST_64
     bool "Extend test to 64 bit"
     default n
-    depends on CONFIG_TEST
+    depends on TEST
     help
       Enable 64-bit support in test.
 
-config CONFIG_TOUCH
+config TOUCH
     bool "touch"
     default n
@@ -621 +624 @@
       modification timestamp of specified files.
 
-config CONFIG_TR
+config TR
     bool "tr"
     default n
@@ -628 +631 @@
       input, writing to standard output.
 
-config CONFIG_FEATURE_TR_CLASSES
+config FEATURE_TR_CLASSES
     bool "Enable character classes (such as [:upper:])"
     default n
-    depends on CONFIG_TR
+    depends on TR
     help
       Enable character classes, enabling commands such as:
       tr [:upper:] [:lower:] to convert input into lowercase.
 
-config CONFIG_FEATURE_TR_EQUIV
+config FEATURE_TR_EQUIV
     bool "Enable equivalence classes"
     default n
-    depends on CONFIG_TR
+    depends on TR
     help
       Enable equivalence classes, which essentially add the enclosed
@@ -647 +650 @@
       is possible.
 
-config CONFIG_TRUE
+config TRUE
     bool "true"
     default n
@@ -653 +656 @@
       true returns an exit code of TRUE (0).
 
-config CONFIG_TTY
+config TTY
     bool "tty"
     default n
@@ -660 +663 @@
       standard output.
 
-config CONFIG_UNAME
+config UNAME
     bool "uname"
     default n
@@ -666 +669 @@
       uname is used to print system information.
 
-config CONFIG_UNIQ
+config UNEXPAND
+    bool "unexpand"
+    default n
+    help
+      By default, convert only leading sequences of blanks to tabs.
+
+config FEATURE_UNEXPAND_LONG_OPTIONS
+    bool "Enable long options"
+    default n
+    depends on UNEXPAND && GETOPT_LONG
+    help
+      Support long options for the unexpand applet.
+
+config UNIQ
     bool "uniq"
     default n
@@ -672 +688 @@
       uniq is used to remove duplicate lines from a sorted file.
 
-config CONFIG_USLEEP
+config USLEEP
     bool "usleep"
     default n
@@ -678 +694 @@
       usleep is used to pause for a specified number of microseconds.
 
-config CONFIG_UUDECODE
+config UUDECODE
     bool "uudecode"
     default n
@@ -684 +700 @@
       uudecode is used to decode a uuencoded file.
 
-config CONFIG_UUENCODE
+config UUENCODE
     bool "uuencode"
     default n
@@ -690 +706 @@
       uuencode is used to uuencode a file.
 
-config CONFIG_WATCH
-    bool "watch"
-    default n
-    select CONFIG_DATE
-    help
-      watch is used to execute a program periodically, showing
-      output to the screen.
-
-config CONFIG_WC
+config WC
     bool "wc"
     default n
@@ -705 +713 @@
       in specified files.
 
-config CONFIG_WHO
+config FEATURE_WC_LARGE
+    bool "Support very large files in wc"
+    default n
+    depends on WC
+    help
+      Use "unsigned long long" in wc for count variables
+
+config WHO
     bool "who"
     default n
-    select CONFIG_FEATURE_UTMP
+    select FEATURE_UTMP
     help
       who is used to show who is logged on.
 
-config CONFIG_WHOAMI
+config WHOAMI
     bool "whoami"
     default n
@@ -719 +734 @@
       user id (same as id -un).
 
-config CONFIG_YES
+config YES
     bool "yes"
     default n
@@ -727 +742 @@
 
 comment "Common options for cp and mv"
-    depends on CONFIG_CP || CONFIG_MV
-
-config CONFIG_FEATURE_PRESERVE_HARDLINKS
+    depends on CP || MV
+
+config FEATURE_PRESERVE_HARDLINKS
     bool "Preserve hard links"
     default n
-    depends on CONFIG_CP || CONFIG_MV
+    depends on CP || MV
     help
       Allow cp and mv to preserve hard links.
 
 comment "Common options for ls, more and telnet"
-    depends on CONFIG_LS || CONFIG_MORE || CONFIG_TELNET
-
-config CONFIG_FEATURE_AUTOWIDTH
+    depends on LS || MORE || TELNET
+
+config FEATURE_AUTOWIDTH
     bool "Calculate terminal & column widths"
     default y
-    depends on CONFIG_LS || CONFIG_MORE || CONFIG_TELNET
+    depends on LS || MORE || TELNET
     help
       This option allows utilities such as 'ls', 'more' and 'telnet'
-      to determine the width of the screen, which can allow them to 
+      to determine the width of the screen, which can allow them to
       display additional text or avoid wrapping text onto the next line.
-      If you leave this disabled, your utilities will be especially 
+      If you leave this disabled, your utilities will be especially
       primitive and will be unable to determine the current screen width.
 
 comment "Common options for df, du, ls"
-    depends on CONFIG_DF || CONFIG_DU || CONFIG_LS
-
-config CONFIG_FEATURE_HUMAN_READABLE
+    depends on DF || DU || LS
+
+config FEATURE_HUMAN_READABLE
     bool "Support for human readable output (example 13k, 23M, 235G)"
     default n
-    depends on CONFIG_DF || CONFIG_DU || CONFIG_LS
+    depends on DF || DU || LS
     help
       Allow df, du, and ls to have human readable output.
 
 comment "Common options for md5sum, sha1sum"
-    depends on CONFIG_MD5SUM || CONFIG_SHA1SUM
-
-config CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
+    depends on MD5SUM || SHA1SUM
+
+config FEATURE_MD5_SHA1_SUM_CHECK
     bool "Enable -c, -s and -w options"
     default n
-    depends on CONFIG_MD5SUM || CONFIG_SHA1SUM
+    depends on MD5SUM || SHA1SUM
     help
       Enabling the -c options allows files to be checked

branches/stable/mindi-busybox/coreutils/basename.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  */
@@ -33 +21 @@
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int basename_main(int argc, char **argv);
 int basename_main(int argc, char **argv)
 {
@@ -59 +47 @@
     puts(s);
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    return fflush(stdout);
 }

branches/stable/mindi-busybox/coreutils/cal.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Calendar implementation for busybox
@@ -4 +5 @@
  * See original copyright at the end of this file
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
-*/
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 
 /* BB_AUDIT SUSv3 compliant with -j and -y extensions (from util-linux). */
@@ -30 +18 @@
  */
 
-#include <sys/types.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "busybox.h"
-
-#ifdef CONFIG_LOCALE_SUPPORT
-#include <locale.h>
-#endif
+#include "libbb.h"
+
+/* We often use "unsigned" intead of "int", it's easier to div on most CPUs */
 
 #define THURSDAY        4       /* for reformation */
@@ -53 +31 @@
 #define SPACE           -1      /* used in day array */
 
-static const char days_in_month[] = {
+static const unsigned char days_in_month[] ALIGN1 = {
     0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
-static const char sep1752[] = {
-             1, 2,  14, 15, 16,
+static const unsigned char sep1752[] ALIGN1 = {
+         1, 2,  14, 15, 16,
     17, 18, 19, 20, 21, 22, 23,
     24, 25, 26, 27, 28, 29, 30
 };
 
-static int julian;
+static unsigned julian;
 
 /* leap year -- account for Gregorian reformation in 1752 */
-#define leap_year(yr) \
-    ((yr) <= 1752 ? !((yr) % 4) : \
-    (!((yr) % 4) && ((yr) % 100)) || !((yr) % 400))
-
-static int is_leap_year(int year)
-{
-    return leap_year(year);
-}
-#undef leap_year
-#define leap_year(yr) is_leap_year(yr)
+static int leap_year(unsigned yr)
+{
+    if (yr <= 1752)
+        return !(yr % 4);
+    return (!(yr % 4) && (yr % 100)) || !(yr % 400);
+}
 
 /* number of centuries since 1700, not inclusive */
@@ -89 +63 @@
     ((yr) / 4 - centuries_since_1700(yr) + quad_centuries_since_1700(yr))
 
-static void center (char *, int, int);
-static void day_array (int, int, int *);
-static void trim_trailing_spaces_and_print (char *);
+static void center(char *, unsigned, unsigned);
+static void day_array(unsigned, unsigned, unsigned *);
+static void trim_trailing_spaces_and_print(char *);
 
 static void blank_string(char *buf, size_t buflen);
-static char *build_row(char *p, int *dp);
+static char *build_row(char *p, unsigned *dp);
 
 #define DAY_LEN     3       /* 3 spaces per day */
@@ -102 +76 @@
 #define HEAD_SEP    2       /* spaces between day headings */
 
+int cal_main(int argc, char **argv);
 int cal_main(int argc, char **argv)
 {
@@ -107 +82 @@
     struct tm zero_tm;
     time_t now;
-    int month, year, flags, i;
+    unsigned month, year, flags, i;
     char *month_names[12];
     char day_headings[28];  /* 28 for julian, 21 for nonjulian */
     char buf[40];
 
-#ifdef CONFIG_LOCALE_SUPPORT
-    setlocale(LC_TIME, "");
-#endif
-
-    flags = bb_getopt_ulflags(argc, argv, "jy");
-
+    flags = getopt32(argv, "jy");
     julian = flags & 1;
-
+    month = 0;
     argv += optind;
-
-    month = 0;
-
-    if ((argc -= optind) > 2) {
+    argc -= optind;
+
+    if (argc > 2) {
         bb_show_usage();
     }
@@ -137 +106 @@
     } else {
         if (argc == 2) {
-            month = bb_xgetularg10_bnd(*argv++, 1, 12);
-        }
-        year = bb_xgetularg10_bnd(*argv, 1, 9999);
-    }
-
-    blank_string(day_headings, sizeof(day_headings) - 7 +  7*julian);
+            month = xatou_range(*argv++, 1, 12);
+        }
+        year = xatou_range(*argv, 1, 9999);
+    }
+
+    blank_string(day_headings, sizeof(day_headings) - 7 + 7*julian);
 
     i = 0;
@@ -148 +117 @@
         zero_tm.tm_mon = i;
         strftime(buf, sizeof(buf), "%B", &zero_tm);
-        month_names[i] = bb_xstrdup(buf);
+        month_names[i] = xstrdup(buf);
 
         if (i < 7) {
@@ -158 +127 @@
 
     if (month) {
-        int row, len, days[MAXDAYS];
-        int *dp = days;
+        unsigned row, len, days[MAXDAYS];
+        unsigned *dp = days;
         char lineout[30];
 
         day_array(month, year, dp);
         len = sprintf(lineout, "%s %d", month_names[month - 1], year);
-        bb_printf("%*s%s\n%s\n",
+        printf("%*s%s\n%s\n",
                ((7*julian + WEEK_LEN) - len) / 2, "",
                lineout, day_headings);
@@ -173 +142 @@
         }
     } else {
-        int row, which_cal, week_len, days[12][MAXDAYS];
-        int *dp;
+        unsigned row, which_cal, week_len, days[12][MAXDAYS];
+        unsigned *dp;
         char lineout[80];
 
@@ -195 +164 @@
             }
             center(month_names[month + 2 - julian], week_len, 0);
-            bb_printf("\n%s%*s%s", day_headings, HEAD_SEP, "", day_headings);
+            printf("\n%s%*s%s", day_headings, HEAD_SEP, "", day_headings);
             if (!julian) {
-                bb_printf("%*s%s", HEAD_SEP, "", day_headings);
+                printf("%*s%s", HEAD_SEP, "", day_headings);
             }
             putchar('\n');
@@ -211 +180 @@
     }
 
-    bb_fflush_stdout_and_exit(0);
+    fflush_stdout_and_exit(0);
 }
 
@@ -221 +190 @@
  *  builds that array for any month from Jan. 1 through Dec. 9999.
  */
-static void day_array(int month, int year, int *days)
-{
-    long temp;
-    int i;
-    int j_offset;
-    int day, dw, dm;
+static void day_array(unsigned month, unsigned year, unsigned *days)
+{
+    unsigned long temp;
+    unsigned i;
+    unsigned day, dw, dm;
 
     memset(days, SPACE, MAXDAYS * sizeof(int));
 
     if ((month == 9) && (year == 1752)) {
+        /* Assumes the Gregorian reformation eliminates
+         * 3 Sep. 1752 through 13 Sep. 1752.
+         */
+        unsigned j_offset = julian * 244;
         size_t oday = 0;
-        
-        j_offset = julian * 244;
+
         do {
             days[oday+2] = sep1752[oday] + j_offset;
@@ -242 +213 @@
 
     /* day_in_year
-     *  return the 1 based day number within the year
+     * return the 1 based day number within the year
      */
     day = 1;
@@ -255 +226 @@
 
     /* day_in_week
-     *  return the 0 based day number for any date from 1 Jan. 1 to
-     *  31 Dec. 9999.  Assumes the Gregorian reformation eliminates
-     *  3 Sep. 1752 through 13 Sep. 1752.  Returns Thursday for all
-     *  missing days.
+     * return the 0 based day number for any date from 1 Jan. 1 to
+     * 31 Dec. 9999.  Assumes the Gregorian reformation eliminates
+     * 3 Sep. 1752 through 13 Sep. 1752.  Returns Thursday for all
+     * missing days.
      */
-    dw = THURSDAY;
-    temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1)
-        + day;
+    temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1) + day;
     if (temp < FIRST_MISSING_DAY) {
         dw = ((temp - 1 + SATURDAY) % 7);
-    } else if (temp >= (FIRST_MISSING_DAY + NUMBER_MISSING_DAYS)) {
+    } else {
         dw = (((temp - 1 + SATURDAY) - NUMBER_MISSING_DAYS) % 7);
     }
@@ -278 +247 @@
     }
 
-    while (dm) {
+    do {
         days[dw++] = day++;
-        --dm;
-    }
+    } while (--dm);
 }
 
@@ -291 +259 @@
         ++p;
     }
-    while (p > s) {
+    while (p != s) {
         --p;
         if (!(isspace)(*p)) {   /* We want the function... not the inline. */
@@ -302 +270 @@
 }
 
-static void center(char *str, int len, int separate)
-{
-    int n = strlen(str);
+static void center(char *str, unsigned len, unsigned separate)
+{
+    unsigned n = strlen(str);
     len -= n;
-    bb_printf("%*s%*s", (len/2) + n, str, (len/2) + (len % 2) + separate, "");
+    printf("%*s%*s", (len/2) + n, str, (len/2) + (len % 2) + separate, "");
 }
 
@@ -315 +283 @@
 }
 
-static char *build_row(char *p, int *dp)
-{
-    int col, val, day;
+static char *build_row(char *p, unsigned *dp)
+{
+    unsigned col, val, day;
 
     memset(p, ' ', (julian + DAY_LEN) * 7);
@@ -323 +291 @@
     col = 0;
     do {
-        if ((day = *dp++) != SPACE) {
+        day = *dp++;
+        if (day != SPACE) {
             if (julian) {
                 ++p;
@@ -332 +301 @@
                 }
             }
-            if ((val = day / 10) > 0) {
+            val = day / 10;
+            if (val > 0) {
                 *p = val + '0';
             }
@@ -376 +346 @@
  * SUCH DAMAGE.
  */
-
-

branches/stable/mindi-busybox/coreutils/cat.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2, see file License in this tarball for details.
  */
 
@@ -11 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 
-#include "busybox.h"
-#include <unistd.h>
+#include "libbb.h"
 
-int cat_main(int argc, char **argv)
+/* This is a NOFORK applet. Be very careful! */
+
+
+int bb_cat(char **argv)
 {
-    FILE *f;
+    static const char *const argv_dash[] = { "-", NULL };
+
+    int fd;
     int retval = EXIT_SUCCESS;
 
-    bb_getopt_ulflags(argc, argv, "u");
-
-    argv += optind;
-    if (!*argv) {
-        *--argv = "-";
-    }
+    if (!*argv)
+        argv = (char**) &argv_dash;
 
     do {
-        if ((f = bb_wfopen_input(*argv)) != NULL) {
-            int r = bb_copyfd_eof(fileno(f), STDOUT_FILENO);
-            bb_fclose_nonstdin(f);
-            if (r >= 0) {
+        fd = STDIN_FILENO;
+        if (!LONE_DASH(*argv))
+            fd = open_or_warn(*argv, O_RDONLY);
+        if (fd >= 0) {
+            /* This is not an xfunc - never exits */
+            off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
+            if (fd != STDIN_FILENO)
+                close(fd);
+            if (r >= 0)
                 continue;
-            }
         }
         retval = EXIT_FAILURE;
@@ -39 +43 @@
     return retval;
 }
+
+int cat_main(int argc, char **argv);
+int cat_main(int argc, char **argv)
+{
+    getopt32(argv, "u");
+    argv += optind;
+    return bb_cat(argv);
+}

branches/stable/mindi-busybox/coreutils/catv.c

@@ -11 +11 @@
  * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */
 
-#include "busybox.h"
-#include <unistd.h>
-#include <fcntl.h>
+#include "libbb.h"
 
+int catv_main(int argc, char **argv);
 int catv_main(int argc, char **argv)
 {
-    int retval = EXIT_SUCCESS, fd, flags;
+    int retval = EXIT_SUCCESS;
+    int fd;
+    unsigned flags;
 
-    flags = bb_getopt_ulflags(argc, argv, "etv");
-    flags ^= 4;
+    flags = getopt32(argv, "etv");
+#define CATV_OPT_e (1<<0)
+#define CATV_OPT_t (1<<1)
+#define CATV_OPT_v (1<<2)
+    flags ^= CATV_OPT_v;
+    argv += optind;
 
-    // Loop through files.
-
-    argv += optind;
+    /* Read from stdin if there's nothing else to do. */
+    fd = 0;
+    if (!argv[0]) {
+        argv--;
+        goto jump_in;
+    }
     do {
-        // Read from stdin if there's nothing else to do.
-
-        fd = 0;
-        if (*argv && 0>(fd = bb_xopen(*argv, O_RDONLY))) retval = EXIT_FAILURE;
-        else for(;;) {
+        fd = open_or_warn(*argv, O_RDONLY);
+        if (fd < 0) {
+            retval = EXIT_FAILURE;
+            continue;
+        }
+ jump_in:
+        for (;;) {
             int i, res;
 
-            res = read(fd, bb_common_bufsiz1, sizeof(bb_common_bufsiz1));
-            if (res < 0) retval = EXIT_FAILURE;
-            if (res <1) break;
-            for (i=0; i<res; i++) {
-                char c=bb_common_bufsiz1[i];
+#define read_buf bb_common_bufsiz1
+            res = read(fd, read_buf, COMMON_BUFSIZE);
+            if (res < 0)
+                retval = EXIT_FAILURE;
+            if (res < 1)
+                break;
+            for (i = 0; i < res; i++) {
+                unsigned char c = read_buf[i];
 
-                if (c > 126 && (flags & 4)) {
+                if (c > 126 && (flags & CATV_OPT_v)) {
                     if (c == 127) {
                         printf("^?");
                         continue;
-                    } else {
-                        printf("M-");
-                        c -= 128;
                     }
+                    printf("M-");
+                    c -= 128;
                 }
                 if (c < 32) {
                     if (c == 10) {
-                       if (flags & 1) putchar('$');
-                    } else if (flags & (c==9 ? 2 : 4)) {
+                        if (flags & CATV_OPT_e)
+                            putchar('$');
+                    } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
                         printf("^%c", c+'@');
                         continue;
@@ -59 +72 @@
             }
         }
-        if (ENABLE_FEATURE_CLEAN_UP && fd) close(fd);
+        if (ENABLE_FEATURE_CLEAN_UP && fd)
+            close(fd);
     } while (*++argv);
 
-    return retval;
+    fflush_stdout_and_exit(retval);
 }

branches/stable/mindi-busybox/coreutils/chgrp.c

@@ -8 +8 @@
  */
 
-/* BB_AUDIT SUSv3 defects - unsupported options -h, -H, -L, and -P. */
-/* BB_AUDIT GNU defects - unsupported options -h, -c, -f, -v, and long options. */
-/* BB_AUDIT Note: gnu chgrp does not support -H, -L, or -P. */
+/* BB_AUDIT SUSv3 defects - none? */
+/* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-/* Don't use lchown glibc older then 2.1.x */
-#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
-#define lchown  chown
-#endif
+/* This is a NOEXEC applet. Be very careful! */
 
-static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
-{
-    if (lchown(fileName, statbuf->st_uid, *((long *) junk)) == 0) {
-        return (TRUE);
-    }
-    bb_perror_msg("%s", fileName);  /* Avoid multibyte problems. */
-    return (FALSE);
-}
 
+int chgrp_main(int argc, char **argv);
 int chgrp_main(int argc, char **argv)
 {
-    long gid;
-    int recursiveFlag;
-    int retval = EXIT_SUCCESS;
-
-    recursiveFlag = bb_getopt_ulflags(argc, argv, "R");
-
-    if (argc - optind < 2) {
-        bb_show_usage();
+    /* "chgrp [opts] abc file(s)" == "chown [opts] :abc file(s)" */
+    char **p = argv;
+    while (*++p) {
+        if (p[0][0] != '-') {
+            p[0] = xasprintf(":%s", p[0]);
+            break;
+        }
     }
-
-    argv += optind;
-
-    /* Find the selected group */
-    gid = get_ug_id(*argv, bb_xgetgrnam);
-    ++argv;
-
-    /* Ok, ready to do the deed now */
-    do {
-        if (! recursive_action (*argv, recursiveFlag, FALSE, FALSE,
-                                fileAction, fileAction, &gid)) {
-            retval = EXIT_FAILURE;
-        }
-    } while (*++argv);
-
-    return retval;
+    return chown_main(argc, argv);
 }

branches/stable/mindi-busybox/coreutils/chmod.c

@@ -12 +12 @@
 
 /* BB_AUDIT SUSv3 compliant */
-/* BB_AUDIT GNU defects - unsupported options -c, -f, -v, and long options. */
+/* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include "busybox.h"
+#include "libbb.h"
 
-static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
+/* This is a NOEXEC applet. Be very careful! */
+
+
+#define OPT_RECURSE (option_mask32 & 1)
+#define OPT_VERBOSE (USE_DESKTOP(option_mask32 & 2) SKIP_DESKTOP(0))
+#define OPT_CHANGED (USE_DESKTOP(option_mask32 & 4) SKIP_DESKTOP(0))
+#define OPT_QUIET   (USE_DESKTOP(option_mask32 & 8) SKIP_DESKTOP(0))
+#define OPT_STR     "R" USE_DESKTOP("vcf")
+
+/* coreutils:
+ * chmod never changes the permissions of symbolic links; the chmod
+ * system call cannot change their permissions. This is not a problem
+ * since the permissions of symbolic links are never used.
+ * However, for each symbolic link listed on the command line, chmod changes
+ * the permissions of the pointed-to file. In contrast, chmod ignores
+ * symbolic links encountered during recursive directory traversals.
+ */
+
+static int fileAction(const char *fileName, struct stat *statbuf, void* param, int depth)
 {
-    if (!bb_parse_mode((char *)junk, &(statbuf->st_mode)))
-        bb_error_msg_and_die( "invalid mode: %s", (char *)junk);
-    if (chmod(fileName, statbuf->st_mode) == 0)
-        return (TRUE);
-    bb_perror_msg("%s", fileName);  /* Avoid multibyte problems. */
-    return (FALSE);
+    mode_t newmode;
+
+    /* match coreutils behavior */
+    if (depth == 0) {
+        /* statbuf holds lstat result, but we need stat (follow link) */
+        if (stat(fileName, statbuf))
+            goto err;
+    } else { /* depth > 0: skip links */
+        if (S_ISLNK(statbuf->st_mode))
+            return TRUE;
+    }
+    newmode = statbuf->st_mode;
+
+    if (!bb_parse_mode((char *)param, &newmode))
+        bb_error_msg_and_die("invalid mode: %s", (char *)param);
+
+    if (chmod(fileName, newmode) == 0) {
+        if (OPT_VERBOSE
+         || (OPT_CHANGED && statbuf->st_mode != newmode)
+        ) {
+            printf("mode of '%s' changed to %04o (%s)\n", fileName,
+                newmode & 07777, bb_mode_string(newmode)+1);
+        }
+        return TRUE;
+    }
+ err:
+    if (!OPT_QUIET)
+        bb_perror_msg("%s", fileName);
+    return FALSE;
 }
 
-int chmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
+int chmod_main(int argc, char **argv);
+int chmod_main(int argc, char **argv)
 {
     int retval = EXIT_SUCCESS;
-    int recursiveFlag = FALSE;
-    int count;
+    char *arg, **argp;
     char *smode;
-    char **p;
-    char *p0;
-    char opt = '-';
 
-    ++argv;
-    count = 0;
-
-    for (p = argv  ; *p ; p++) {
-        p0 = p[0];
-        if (p0[0] == opt) {
-            if ((p0[1] == '-') && !p0[2]) {
-                opt = 0;    /* Disable further option processing. */
-                continue;
-            }
-            if (p0[1] == 'R') {
-                char *s = p0 + 2;
-                while (*s == 'R') {
-                    ++s;
-                }
-                if (*s) {
-                    bb_show_usage();
-                }
-                recursiveFlag = TRUE;
-                continue;
-            }
-            if (count) {
-                bb_show_usage();
-            }
+    /* Convert first encountered -r into ar, -w into aw etc
+     * so that getopt would not eat it */
+    argp = argv;
+    while ((arg = *++argp)) {
+        /* Mode spec must be the first arg (sans -R etc) */
+        /* (protect against mishandling e.g. "chmod 644 -r") */
+        if (arg[0] != '-') {
+            arg = NULL;
+            break;
         }
-        argv[count] = p0;
-        ++count;
+        /* An option. Not a -- or valid option? */
+        if (arg[1] && !strchr("-"OPT_STR, arg[1])) {
+            arg[0] = 'a';
+            break;
+        }
     }
 
-    argv[count] = NULL;
+    /* Parse options */
+    opt_complementary = "-2";
+    getopt32(argv, ("-"OPT_STR) + 1); /* Reuse string */
+    argv += optind;
 
-    if (count < 2) {
-        bb_show_usage();
-    }
-
-    smode = *argv;
-    ++argv;
+    /* Restore option-like mode if needed */
+    if (arg) arg[0] = '-';
 
     /* Ok, ready to do the deed now */
+    smode = *argv++;
     do {
-        if (! recursive_action (*argv, recursiveFlag, TRUE, FALSE,
-                                fileAction, fileAction, smode)) {
+        if (!recursive_action(*argv,
+            OPT_RECURSE,    // recurse
+            fileAction,     // file action
+            fileAction,     // dir action
+            smode,          // user data
+            0)              // depth
+        ) {
             retval = EXIT_FAILURE;
         }
@@ -90 +116 @@
     return retval;
 }
+
+/*
+Security: chmod is too important and too subtle.
+This is a test script (busybox chmod versus coreutils).
+Run it in empty directory.
+
+#!/bin/sh
+t1="/tmp/busybox chmod"
+t2="/usr/bin/chmod"
+create() {
+    rm -rf $1; mkdir $1
+    (
+    cd $1 || exit 1
+    mkdir dir
+    >up
+    >file
+    >dir/file
+    ln -s dir linkdir
+    ln -s file linkfile
+    ln -s ../up dir/up
+    )
+}
+tst() {
+    (cd test1; $t1 $1)
+    (cd test2; $t2 $1)
+    (cd test1; ls -lR) >out1
+    (cd test2; ls -lR) >out2
+    echo "chmod $1" >out.diff
+    if ! diff -u out1 out2 >>out.diff; then exit 1; fi
+    rm out.diff
+}
+echo "If script produced 'out.diff' file, then at least one testcase failed"
+create test1; create test2
+tst "a+w file"
+tst "a-w dir"
+tst "a+w linkfile"
+tst "a-w linkdir"
+tst "-R a+w file"
+tst "-R a-w dir"
+tst "-R a+w linkfile"
+tst "-R a-w linkdir"
+tst "a-r,a+x linkfile"
+*/

branches/stable/mindi-busybox/coreutils/chown.c

@@ -8 +8 @@
  */
 
-/* BB_AUDIT SUSv3 defects - unsupported options -h, -H, -L, and -P. */
-/* BB_AUDIT GNU defects - unsupported options -h, -c, -f, -v, and long options. */
-/* BB_AUDIT Note: gnu chown does not support -H, -L, or -P. */
+/* BB_AUDIT SUSv3 defects - none? */
+/* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 
-static uid_t uid = -1;
-static gid_t gid = -1;
+/* This is a NOEXEC applet. Be very careful! */
 
-static int (*chown_func)(const char *, uid_t, gid_t) = chown;
+
+#define OPT_STR     ("Rh" USE_DESKTOP("vcfLHP"))
+#define BIT_RECURSE 1
+#define OPT_RECURSE (option_mask32 & 1)
+#define OPT_NODEREF (option_mask32 & 2)
+#define OPT_VERBOSE (USE_DESKTOP(option_mask32 & 0x04) SKIP_DESKTOP(0))
+#define OPT_CHANGED (USE_DESKTOP(option_mask32 & 0x08) SKIP_DESKTOP(0))
+#define OPT_QUIET   (USE_DESKTOP(option_mask32 & 0x10) SKIP_DESKTOP(0))
+/* POSIX options
+ * -L traverse every symbolic link to a directory encountered
+ * -H if a command line argument is a symbolic link to a directory, traverse it
+ * -P do not traverse any symbolic links (default)
+ * We do not conform to the following:
+ * "Specifying more than one of -H, -L, and -P is not an error.
+ * The last option specified shall determine the behavior of the utility." */
+/* -L */
+#define BIT_TRAVERSE 0x20
+#define OPT_TRAVERSE (USE_DESKTOP(option_mask32 & BIT_TRAVERSE) SKIP_DESKTOP(0))
+/* -H or -L */
+#define BIT_TRAVERSE_TOP (0x20|0x40)
+#define OPT_TRAVERSE_TOP (USE_DESKTOP(option_mask32 & BIT_TRAVERSE_TOP) SKIP_DESKTOP(0))
+
+typedef int (*chown_fptr)(const char *, uid_t, gid_t);
+
+static struct bb_uidgid_t ugid = { -1, -1 };
 
 static int fileAction(const char *fileName, struct stat *statbuf,
-        void ATTRIBUTE_UNUSED *junk)
+        void *cf, int depth)
 {
-    if (!chown_func(fileName,
-                (uid == (uid_t)-1) ? statbuf->st_uid : uid,
-                (gid == (gid_t)-1) ? statbuf->st_gid : gid)) {
+    uid_t u = (ugid.uid == (uid_t)-1) ? statbuf->st_uid : ugid.uid;
+    gid_t g = (ugid.gid == (gid_t)-1) ? statbuf->st_gid : ugid.gid;
+
+    if (!((chown_fptr)cf)(fileName, u, g)) {
+        if (OPT_VERBOSE
+         || (OPT_CHANGED && (statbuf->st_uid != u || statbuf->st_gid != g))
+        ) {
+            printf("changed ownership of '%s' to %u:%u\n",
+                    fileName, (unsigned)u, (unsigned)g);
+        }
         return TRUE;
     }
-    bb_perror_msg("%s", fileName);  /* A filename could have % in it... */
+    if (!OPT_QUIET)
+        bb_perror_msg("%s", fileName);  /* A filename can have % in it... */
     return FALSE;
 }
 
-#define FLAG_R 1
-#define FLAG_h 2
-
+int chown_main(int argc, char **argv);
 int chown_main(int argc, char **argv)
 {
+    int retval = EXIT_SUCCESS;
     int flags;
-    int retval = EXIT_SUCCESS;
-    char *groupName;
+    chown_fptr chown_func;
 
-    flags = bb_getopt_ulflags(argc, argv, "Rh");
+    opt_complementary = "-2";
+    getopt32(argv, OPT_STR);
+    argv += optind;
 
-    if (flags & FLAG_h) chown_func = lchown;
-
-    if (argc - optind < 2) {
-        bb_show_usage();
+    /* This matches coreutils behavior (almost - see below) */
+    chown_func = chown;
+    if (OPT_NODEREF
+        /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
+        USE_DESKTOP( || (option_mask32 & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
+    ) {
+        chown_func = lchown;
     }
 
-    argv += optind;
+    flags = ACTION_DEPTHFIRST; /* match coreutils order */
+    if (OPT_RECURSE)
+        flags |= ACTION_RECURSE;
+    if (OPT_TRAVERSE_TOP)
+        flags |= ACTION_FOLLOWLINKS_L0; /* -H/-L: follow links on depth 0 */
+    if (OPT_TRAVERSE)
+        flags |= ACTION_FOLLOWLINKS; /* follow links if -L */
 
-    /* First, check if there is a group name here */
-    if ((groupName = strchr(*argv, '.')) == NULL) {
-        groupName = strchr(*argv, ':');
-    }
-
-    /* Check for the username and groupname */
-    if (groupName) {
-        *groupName++ = '\0';
-        gid = get_ug_id(groupName, bb_xgetgrnam);
-    }
-    if (--groupName != *argv) uid = get_ug_id(*argv, bb_xgetpwnam);
-    ++argv;
+    parse_chown_usergroup_or_die(&ugid, argv[0]);
 
     /* Ok, ready to do the deed now */
+    argv++;
     do {
-        if (! recursive_action (*argv, (flags & FLAG_R), FALSE, FALSE,
-                                fileAction, fileAction, NULL)) {
+        if (!recursive_action(*argv,
+                flags,          /* flags */
+                fileAction,     /* file action */
+                fileAction,     /* dir action */
+                chown_func,     /* user data */
+                0)              /* depth */
+        ) {
             retval = EXIT_FAILURE;
         }
@@ -77 +108 @@
     return retval;
 }
+
+/*
+Testcase. Run in empty directory.
+
+#!/bin/sh
+t1="/tmp/busybox chown"
+t2="/usr/bin/chown"
+create() {
+    rm -rf $1; mkdir $1
+    (
+    cd $1 || exit 1
+    mkdir dir dir2
+    >up
+    >file
+    >dir/file
+    >dir2/file
+    ln -s dir linkdir
+    ln -s file linkfile
+    ln -s ../up dir/linkup
+    ln -s ../dir2 dir/linkupdir2
+    )
+    chown -R 0:0 $1
+}
+tst() {
+    create test1
+    create test2
+    echo "[$1]" >>test1.out
+    echo "[$1]" >>test2.out
+    (cd test1; $t1 $1) >>test1.out 2>&1
+    (cd test2; $t2 $1) >>test2.out 2>&1
+    (cd test1; ls -lnR) >out1
+    (cd test2; ls -lnR) >out2
+    echo "chown $1" >out.diff
+    if ! diff -u out1 out2 >>out.diff; then exit 1; fi
+    rm out.diff
+}
+tst_for_each() {
+    tst "$1 1:1 file"
+    tst "$1 1:1 dir"
+    tst "$1 1:1 linkdir"
+    tst "$1 1:1 linkfile"
+}
+echo "If script produced 'out.diff' file, then at least one testcase failed"
+>test1.out
+>test2.out
+# These match coreutils 6.8:
+tst_for_each "-v"
+tst_for_each "-vR"
+tst_for_each "-vRP"
+tst_for_each "-vRL"
+tst_for_each "-vRH"
+tst_for_each "-vh"
+tst_for_each "-vhR"
+tst_for_each "-vhRP"
+tst_for_each "-vhRL"
+tst_for_each "-vhRH"
+# Fix `name' in coreutils output
+sed 's/`/'"'"'/g' -i test2.out
+# Compare us with coreutils output
+diff -u test1.out test2.out
+
+*/

branches/stable/mindi-busybox/coreutils/chroot.c

@@ -10 +10 @@
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include "busybox.h"
+#include "libbb.h"
 
+int chroot_main(int argc, char **argv);
 int chroot_main(int argc, char **argv)
 {
@@ -26 +23 @@
         bb_perror_msg_and_die("cannot change root directory to %s", *argv);
     }
-    bb_xchdir("/");
+    xchdir("/");
 
     ++argv;
     if (argc == 2) {
         argv -= 2;
-        if (!(*argv = getenv("SHELL"))) {
-            *argv = (char *) DEFAULT_SHELL;
+        argv[0] = getenv("SHELL");
+        if (!argv[0]) {
+            argv[0] = (char *) DEFAULT_SHELL;
         }
         argv[1] = (char *) "-i";
     }
 
-    execvp(*argv, argv);
+    BB_EXECVP(*argv, argv);
     bb_perror_msg_and_die("cannot execute %s", *argv);
 }

branches/stable/mindi-busybox/coreutils/cksum.c

@@ -4 +4 @@
  *
  * Copyright (C) 2006 by Rob Sullivan, with ideas from code by Walter Harms
- * 
+ *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int cksum_main(int argc, char **argv) {
-    
-    uint32_t *crc32_table = bb_crc32_filltable(1);
+int cksum_main(int argc, char **argv);
+int cksum_main(int argc, char **argv)
+{
+    uint32_t *crc32_table = crc32_filltable(NULL, 1);
 
     FILE *fp;
@@ -21 +19 @@
     int bytes_read;
     char *cp;
-    RESERVE_CONFIG_BUFFER(buf, BUFSIZ);
+
     int inp_stdin = (argc == optind) ? 1 : 0;
-    
+
     do {
-        fp = bb_wfopen_input((inp_stdin) ? bb_msg_standard_input : *++argv);
-            
+        fp = fopen_or_warn_stdin((inp_stdin) ? bb_msg_standard_input : *++argv);
+
         crc = 0;
         length = 0;
-        
-        while ((bytes_read = fread(buf, 1, BUFSIZ, fp)) > 0) {
-            cp = buf;
+
+#define read_buf bb_common_bufsiz1
+        while ((bytes_read = fread(read_buf, 1, BUFSIZ, fp)) > 0) {
+            cp = read_buf;
             length += bytes_read;
             while (bytes_read--)
                 crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ (*cp++)) & 0xffL];
         }
-        
+
         filesize = length;
-        
+
         for (; length; length >>= 8)
             crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ length) & 0xffL];
@@ -44 +43 @@
 
         if (inp_stdin) {
-            printf("%"PRIu32" %li\n", crc, filesize);
+            printf("%" PRIu32 " %li\n", crc, filesize);
             break;
         }
-        
-        printf("%"PRIu32" %li %s\n", crc, filesize, *argv); 
+
+        printf("%" PRIu32 " %li %s\n", crc, filesize, *argv);
         fclose(fp);
-    } while (*(argv+1));
-    
-    return EXIT_SUCCESS;
+    } while (*(argv + 1));
+
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }

branches/stable/mindi-busybox/coreutils/comm.c

@@ -8 +8 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-#define COMM_OPT_1 0x01
-#define COMM_OPT_2 0x02
-#define COMM_OPT_3 0x04
-
-/* These three variables control behaviour if non-zero */
-
-static int only_file_1;
-static int only_file_2;
-static int both;
+#define COMM_OPT_1 (1 << 0)
+#define COMM_OPT_2 (1 << 1)
+#define COMM_OPT_3 (1 << 2)
 
 /* writeline outputs the input given, appropriately aligned according to class */
-static void writeline(char *line, int class)
+static void writeline(char *line, int class, int flags)
 {
     if (class == 0) {
-        if (!only_file_1)
+        if (flags & COMM_OPT_1)
             return;
     } else if (class == 1) {
-        if (!only_file_2)
+        if (flags & COMM_OPT_2)
             return;
-        if (only_file_1)
+        if (!(flags & COMM_OPT_1))
             putchar('\t');
-    }
-    else /*if (class == 2)*/ {
-        if (!both)
+    } else /*if (class == 2)*/ {
+        if (flags & COMM_OPT_3)
             return;
-        if (only_file_1)
+        if (!(flags & COMM_OPT_1))
             putchar('\t');
-        if (only_file_2)
+        if (!(flags & COMM_OPT_2))
             putchar('\t');
     }
@@ -47 +36 @@
 }
 
-/* This is the real core of the program - lines are compared here */
-static void cmp_files(char **infiles)
+int comm_main(int argc, char **argv);
+int comm_main(int argc, char **argv)
 {
 #define LINE_LEN 100
@@ -56 +45 @@
     FILE *streams[2];
     int i;
+    unsigned flags;
+
+    opt_complementary = "=2";
+    flags = getopt32(argv, "123");
+    argv += optind;
 
     for (i = 0; i < 2; ++i) {
-        streams[i] = ((infiles[i][0] == '=' && infiles[i][1]) ? stdin : bb_xfopen(infiles[i], "r"));
+        streams[i] = (argv[i][0] == '-' && !argv[i][1]) ? stdin : xfopen(argv[i], "r");
         fgets(thisline[i], LINE_LEN, streams[i]);
     }
+
+    /* This is the real core of the program - lines are compared here */
 
     while (*thisline[0] || *thisline[1]) {
@@ -83 +79 @@
 
         if (order == 0 && !i)
-            writeline(thisline[1], 2);
+            writeline(thisline[1], 2, flags);
         else if (order > 0 && !(i & BB_EOF_1))
-            writeline(thisline[1], 1);
+            writeline(thisline[1], 1, flags);
         else if (order < 0 && !(i & BB_EOF_0))
-            writeline(thisline[0], 0);
+            writeline(thisline[0], 0, flags);
 
         if (i & BB_EOF_0 & BB_EOF_1) {
@@ -96 +92 @@
             while (!feof(streams[i])) {
                 if ((order < 0 && i) || (order > 0 && !i))
-                    writeline(thisline[i], i);
+                    writeline(thisline[i], i, flags);
                 fgets(thisline[i], LINE_LEN, streams[i]);
             }
@@ -109 +105 @@
     }
 
-    fclose(streams[0]);
-    fclose(streams[1]);
+    if (ENABLE_FEATURE_CLEAN_UP) {
+        fclose(streams[0]);
+        fclose(streams[1]);
+    }
+
+    return EXIT_SUCCESS;
 }
-
-int comm_main(int argc, char **argv)
-{
-    unsigned long flags;
-
-    flags = bb_getopt_ulflags(argc, argv, "123");
-
-    if (optind + 2 != argc)
-        bb_show_usage();
-
-    only_file_1 = !(flags & COMM_OPT_1);
-    only_file_2 = !(flags & COMM_OPT_2);
-    both = !(flags & COMM_OPT_3);
-
-    cmp_files(argv + optind);
-    exit(EXIT_SUCCESS);
-}

branches/stable/mindi-busybox/coreutils/cp.c

@@ -4 +4 @@
  *
  * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
+ * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
  * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
  */
 
-/* BB_AUDIT SUSv3 defects - unsupported options -H, -L, and -P. */
-/* BB_AUDIT GNU defects - only extension options supported are -a and -d.  */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cp.html */
 
@@ -17 +16 @@
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <errno.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <assert.h>
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
+
+int cp_main(int argc, char **argv);
 int cp_main(int argc, char **argv)
 {
@@ -39 +33 @@
     int flags;
     int status = 0;
+    enum {
+        OPT_a = 1 << (sizeof(FILEUTILS_CP_OPTSTR)-1),
+        OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)),
+        OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1),
+        OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
+        OPT_L = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
+    };
 
-    flags = bb_getopt_ulflags(argc, argv, "pdRfiarPHL");
-
-    if (flags & 32) {
-        flags |= (FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR | FILEUTILS_DEREFERENCE);
-    }
-    if (flags & 64) {
-        /* Make -r a synonym for -R,
-         * -r was marked as obsolete in SUSv3, but is included for compatibility
-         */
-        flags |= FILEUTILS_RECUR;
-    }
-    if (flags & 128) {
-        /* Make -P a synonym for -d,
-         * -d is the GNU option while -P is the POSIX 2003 option
-         */
-        flags |= FILEUTILS_DEREFERENCE;
-    }
+    // Soft- and hardlinking don't mix
+    // -P and -d are the same (-P is POSIX, -d is GNU)
+    // -r and -R are the same
+    // -a = -pdR
+    opt_complementary = "l--s:s--l:Pd:rR:apdR";
+    flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHL");
     /* Default behavior of cp is to dereference, so we don't have to do
      * anything special when we are given -L.
      * The behavior of -H is *almost* like -L, but not quite, so let's
      * just ignore it too for fun.
-    if (flags & 256 || flags & 512) {
-        ;
+    if (flags & OPT_L) ...
+    if (flags & OPT_H) ... // deref command-line params only
+    */
+
+#if ENABLE_SELINUX
+    if (flags & FILEUTILS_PRESERVE_SECURITY_CONTEXT) {
+        selinux_or_die();
     }
-    */
+#endif
 
     flags ^= FILEUTILS_DEREFERENCE;     /* The sense of this flag was reversed. */
@@ -78 +73 @@
     if (optind + 2 == argc) {
         s_flags = cp_mv_stat2(*argv, &source_stat,
-                              (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
-        if ((s_flags < 0) || ((d_flags = cp_mv_stat(last, &dest_stat)) < 0)) {
-            exit(EXIT_FAILURE);
-        }
+                      (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
+        if (s_flags < 0)
+            return EXIT_FAILURE;
+        d_flags = cp_mv_stat(last, &dest_stat);
+        if (d_flags < 0)
+            return EXIT_FAILURE;
+
         /* ...if neither is a directory or...  */
         if ( !((s_flags | d_flags) & 2) ||
             /* ...recursing, the 1st is a directory, and the 2nd doesn't exist... */
-            /* ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags) */
-            /* Simplify the above since FILEUTILS_RECUR >> 1 == 2. */
-            ((((flags & FILEUTILS_RECUR) >> 1) & s_flags) && !d_flags)
+            ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags)
         ) {
             /* ...do a simple copy.  */
-            dest = last;
+            dest = xstrdup(last);
             goto DO_COPY; /* Note: optind+2==argc implies argv[1]==last below. */
         }
@@ -97 +93 @@
     do {
         dest = concat_path_file(last, bb_get_last_path_component(*argv));
-    DO_COPY:
+ DO_COPY:
         if (copy_file(*argv, dest, flags) < 0) {
             status = 1;
         }
-        if (*++argv == last) {
-            break;
-        }
-        free((void *) dest);
-    } while (1);
+        free((void*)dest);
+    } while (*++argv != last);
 
-    exit(status);
+    return status;
 }

branches/stable/mindi-busybox/coreutils/cut.c

@@ -1 @@
-/* vi: set sw=8 ts=8: */
+/* vi: set sw=4 ts=4: */
 /*
  * cut.c - minimalist version of cut
@@ -5 +5 @@
  * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Mark Whitley <markw@codepoet.org>
+ * debloated by Bernhard Fischer
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <limits.h>
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
 
 
 /* option vars */
-static const char optstring[] = "b:c:f:d:sn";
-#define OPT_BYTE_FLGS    1
-#define OPT_CHAR_FLGS    2
-#define OPT_FIELDS_FLGS  4
-#define OPT_DELIM_FLGS   8
-#define OPT_SUPRESS_FLGS 16
-static char part; /* (b)yte, (c)har, (f)ields */
-static unsigned int supress_non_delimited_lines;
-static char delim = '\t'; /* delimiter, default is tab */
+static const char optstring[] ALIGN1 = "b:c:f:d:sn";
+#define CUT_OPT_BYTE_FLGS   (1<<0)
+#define CUT_OPT_CHAR_FLGS   (1<<1)
+#define CUT_OPT_FIELDS_FLGS (1<<2)
+#define CUT_OPT_DELIM_FLGS  (1<<3)
+#define CUT_OPT_SUPPRESS_FLGS (1<<4)
+
+static char delim = '\t';   /* delimiter, default is tab */
 
 struct cut_list {
@@ -52 +36 @@
 };
 
-static struct cut_list *cut_lists = NULL; /* growable array holding a series of lists */
-static unsigned int nlists = 0; /* number of elements in above list */
+/* growable array holding a series of lists */
+static struct cut_list *cut_lists;
+static unsigned int nlists; /* number of elements in above list */
 
 
 static int cmpfunc(const void *a, const void *b)
 {
-    struct cut_list *la = (struct cut_list *)a;
-    struct cut_list *lb = (struct cut_list *)b;
-
-    if (la->startpos > lb->startpos)
-        return 1;
-    if (la->startpos < lb->startpos)
-        return -1;
-    return 0;
+    return (((struct cut_list *) a)->startpos -
+            ((struct cut_list *) b)->startpos);
+
 }
 
-
-/*
- * parse_lists() - parses a list and puts values into startpos and endpos.
- * valid list formats: N, N-, N-M, -M
- * more than one list can be separated by commas
- */
-static void parse_lists(char *lists)
-{
-    char *ltok = NULL;
-    char *ntok = NULL;
-    char *junk;
-    int s = 0, e = 0;
-
-    /* take apart the lists, one by one (they are separated with commas */
-    while ((ltok = strsep(&lists, ",")) != NULL) {
-
-        /* it's actually legal to pass an empty list */
-        if (strlen(ltok) == 0)
-            continue;
-
-        /* get the start pos */
-        ntok = strsep(&ltok, "-");
-        if (ntok == NULL) {
-            fprintf(stderr, "Help ntok is null for starting position! What do I do?\n");
-        } else if (strlen(ntok) == 0) {
-            s = BOL;
-        } else {
-            s = strtoul(ntok, &junk, 10);
-            if(*junk != '\0' || s < 0)
-                bb_error_msg_and_die("invalid byte or field list");
-
-            /* account for the fact that arrays are zero based, while the user
-             * expects the first char on the line to be char # 1 */
-            if (s != 0)
-                s--;
-        }
-
-        /* get the end pos */
-        ntok = strsep(&ltok, "-");
-        if (ntok == NULL) {
-            e = NON_RANGE;
-        } else if (strlen(ntok) == 0) {
-            e = EOL;
-        } else {
-            e = strtoul(ntok, &junk, 10);
-            if(*junk != '\0' || e < 0)
-                bb_error_msg_and_die("invalid byte or field list");
-            /* if the user specified and end position of 0, that means "til the
-             * end of the line */
-            if (e == 0)
-                e = INT_MAX;
-            e--; /* again, arrays are zero based, lines are 1 based */
-            if (e == s)
-                e = NON_RANGE;
-        }
-
-        /* if there's something left to tokenize, the user past an invalid list */
-        if (ltok)
-            bb_error_msg_and_die("invalid byte or field list");
-
-        /* add the new list */
-        cut_lists = xrealloc(cut_lists, sizeof(struct cut_list) * (++nlists));
-        cut_lists[nlists-1].startpos = s;
-        cut_lists[nlists-1].endpos = e;
-    }
-
-    /* make sure we got some cut positions out of all that */
-    if (nlists == 0)
-        bb_error_msg_and_die("missing list of positions");
-
-    /* now that the lists are parsed, we need to sort them to make life easier
-     * on us when it comes time to print the chars / fields / lines */
-    qsort(cut_lists, nlists, sizeof(struct cut_list), cmpfunc);
-
-}
-
-
-static void cut_line_by_chars(const char *line)
-{
-    int c, l;
-    /* set up a list so we can keep track of what's been printed */
-    char *printed = xcalloc(strlen(line), sizeof(char));
-
-    /* print the chars specified in each cut list */
-    for (c = 0; c < nlists; c++) {
-        l = cut_lists[c].startpos;
-        while (l < strlen(line)) {
-            if (!printed[l]) {
-                putchar(line[l]);
-                printed[l] = 'X';
-            }
-            l++;
-            if (cut_lists[c].endpos == NON_RANGE || l > cut_lists[c].endpos)
-                break;
-        }
-    }
-    putchar('\n'); /* cuz we were handed a chomped line */
-    free(printed);
-}
-
-
-static void cut_line_by_fields(char *line)
-{
-    int c, f;
-    int ndelim = -1; /* zero-based / one-based problem */
-    int nfields_printed = 0;
-    char *field = NULL;
-    char d[2] = { delim, 0 };
-    char *printed;
-
-    /* test the easy case first: does this line contain any delimiters? */
-    if (strchr(line, delim) == NULL) {
-        if (!supress_non_delimited_lines)
-            puts(line);
-        return;
-    }
-
-    /* set up a list so we can keep track of what's been printed */
-    printed = xcalloc(strlen(line), sizeof(char));
-
-    /* process each list on this line, for as long as we've got a line to process */
-    for (c = 0; c < nlists && line; c++) {
-        f = cut_lists[c].startpos;
-        do {
-
-            /* find the field we're looking for */
-            while (line && ndelim < f) {
-                field = strsep(&line, d);
-                ndelim++;
-            }
-
-            /* we found it, and it hasn't been printed yet */
-            if (field && ndelim == f && !printed[ndelim]) {
-                /* if this isn't our first time through, we need to print the
-                 * delimiter after the last field that was printed */
-                if (nfields_printed > 0)
-                    putchar(delim);
-                fputs(field, stdout);
-                printed[ndelim] = 'X';
-                nfields_printed++;
-            }
-
-            f++;
-
-            /* keep going as long as we have a line to work with, this is a
-             * list, and we're not at the end of that list */
-        } while (line && cut_lists[c].endpos != NON_RANGE && f <= cut_lists[c].endpos);
-    }
-
-    /* if we printed anything at all, we need to finish it with a newline cuz
-     * we were handed a chomped line */
-    putchar('\n');
-
-    free(printed);
-}
-
-
-static void cut_file_by_lines(const char *line, unsigned int linenum)
-{
-    static int c = 0;
-    static int l = -1;
-
-    /* I can't initialize this above cuz the "initializer isn't
-     * constant" *sigh* */
-    if (l == -1)
-        l = cut_lists[c].startpos;
-
-    /* get out if we have no more lists to process or if the lines are lower
-     * than what we're interested in */
-    if (c >= nlists || linenum < l)
-        return;
-
-    /* if the line we're looking for is lower than the one we were passed, it
-     * means we displayed it already, so move on */
-    while (l < linenum) {
-        l++;
-        /* move on to the next list if we're at the end of this one */
-        if (cut_lists[c].endpos == NON_RANGE || l > cut_lists[c].endpos) {
-            c++;
-            /* get out if there's no more lists to process */
-            if (c >= nlists)
-                return;
-            l = cut_lists[c].startpos;
-            /* get out if the current line is lower than the one we just became
-             * interested in */
-            if (linenum < l)
-                return;
-        }
-    }
-
-    /* If we made it here, it means we've found the line we're looking for, so print it */
-    puts(line);
-}
-
-
-/*
- * snippy-snip
- */
-static void cut_file(FILE *file)
+static void cut_file(FILE * file)
 {
     char *line = NULL;
-    unsigned int linenum = 0; /* keep these zero-based to be consistent */
+    unsigned int linenum = 0;   /* keep these zero-based to be consistent */
 
     /* go through every line in the file */
-    while ((line = bb_get_chomped_line_from_file(file)) != NULL) {
+    while ((line = xmalloc_getline(file)) != NULL) {
+
+        /* set up a list so we can keep track of what's been printed */
+        char * printed = xzalloc(strlen(line) * sizeof(char));
+        char * orig_line = line;
+        unsigned int cl_pos = 0;
+        int spos;
 
         /* cut based on chars/bytes XXX: only works when sizeof(char) == byte */
-        if ((part & (OPT_CHAR_FLGS | OPT_BYTE_FLGS)))
-            cut_line_by_chars(line);
-
-        /* cut based on fields */
-        else {
-            if (delim == '\n')
-                cut_file_by_lines(line, linenum);
-            else
-                cut_line_by_fields(line);
-        }
-
+        if (option_mask32 & (CUT_OPT_CHAR_FLGS | CUT_OPT_BYTE_FLGS)) {
+            /* print the chars specified in each cut list */
+            for (; cl_pos < nlists; cl_pos++) {
+                spos = cut_lists[cl_pos].startpos;
+                while (spos < strlen(line)) {
+                    if (!printed[spos]) {
+                        printed[spos] = 'X';
+                        putchar(line[spos]);
+                    }
+                    spos++;
+                    if (spos > cut_lists[cl_pos].endpos
+                        || cut_lists[cl_pos].endpos == NON_RANGE)
+                        break;
+                }
+            }
+        } else if (delim == '\n') { /* cut by lines */
+            spos = cut_lists[cl_pos].startpos;
+
+            /* get out if we have no more lists to process or if the lines
+             * are lower than what we're interested in */
+            if (linenum < spos || cl_pos >= nlists)
+                goto next_line;
+
+            /* if the line we're looking for is lower than the one we were
+             * passed, it means we displayed it already, so move on */
+            while (spos < linenum) {
+                spos++;
+                /* go to the next list if we're at the end of this one */
+                if (spos > cut_lists[cl_pos].endpos
+                    || cut_lists[cl_pos].endpos == NON_RANGE) {
+                    cl_pos++;
+                    /* get out if there's no more lists to process */
+                    if (cl_pos >= nlists)
+                        goto next_line;
+                    spos = cut_lists[cl_pos].startpos;
+                    /* get out if the current line is lower than the one
+                     * we just became interested in */
+                    if (linenum < spos)
+                        goto next_line;
+                }
+            }
+
+            /* If we made it here, it means we've found the line we're
+             * looking for, so print it */
+            puts(line);
+            goto next_line;
+        } else {        /* cut by fields */
+            int ndelim = -1;    /* zero-based / one-based problem */
+            int nfields_printed = 0;
+            char *field = NULL;
+            const char delimiter[2] = { delim, 0 };
+
+            /* does this line contain any delimiters? */
+            if (strchr(line, delim) == NULL) {
+                if (!(option_mask32 & CUT_OPT_SUPPRESS_FLGS))
+                    puts(line);
+                goto next_line;
+            }
+
+            /* process each list on this line, for as long as we've got
+             * a line to process */
+            for (; cl_pos < nlists && line; cl_pos++) {
+                spos = cut_lists[cl_pos].startpos;
+                do {
+                    /* find the field we're looking for */
+                    while (line && ndelim < spos) {
+                        field = strsep(&line, delimiter);
+                        ndelim++;
+                    }
+
+                    /* we found it, and it hasn't been printed yet */
+                    if (field && ndelim == spos && !printed[ndelim]) {
+                        /* if this isn't our first time through, we need to
+                         * print the delimiter after the last field that was
+                         * printed */
+                        if (nfields_printed > 0)
+                            putchar(delim);
+                        fputs(field, stdout);
+                        printed[ndelim] = 'X';
+                        nfields_printed++;  /* shouldn't overflow.. */
+                    }
+
+                    spos++;
+
+                    /* keep going as long as we have a line to work with,
+                     * this is a list, and we're not at the end of that
+                     * list */
+                } while (spos <= cut_lists[cl_pos].endpos && line
+                         && cut_lists[cl_pos].endpos != NON_RANGE);
+            }
+        }
+        /* if we printed anything at all, we need to finish it with a
+         * newline cuz we were handed a chomped line */
+        putchar('\n');
+ next_line:
         linenum++;
-        free(line);
+        free(printed);
+        free(orig_line);
     }
 }
 
-
+static const char _op_on_field[] ALIGN1 = " only when operating on fields";
+
+int cut_main(int argc, char **argv);
 int cut_main(int argc, char **argv)
 {
-    unsigned long opt;
-    char *sopt, *sdopt;
-
-    bb_opt_complementally = "b--bcf:c--bcf:f--bcf";
-    opt = bb_getopt_ulflags(argc, argv, optstring, &sopt, &sopt, &sopt, &sdopt);
-    part = opt & (OPT_BYTE_FLGS|OPT_CHAR_FLGS|OPT_FIELDS_FLGS);
-    if(part == 0)
-        bb_error_msg_and_die("you must specify a list of bytes, characters, or fields");
-    if(opt & BB_GETOPT_ERROR)
-        bb_error_msg_and_die("only one type of list may be specified");
-    parse_lists(sopt);
-    if((opt & (OPT_DELIM_FLGS))) {
-        if (strlen(sdopt) > 1) {
+    char *sopt, *ltok;
+
+    opt_complementary = "b--bcf:c--bcf:f--bcf";
+    getopt32(argv, optstring, &sopt, &sopt, &sopt, &ltok);
+//  argc -= optind;
+    argv += optind;
+    if (!(option_mask32 & (CUT_OPT_BYTE_FLGS | CUT_OPT_CHAR_FLGS | CUT_OPT_FIELDS_FLGS)))
+        bb_error_msg_and_die("expected a list of bytes, characters, or fields");
+
+    if (option_mask32 & CUT_OPT_DELIM_FLGS) {
+        if (strlen(ltok) > 1) {
             bb_error_msg_and_die("the delimiter must be a single character");
         }
-        delim = sdopt[0];
-    }
-    supress_non_delimited_lines = opt & OPT_SUPRESS_FLGS;
+        delim = ltok[0];
+    }
 
     /*  non-field (char or byte) cutting has some special handling */
-    if (part != OPT_FIELDS_FLGS) {
-        if (supress_non_delimited_lines) {
-            bb_error_msg_and_die("suppressing non-delimited lines makes sense"
-                    " only when operating on fields");
+    if (!(option_mask32 & CUT_OPT_FIELDS_FLGS)) {
+        if (option_mask32 & CUT_OPT_SUPPRESS_FLGS) {
+            bb_error_msg_and_die
+                ("suppressing non-delimited lines makes sense%s",
+                 _op_on_field);
         }
         if (delim != '\t') {
-            bb_error_msg_and_die("a delimiter may be specified only when operating on fields");
-        }
-    }
-
-    /* argv[(optind)..(argc-1)] should be names of file to process. If no
+            bb_error_msg_and_die
+                ("a delimiter may be specified%s", _op_on_field);
+        }
+    }
+
+    /*
+     * parse list and put values into startpos and endpos.
+     * valid list formats: N, N-, N-M, -M
+     * more than one list can be separated by commas
+     */
+    {
+        char *ntok;
+        int s = 0, e = 0;
+
+        /* take apart the lists, one by one (they are separated with commas */
+        while ((ltok = strsep(&sopt, ",")) != NULL) {
+
+            /* it's actually legal to pass an empty list */
+            if (strlen(ltok) == 0)
+                continue;
+
+            /* get the start pos */
+            ntok = strsep(&ltok, "-");
+            if (ntok == NULL) {
+                bb_error_msg
+                    ("internal error: ntok is null for start pos!?\n");
+            } else if (strlen(ntok) == 0) {
+                s = BOL;
+            } else {
+                s = xatoi_u(ntok);
+                /* account for the fact that arrays are zero based, while
+                 * the user expects the first char on the line to be char #1 */
+                if (s != 0)
+                    s--;
+            }
+
+            /* get the end pos */
+            ntok = strsep(&ltok, "-");
+            if (ntok == NULL) {
+                e = NON_RANGE;
+            } else if (strlen(ntok) == 0) {
+                e = EOL;
+            } else {
+                e = xatoi_u(ntok);
+                /* if the user specified and end position of 0, that means "til the
+                 * end of the line */
+                if (e == 0)
+                    e = EOL;
+                e--;    /* again, arrays are zero based, lines are 1 based */
+                if (e == s)
+                    e = NON_RANGE;
+            }
+
+            /* if there's something left to tokenize, the user passed
+             * an invalid list */
+            if (ltok)
+                bb_error_msg_and_die("invalid byte or field list");
+
+            /* add the new list */
+            cut_lists = xrealloc(cut_lists, sizeof(struct cut_list) * (++nlists));
+            cut_lists[nlists-1].startpos = s;
+            cut_lists[nlists-1].endpos = e;
+        }
+
+        /* make sure we got some cut positions out of all that */
+        if (nlists == 0)
+            bb_error_msg_and_die("missing list of positions");
+
+        /* now that the lists are parsed, we need to sort them to make life
+         * easier on us when it comes time to print the chars / fields / lines
+         */
+        qsort(cut_lists, nlists, sizeof(struct cut_list), cmpfunc);
+    }
+
+    /* argv[0..argc-1] should be names of file to process. If no
      * files were specified or '-' was specified, take input from stdin.
      * Otherwise, we process all the files specified. */
-    if (argv[optind] == NULL || (strcmp(argv[optind], "-") == 0)) {
+    if (argv[0] == NULL || LONE_DASH(argv[0])) {
         cut_file(stdin);
-    }
-    else {
-        int i;
+    } else {
         FILE *file;
-        for (i = optind; i < argc; i++) {
-            file = bb_wfopen(argv[i], "r");
-            if(file) {
+
+        do {
+            file = fopen_or_warn(argv[0], "r");
+            if (file) {
                 cut_file(file);
                 fclose(file);
             }
-        }
-    }
-
+        } while (*++argv);
+    }
+    if (ENABLE_FEATURE_CLEAN_UP)
+        free(cut_lists);
     return EXIT_SUCCESS;
 }

branches/stable/mindi-busybox/coreutils/date.c

@@ -6 +6 @@
  *
  * iso-format handling added by Robert Griebl <griebl@gmx.de>
+ * bugfixes and cleanup by Bernhard Fischer
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
 
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* This 'date' command supports only 2 time setting formats,
    all the GNU strftime stuff (its in libc, lets use it),
-   setting time using UTC and displaying int, as well as
-   an RFC 822 complient date output for shell scripting
+   setting time using UTC and displaying it, as well as
+   an RFC 2822 compliant date output for shell scripting
    mail commands */
 
@@ -29 +24 @@
 /* Default input handling to save surprising some people */
 
-static struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
-{
-    int nr;
-    char *cp;
-
-    nr = sscanf(t_string, "%2d%2d%2d%2d%d", &(tm_time->tm_mon),
-                &(tm_time->tm_mday), &(tm_time->tm_hour), &(tm_time->tm_min),
-                &(tm_time->tm_year));
-
-    if (nr < 4 || nr > 5) {
-        bb_error_msg_and_die(bb_msg_invalid_date, t_string);
-    }
-
-    cp = strchr(t_string, '.');
-    if (cp) {
-        nr = sscanf(cp + 1, "%2d", &(tm_time->tm_sec));
-        if (nr != 1) {
-            bb_error_msg_and_die(bb_msg_invalid_date, t_string);
-        }
-    }
-
-    /* correct for century  - minor Y2K problem here? */
-    if (tm_time->tm_year >= 1900) {
-        tm_time->tm_year -= 1900;
-    }
-    /* adjust date */
-    tm_time->tm_mon -= 1;
-
-    return (tm_time);
-
-}
-
-
-/* The new stuff for LRP */
-
-static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
-{
-    struct tm t;
-
-    /* Parse input and assign appropriately to tm_time */
-
-    if (t = *tm_time, sscanf(t_string, "%d:%d:%d", &t.tm_hour, &t.tm_min,
-                         &t.tm_sec) == 3) {
-        /* no adjustments needed */
-    } else if (t = *tm_time, sscanf(t_string, "%d:%d", &t.tm_hour,
-                                &t.tm_min) == 2) {
-        /* no adjustments needed */
-    } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d:%d", &t.tm_mon,
-                        &t.tm_mday, &t.tm_hour,
-                        &t.tm_min, &t.tm_sec) == 5) {
-        /* Adjust dates from 1-12 to 0-11 */
-        t.tm_mon -= 1;
-    } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d", &t.tm_mon,
-                        &t.tm_mday,
-                        &t.tm_hour, &t.tm_min) == 4) {
-        /* Adjust dates from 1-12 to 0-11 */
-        t.tm_mon -= 1;
-    } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d:%d", &t.tm_year,
-                        &t.tm_mon, &t.tm_mday,
-                        &t.tm_hour, &t.tm_min,
-                            &t.tm_sec) == 6) {
-        t.tm_year -= 1900;  /* Adjust years */
-        t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
-    } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d", &t.tm_year,
-                        &t.tm_mon, &t.tm_mday,
-                        &t.tm_hour, &t.tm_min) == 5) {
-        t.tm_year -= 1900;  /* Adjust years */
-        t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
-    } else {
-        bb_error_msg_and_die(bb_msg_invalid_date, t_string);
-    }
-    *tm_time = t;
-    return (tm_time);
-}
 
 #define DATE_OPT_RFC2822    0x01
@@ -112 +33 @@
 #define DATE_OPT_HINT       0x40
 
+static void maybe_set_utc(int opt)
+{
+    if (opt & DATE_OPT_UTC)
+        putenv((char*)"TZ=UTC0");
+}
+
+int date_main(int argc, char **argv);
 int date_main(int argc, char **argv)
 {
+    time_t tm;
+    struct tm tm_time;
+    unsigned opt;
+    int ifmt = -1;
     char *date_str = NULL;
     char *date_fmt = NULL;
-    int set_time;
-    int utc;
-    time_t tm;
-    unsigned long opt;
-    struct tm tm_time;
     char *filename = NULL;
-
-    int ifmt = 0;
     char *isofmt_arg;
     char *hintfmt_arg;
 
-    bb_opt_complementally = "?:d--s:s--d";
-    opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:"
-                    USE_FEATURE_DATE_ISOFMT("I::D:"),
-                    &date_str, &date_str, &filename
-                    USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));
-    set_time = opt & DATE_OPT_SET;
-    utc = opt & DATE_OPT_UTC;
-    if (utc && putenv("TZ=UTC0") != 0) {
-        bb_error_msg_and_die(bb_msg_memory_exhausted);
-    }
-
-    if(ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
+    opt_complementary = "d--s:s--d"
+        USE_FEATURE_DATE_ISOFMT(":R--I:I--R");
+    opt = getopt32(argv, "Rs:ud:r:"
+            USE_FEATURE_DATE_ISOFMT("I::D:"),
+            &date_str, &date_str, &filename
+            USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));
+    maybe_set_utc(opt);
+
+    if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
         if (!isofmt_arg) {
-            ifmt = 1;
+            ifmt = 0; /* default is date */
         } else {
-            char *isoformats[]={"date","hours","minutes","seconds"};
-            for(ifmt = 4; ifmt;)
-                if(!strcmp(isofmt_arg,isoformats[--ifmt]))
-                    break;
-        }
-        if (!ifmt) {
+            static const char *const isoformats[] = {
+                "date", "hours", "minutes", "seconds"
+            };
+
+            for (ifmt = 0; ifmt < 4; ifmt++)
+                if (!strcmp(isofmt_arg, isoformats[ifmt]))
+                    goto found;
+            /* parse error */
             bb_show_usage();
+ found: ;
         }
     }
@@ -156 +81 @@
         date_fmt = &argv[optind][1];    /* Skip over the '+' */
     } else if (date_str == NULL) {
-        set_time = 1;
+        opt |= DATE_OPT_SET;
         date_str = argv[optind];
     }
@@ -163 +88 @@
        which depends on whether the clock is being set or read */
 
-    if(filename) {
+    if (filename) {
         struct stat statbuf;
-        xstat(filename,&statbuf);
-        tm=statbuf.st_mtime;
-    } else time(&tm);
+        xstat(filename, &statbuf);
+        tm = statbuf.st_mtime;
+    } else
+        time(&tm);
     memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
     /* Zero out fields - take her back to midnight! */
@@ -179 +105 @@
             strptime(date_str, hintfmt_arg, &tm_time);
         } else if (strchr(date_str, ':') != NULL) {
-            date_conv_ftime(&tm_time, date_str);
+            /* Parse input and assign appropriately to tm_time */
+
+            if (sscanf(date_str, "%d:%d:%d", &tm_time.tm_hour, &tm_time.tm_min,
+                                 &tm_time.tm_sec) == 3) {
+                /* no adjustments needed */
+            } else if (sscanf(date_str, "%d:%d", &tm_time.tm_hour,
+                                        &tm_time.tm_min) == 2) {
+                /* no adjustments needed */
+            } else if (sscanf(date_str, "%d.%d-%d:%d:%d", &tm_time.tm_mon,
+                                &tm_time.tm_mday, &tm_time.tm_hour,
+                                &tm_time.tm_min, &tm_time.tm_sec) == 5) {
+                /* Adjust dates from 1-12 to 0-11 */
+                tm_time.tm_mon -= 1;
+            } else if (sscanf(date_str, "%d.%d-%d:%d", &tm_time.tm_mon,
+                                &tm_time.tm_mday,
+                                &tm_time.tm_hour, &tm_time.tm_min) == 4) {
+                /* Adjust dates from 1-12 to 0-11 */
+                tm_time.tm_mon -= 1;
+            } else if (sscanf(date_str, "%d.%d.%d-%d:%d:%d", &tm_time.tm_year,
+                                &tm_time.tm_mon, &tm_time.tm_mday,
+                                &tm_time.tm_hour, &tm_time.tm_min,
+                                    &tm_time.tm_sec) == 6) {
+                tm_time.tm_year -= 1900;    /* Adjust years */
+                tm_time.tm_mon -= 1;    /* Adjust dates from 1-12 to 0-11 */
+            } else if (sscanf(date_str, "%d.%d.%d-%d:%d", &tm_time.tm_year,
+                                &tm_time.tm_mon, &tm_time.tm_mday,
+                                &tm_time.tm_hour, &tm_time.tm_min) == 5) {
+                tm_time.tm_year -= 1900;    /* Adjust years */
+                tm_time.tm_mon -= 1;    /* Adjust dates from 1-12 to 0-11 */
+            } else {
+                bb_error_msg_and_die(bb_msg_invalid_date, date_str);
+            }
         } else {
-            date_conv_time(&tm_time, date_str);
+            int nr;
+            char *cp;
+
+            nr = sscanf(date_str, "%2d%2d%2d%2d%d", &tm_time.tm_mon,
+                        &tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min,
+                        &tm_time.tm_year);
+
+            if (nr < 4 || nr > 5) {
+                bb_error_msg_and_die(bb_msg_invalid_date, date_str);
+            }
+
+            cp = strchr(date_str, '.');
+            if (cp) {
+                nr = sscanf(cp + 1, "%2d", &tm_time.tm_sec);
+                if (nr != 1) {
+                    bb_error_msg_and_die(bb_msg_invalid_date, date_str);
+                }
+            }
+
+            /* correct for century  - minor Y2K problem here? */
+            if (tm_time.tm_year >= 1900) {
+                tm_time.tm_year -= 1900;
+            }
+            /* adjust date */
+            tm_time.tm_mon -= 1;
         }
 
@@ -190 +171 @@
             bb_error_msg_and_die(bb_msg_invalid_date, date_str);
         }
-        if (utc && putenv("TZ=UTC0") != 0) {
-            bb_error_msg_and_die(bb_msg_memory_exhausted);
-        }
+        maybe_set_utc(opt);
 
         /* if setting time, set it */
-        if (set_time && stime(&tm) < 0) {
+        if ((opt & DATE_OPT_SET) && stime(&tm) < 0) {
             bb_perror_msg("cannot set date");
         }
@@ -203 +182 @@
 
     /* Deal with format string */
+
     if (date_fmt == NULL) {
-        /* Start with the default case */
-        
-        date_fmt = (opt & DATE_OPT_RFC2822 ?
-                    (utc ? "%a, %d %b %Y %H:%M:%S GMT" :
-                    "%a, %d %b %Y %H:%M:%S %z") :
-                    "%a %b %e %H:%M:%S %Z %Y");
-
-        if (ENABLE_FEATURE_DATE_ISOFMT) {
-            if (ifmt == 4)
-                date_fmt = utc ? "%Y-%m-%dT%H:%M:%SZ" : "%Y-%m-%dT%H:%M:%S%z";
-            else if (ifmt == 3)
-                date_fmt = utc ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M%z";
-            else if (ifmt == 2) 
-                date_fmt = utc ? "%Y-%m-%dT%HZ" : "%Y-%m-%dT%H%z";
-            else if (ifmt == 1)
-                date_fmt = "%Y-%m-%d";
-        }
-    }
-    
+        int i;
+        date_fmt = xzalloc(32);
+        if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
+            strcpy(date_fmt, "%Y-%m-%d");
+            if (ifmt > 0) {
+                i = 8;
+                date_fmt[i++] = 'T';
+                date_fmt[i++] = '%';
+                date_fmt[i++] = 'H';
+                if (ifmt > 1) {
+                    date_fmt[i++] = ':';
+                    date_fmt[i++] = '%';
+                    date_fmt[i++] = 'M';
+                }
+                if (ifmt > 2) {
+                    date_fmt[i++] = ':';
+                    date_fmt[i++] = '%';
+                    date_fmt[i++] = 'S';
+                }
+ format_utc:
+                date_fmt[i++] = '%';
+                date_fmt[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z';
+            }
+        } else if (opt & DATE_OPT_RFC2822) {
+            /* Undo busybox.c for date -R */
+            if (ENABLE_LOCALE_SUPPORT)
+                setlocale(LC_TIME, "C");
+            strcpy(date_fmt, "%a, %d %b %Y %H:%M:%S ");
+            i = 22;
+            goto format_utc;
+        } else /* default case */
+            date_fmt = (char*)"%a %b %e %H:%M:%S %Z %Y";
+    }
+
+#define date_buf bb_common_bufsiz1
     if (*date_fmt == '\0') {
-
         /* With no format string, just print a blank line */
-        
-        *bb_common_bufsiz1=0;
+        date_buf[0] = '\0';
     } else {
-
         /* Handle special conversions */
 
         if (strncmp(date_fmt, "%f", 2) == 0) {
-            date_fmt = "%Y.%m.%d-%H:%M:%S";
+            date_fmt = (char*)"%Y.%m.%d-%H:%M:%S";
         }
 
         /* Generate output string */
-        strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time);
-    }
-    puts(bb_common_bufsiz1);
+        strftime(date_buf, sizeof(date_buf), date_fmt, &tm_time);
+    }
+    puts(date_buf);
 
     return EXIT_SUCCESS;

branches/stable/mindi-busybox/coreutils/dd.c

@@ -9 +9 @@
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <signal.h>  // For FEATURE_DD_SIGNAL_HANDLING
-#include "busybox.h"
+#include <signal.h>  /* For FEATURE_DD_SIGNAL_HANDLING */
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
 
 static const struct suffix_mult dd_suffixes[] = {
@@ -25 +21 @@
     { "kD", 1000 },
     { "k", 1024 },
+    { "K", 1024 },  /* compat with coreutils dd */
     { "MD", 1000000 },
     { "M", 1048576 },
     { "GD", 1000000000 },
     { "G", 1073741824 },
-    { NULL, 0 }
+    { }
 };
 
-static size_t out_full;
-static size_t out_part;
-static size_t in_full;
-static size_t in_part;
-
-static void dd_output_status(int cur_signal)
+struct globals {
+    off_t out_full, out_part, in_full, in_part;
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+/* We have to zero it out because of NOEXEC */
+#define INIT_G() memset(&G, 0, sizeof(G))
+
+
+static void dd_output_status(int ATTRIBUTE_UNUSED cur_signal)
 {
-    fprintf(stderr, "%ld+%ld records in\n%ld+%ld records out\n",
-            (long)in_full, (long)in_part,
-            (long)out_full, (long)out_part);
+    /* Deliberately using %u, not %d */
+    fprintf(stderr, "%"OFF_FMT"u+%"OFF_FMT"u records in\n"
+            "%"OFF_FMT"u+%"OFF_FMT"u records out\n",
+            G.in_full, G.in_part,
+            G.out_full, G.out_part);
 }
 
+static ssize_t full_write_or_warn(int fd, const void *buf, size_t len,
+    const char *const filename)
+{
+    ssize_t n = full_write(fd, buf, len);
+    if (n < 0)
+        bb_perror_msg("writing '%s'", filename);
+    return n;
+}
+
+static bool write_and_stats(int fd, const void *buf, size_t len, size_t obs,
+    const char *filename)
+{
+    ssize_t n = full_write_or_warn(fd, buf, len, filename);
+    if (n < 0)
+        return 1;
+    if (n == obs)
+        G.out_full++;
+    else if (n) /* > 0 */
+        G.out_part++;
+    return 0;
+}
+
+#if ENABLE_LFS
+#define XATOU_SFX xatoull_sfx
+#else
+#define XATOU_SFX xatoul_sfx
+#endif
+
+int dd_main(int argc, char **argv);
 int dd_main(int argc, char **argv)
 {
-    size_t count = -1, oc = 0, ibs = 512, obs = 512;
-    ssize_t n;
-    off_t seek = 0, skip = 0;
-    int sync_flag = FALSE, noerror = FALSE, trunc_flag = TRUE, twobufs_flag = 0,
-        oflag, ifd, ofd, i;
-    const char *infile = NULL, *outfile = NULL;
+    enum {
+        FLAG_SYNC    = 1 << 0,
+        FLAG_NOERROR = 1 << 1,
+        FLAG_NOTRUNC = 1 << 2,
+        FLAG_TWOBUFS = 1 << 3,
+        FLAG_COUNT   = 1 << 4,
+    };
+    static const char keywords[] ALIGN1 =
+        "bs=\0""count=\0""seek=\0""skip=\0""if=\0""of=\0"
+#if ENABLE_FEATURE_DD_IBS_OBS
+        "ibs=\0""obs=\0""conv=\0""notrunc\0""sync\0""noerror\0"
+#endif
+        ;
+    enum {
+        OP_bs = 1,
+        OP_count,
+        OP_seek,
+        OP_skip,
+        OP_if,
+        OP_of,
+#if ENABLE_FEATURE_DD_IBS_OBS
+        OP_ibs,
+        OP_obs,
+        OP_conv,
+        OP_conv_notrunc,
+        OP_conv_sync,
+        OP_conv_noerror,
+#endif
+    };
+    size_t ibs = 512, obs = 512;
+    ssize_t n, w;
     char *ibuf, *obuf;
-
-    if (ENABLE_FEATURE_DD_SIGNAL_HANDLING)
-    {
-        struct sigaction sa;
-
-        memset(&sa, 0, sizeof(sa));
-        sa.sa_handler = dd_output_status; 
-        sa.sa_flags = SA_RESTART;
-        sigemptyset(&sa.sa_mask);
-        sigaction(SIGUSR1, &sa, 0); 
-    }
-
-    for (i = 1; i < argc; i++) {
-        if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("ibs=", argv[i], 4)) {
-            ibs = bb_xparse_number(argv[i]+4, dd_suffixes);
-            twobufs_flag++;
-        } else if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("obs=", argv[i], 4)) {
-            obs = bb_xparse_number(argv[i]+4, dd_suffixes);
-            twobufs_flag++;
-        } else if (!strncmp("bs=", argv[i], 3)) {
-            ibs = obs = bb_xparse_number(argv[i]+3, dd_suffixes);
-        } else if (!strncmp("count=", argv[i], 6))
-            count = bb_xparse_number(argv[i]+6, dd_suffixes);
-        else if (!strncmp("seek=", argv[i], 5))
-            seek = bb_xparse_number(argv[i]+5, dd_suffixes);
-        else if (!strncmp("skip=", argv[i], 5))
-            skip = bb_xparse_number(argv[i]+5, dd_suffixes);
-        else if (!strncmp("if=", argv[i], 3))
-            infile = argv[i]+3;
-        else if (!strncmp("of=", argv[i], 3))
-            outfile = argv[i]+3;
-        else if (ENABLE_FEATURE_DD_IBS_OBS && !strncmp("conv=", argv[i], 5)) {
-            ibuf = argv[i]+5;
-            while (1) {
-                if (!strncmp("notrunc", ibuf, 7)) {
-                    trunc_flag = FALSE;
-                    ibuf += 7;
-                } else if (!strncmp("sync", ibuf, 4)) {
-                    sync_flag = TRUE;
-                    ibuf += 4;
-                } else if (!strncmp("noerror", ibuf, 7)) {
-                    noerror = TRUE;
-                    ibuf += 7;
-                } else {
-                    bb_error_msg_and_die(bb_msg_invalid_arg, argv[i]+5, "conv");
+    /* And these are all zeroed at once! */
+    struct {
+        int flags;
+        int ifd, ofd;
+        size_t oc;
+        off_t count;
+        off_t seek, skip;
+        const char *infile, *outfile;
+#if ENABLE_FEATURE_DD_SIGNAL_HANDLING
+        struct sigaction sigact;
+#endif
+    } Z;
+#define flags   (Z.flags  )
+#define ifd     (Z.ifd    )
+#define ofd     (Z.ofd    )
+#define oc      (Z.oc     )
+#define count   (Z.count  )
+#define seek    (Z.seek   )
+#define skip    (Z.skip   )
+#define infile  (Z.infile )
+#define outfile (Z.outfile)
+#define sigact  (Z.sigact )
+
+    memset(&Z, 0, sizeof(Z));
+    INIT_G();
+
+#if ENABLE_FEATURE_DD_SIGNAL_HANDLING
+    sigact.sa_handler = dd_output_status;
+    sigact.sa_flags = SA_RESTART;
+    sigemptyset(&sigact.sa_mask);
+    sigaction(SIGUSR1, &sigact, NULL);
+#endif
+
+    for (n = 1; n < argc; n++) {
+        smalluint key_len;
+        smalluint what;
+        char *key;
+        char *arg = argv[n];
+
+//XXX:FIXME: we reject plain "dd --" This would cost ~20 bytes, so..
+//if (*arg == '-' && *++arg == '-' && !*++arg) continue;
+        key = strstr(arg, "=");
+        if (key == NULL)
+            bb_show_usage();
+        key_len = key - arg + 1;
+        key = xstrndup(arg, key_len);
+        what = index_in_strings(keywords, key) + 1;
+        if (ENABLE_FEATURE_CLEAN_UP)
+            free(key);
+        if (what == 0)
+            bb_show_usage();
+        arg += key_len;
+        /* Must fit into positive ssize_t */
+#if ENABLE_FEATURE_DD_IBS_OBS
+            if (what == OP_ibs) {
+                ibs = xatoul_range_sfx(arg, 1, ((size_t)-1L)/2, dd_suffixes);
+                continue;
+            }
+            if (what == OP_obs) {
+                obs = xatoul_range_sfx(arg, 1, ((size_t)-1L)/2, dd_suffixes);
+                continue;
+            }
+            if (what == OP_conv) {
+                while (1) {
+                    /* find ',', replace them with nil so we can use arg for
+                     * index_in_strings() without copying.
+                     * We rely on arg being non-null, else strchr would fault.
+                     */
+                    key = strchr(arg, ',');
+                    if (key)
+                        *key = '\0';
+                    what = index_in_strings(keywords, arg) + 1;
+                    if (what < OP_conv_notrunc)
+                        bb_error_msg_and_die(bb_msg_invalid_arg, arg, "conv");
+                    if (what == OP_conv_notrunc)
+                        flags |= FLAG_NOTRUNC;
+                    if (what == OP_conv_sync)
+                        flags |= FLAG_SYNC;
+                    if (what == OP_conv_noerror)
+                        flags |= FLAG_NOERROR;
+                    if (!key) /* no ',' left, so this was the last specifier */
+                        break;
+                    arg = key + 1; /* skip this keyword and ',' */
                 }
-                if (ibuf[0] == '\0') break;
-                if (ibuf[0] == ',') ibuf++;
-            }
-        } else
-            bb_show_usage();
-    }
-    ibuf = xmalloc(ibs);
-
-    if (twobufs_flag) obuf = xmalloc(obs);
-    else obuf = ibuf;
-
-    if (infile != NULL) {
-        ifd = bb_xopen(infile, O_RDONLY);
-    } else {
-        ifd = STDIN_FILENO;
+                continue;
+            }
+#endif
+        if (what == OP_bs) {
+            ibs = obs = xatoul_range_sfx(arg, 1, ((size_t)-1L)/2, dd_suffixes);
+            continue;
+        }
+        /* These can be large: */
+        if (what == OP_count) {
+            flags |= FLAG_COUNT;
+            count = XATOU_SFX(arg, dd_suffixes);
+            continue;
+        }
+        if (what == OP_seek) {
+            seek = XATOU_SFX(arg, dd_suffixes);
+            continue;
+        }
+        if (what == OP_skip) {
+            skip = XATOU_SFX(arg, dd_suffixes);
+            continue;
+        }
+        if (what == OP_if) {
+            infile = arg;
+            continue;
+        }
+        if (what == OP_of)
+            outfile = arg;
+    }
+//XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever
+    ibuf = obuf = xmalloc(ibs);
+    if (ibs != obs) {
+        flags |= FLAG_TWOBUFS;
+        obuf = xmalloc(obs);
+    }
+    if (infile != NULL)
+        ifd = xopen(infile, O_RDONLY);
+    else {
+        /* ifd = STDIN_FILENO; - it's zero and it's already there */
         infile = bb_msg_standard_input;
     }
-
     if (outfile != NULL) {
-        oflag = O_WRONLY | O_CREAT;
-
-        if (!seek && trunc_flag) {
+        int oflag = O_WRONLY | O_CREAT;
+
+        if (!seek && !(flags & FLAG_NOTRUNC))
             oflag |= O_TRUNC;
-        }
-
-        ofd = bb_xopen3(outfile, oflag, 0666);
-
-        if (seek && trunc_flag) {
+
+        ofd = xopen(outfile, oflag);
+
+        if (seek && !(flags & FLAG_NOTRUNC)) {
             if (ftruncate(ofd, seek * obs) < 0) {
                 struct stat st;
 
-                if (fstat (ofd, &st) < 0 || S_ISREG (st.st_mode) ||
-                        S_ISDIR (st.st_mode)) {
-                    bb_perror_msg_and_die("%s", outfile);
-                }
+                if (fstat(ofd, &st) < 0 || S_ISREG(st.st_mode) ||
+                        S_ISDIR(st.st_mode))
+                    goto die_outfile;
             }
         }
@@ -140 +254 @@
         outfile = bb_msg_standard_output;
     }
-
     if (skip) {
         if (lseek(ifd, skip * ibs, SEEK_CUR) < 0) {
@@ -146 +259 @@
                 n = safe_read(ifd, ibuf, ibs);
                 if (n < 0)
-                    bb_perror_msg_and_die("%s", infile);
+                    goto die_infile;
                 if (n == 0)
                     break;
@@ -152 +265 @@
         }
     }
-
     if (seek) {
-        if (lseek(ofd, seek * obs, SEEK_CUR) < 0) {
-            bb_perror_msg_and_die("%s", outfile);
-        }
-    }
-
-    while (in_full + in_part != count) {
-        if (noerror) {
-            /* Pre-zero the buffer when doing the noerror thing */
-            memset(ibuf, '\0', ibs);
-        }
-
+        if (lseek(ofd, seek * obs, SEEK_CUR) < 0)
+            goto die_outfile;
+    }
+
+    while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
+        if (flags & FLAG_NOERROR) /* Pre-zero the buffer if conv=noerror */
+            memset(ibuf, 0, ibs);
         n = safe_read(ifd, ibuf, ibs);
-        if (n == 0) {
+        if (n == 0)
             break;
-        }
         if (n < 0) {
-            if (noerror) {
+            if (flags & FLAG_NOERROR) {
                 n = ibs;
                 bb_perror_msg("%s", infile);
-            } else {
-                bb_perror_msg_and_die("%s", infile);
-            }
-        }
-        if ((size_t)n == ibs) {
-            in_full++;
-        } else {
-            in_part++;
-            if (sync_flag) {
+            } else
+                goto die_infile;
+        }
+        if ((size_t)n == ibs)
+            G.in_full++;
+        else {
+            G.in_part++;
+            if (flags & FLAG_SYNC) {
                 memset(ibuf + n, '\0', ibs - n);
                 n = ibs;
             }
         }
-        if (twobufs_flag) {
+        if (flags & FLAG_TWOBUFS) {
             char *tmp = ibuf;
             while (n) {
                 size_t d = obs - oc;
 
-                if (d > n) d = n;
+                if (d > n)
+                    d = n;
                 memcpy(obuf + oc, tmp, d);
                 n -= d;
@@ -197 +304 @@
                 oc += d;
                 if (oc == obs) {
-                    if (bb_full_write(ofd, obuf, obs) < 0) {
-                        bb_perror_msg_and_die("%s", outfile);
-                    }
-                    out_full++;
+                    if (write_and_stats(ofd, obuf, obs, obs, outfile))
+                        goto out_status;
                     oc = 0;
                 }
             }
-        } else {
-            if ((n = bb_full_write(ofd, ibuf, n)) < 0) {
-                bb_perror_msg_and_die("%s", outfile);
-            }
-            if (n == ibs) out_full++;
-            else out_part++;
-        }
-    }
-    
+        } else if (write_and_stats(ofd, ibuf, n, obs, outfile))
+            goto out_status;
+    }
+
     if (ENABLE_FEATURE_DD_IBS_OBS && oc) {
-        if (bb_full_write(ofd, obuf, oc) < 0) {
-            bb_perror_msg_and_die("%s", outfile);
-        }
-        out_part++;
-    }
-    if (close (ifd) < 0) {
+        w = full_write_or_warn(ofd, obuf, oc, outfile);
+        if (w < 0) goto out_status;
+        if (w > 0)
+            G.out_part++;
+    }
+    if (close(ifd) < 0) {
+ die_infile:
         bb_perror_msg_and_die("%s", infile);
     }
 
-    if (close (ofd) < 0) {
+    if (close(ofd) < 0) {
+ die_outfile:
         bb_perror_msg_and_die("%s", outfile);
     }
-
+ out_status:
     dd_output_status(0);
 

branches/stable/mindi-busybox/coreutils/df.c

@@ -19 +19 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <mntent.h>
 #include <sys/vfs.h>
-#include "busybox.h"
+#include "libbb.h"
 
-#ifndef CONFIG_FEATURE_HUMAN_READABLE
-static long kscale(long b, long bs)
+#if !ENABLE_FEATURE_HUMAN_READABLE
+static unsigned long kscale(unsigned long b, unsigned long bs)
 {
-    return ( b * (long long) bs + KILOBYTE/2 ) / KILOBYTE;
+    return (b * (unsigned long long) bs + 1024/2) / 1024;
 }
 #endif
 
+int df_main(int argc, char **argv);
 int df_main(int argc, char **argv)
 {
-    long blocks_used;
-    long blocks_percent_used;
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    unsigned long df_disp_hr = KILOBYTE;
+    unsigned long blocks_used;
+    unsigned blocks_percent_used;
+#if ENABLE_FEATURE_HUMAN_READABLE
+    unsigned df_disp_hr = 1024;
 #endif
     int status = EXIT_SUCCESS;
-    unsigned long opt;
+    unsigned opt;
     FILE *mount_table;
     struct mntent *mount_entry;
     struct statfs s;
-    static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
-    const char *disp_units_hdr = hdr_1k;
+    /* default display is kilobytes */
+    const char *disp_units_hdr = "1k-blocks";
 
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    bb_opt_complementally = "h-km:k-hm:m-hk";
-    opt = bb_getopt_ulflags(argc, argv, "hmk");
-    if(opt & 1) {
-                df_disp_hr = 0;
-                disp_units_hdr = "     Size";
+#if ENABLE_FEATURE_HUMAN_READABLE
+    opt_complementary = "h-km:k-hm:m-hk";
+    opt = getopt32(argv, "hmk");
+    if (opt & 1) {
+        df_disp_hr = 0;
+        disp_units_hdr = "     Size";
     }
-    if(opt & 2) {
-                df_disp_hr = MEGABYTE;
-                disp_units_hdr = "1M-blocks";
+    if (opt & 2) {
+        df_disp_hr = 1024*1024;
+        disp_units_hdr = "1M-blocks";
     }
 #else
-    opt = bb_getopt_ulflags(argc, argv, "k");
+    opt = getopt32(argv, "k");
 #endif
 
-    bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n",
+    printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n",
               "", disp_units_hdr);
 
@@ -70 +67 @@
     argv += optind;
     if (optind >= argc) {
-        if (!(mount_table = setmntent(bb_path_mtab_file, "r"))) {
+        mount_table = setmntent(bb_path_mtab_file, "r");
+        if (!mount_table) {
             bb_perror_msg_and_die(bb_path_mtab_file);
         }
     }
 
-    do {
+    while (1) {
         const char *device;
         const char *mount_point;
 
         if (mount_table) {
-            if (!(mount_entry = getmntent(mount_table))) {
+            mount_entry = getmntent(mount_table);
+            if (!mount_entry) {
                 endmntent(mount_table);
                 break;
             }
         } else {
-            if (!(mount_point = *argv++)) {
+            mount_point = *argv++;
+            if (!mount_point) {
                 break;
             }
-            if (!(mount_entry = find_mount_point(mount_point, bb_path_mtab_file))) {
-                bb_error_msg("%s: can't find mount point.", mount_point);
-            SET_ERROR:
+            mount_entry = find_mount_point(mount_point, bb_path_mtab_file);
+            if (!mount_entry) {
+                bb_error_msg("%s: can't find mount point", mount_point);
+ SET_ERROR:
                 status = EXIT_FAILURE;
                 continue;
@@ -108 +109 @@
             blocks_percent_used = 0;
             if (blocks_used + s.f_bavail) {
-                blocks_percent_used = (((long long) blocks_used) * 100
-                                       + (blocks_used + s.f_bavail)/2
-                                       ) / (blocks_used + s.f_bavail);
+                blocks_percent_used = (blocks_used * 100ULL
+                        + (blocks_used + s.f_bavail)/2
+                        ) / (blocks_used + s.f_bavail);
             }
 
@@ -118 +119 @@
                 /* Adjusts device to be the real root device,
                 * or leaves device alone if it can't find it */
-                if ((device = find_block_device("/")) == NULL) {
+                device = find_block_device("/");
+                if (!device) {
                     goto SET_ERROR;
                 }
             }
 
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-            bb_printf("%-20s %9s ", device,
-                      make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
+            if (printf("\n%-20s" + 1, device) > 20)
+                    printf("\n%-20s", "");
+#if ENABLE_FEATURE_HUMAN_READABLE
+            printf(" %9s ",
+                make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
 
-            bb_printf("%9s ",
-                      make_human_readable_str( (s.f_blocks - s.f_bfree),
-                                              s.f_bsize, df_disp_hr));
+            printf(" %9s " + 1,
+                make_human_readable_str((s.f_blocks - s.f_bfree),
+                        s.f_bsize, df_disp_hr));
 
-            bb_printf("%9s %3ld%% %s\n",
-                      make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
-                      blocks_percent_used, mount_point);
+            printf("%9s %3u%% %s\n",
+                    make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+                    blocks_percent_used, mount_point);
 #else
-            bb_printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
-                      device,
-                      kscale(s.f_blocks, s.f_bsize),
-                      kscale(s.f_blocks-s.f_bfree, s.f_bsize),
-                      kscale(s.f_bavail, s.f_bsize),
-                      blocks_percent_used, mount_point);
+            printf(" %9lu %9lu %9lu %3u%% %s\n",
+                    kscale(s.f_blocks, s.f_bsize),
+                    kscale(s.f_blocks-s.f_bfree, s.f_bsize),
+                    kscale(s.f_bavail, s.f_bsize),
+                    blocks_percent_used, mount_point);
 #endif
         }
+    }
 
-    } while (1);
-
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }

branches/stable/mindi-busybox/coreutils/dirname.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int dirname_main(int argc, char **argv);
 int dirname_main(int argc, char **argv)
 {
@@ -36 +24 @@
     puts(dirname(argv[1]));
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    return fflush(stdout);
 }

branches/stable/mindi-busybox/coreutils/dos2unix.c

@@ -13 +13 @@
 */
 
-#include <string.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <fcntl.h>
-#include "busybox.h"
+#include "libbb.h"
 
-enum ConvType {
+enum {
     CT_UNIX2DOS = 1,
     CT_DOS2UNIX
-} ConvType;
+};
 
 /* if fn is NULL then input is stdin and output is stdout */
-static int convert(char *fn)
+static int convert(char *fn, int conv_type)
 {
     FILE *in, *out;
     int i;
+#define name_buf bb_common_bufsiz1
 
+    in = stdin;
+    out = stdout;
     if (fn != NULL) {
-        in = bb_xfopen(fn, "rw");
+        in = xfopen(fn, "rw");
         /*
            The file is then created with mode read/write and
            permissions 0666 for glibc 2.0.6 and earlier or
-           0600  for glibc  2.0.7 and  later.
+           0600 for glibc 2.0.7 and later.
          */
-        snprintf(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), "%sXXXXXX", fn);
-        /*
-           sizeof bb_common_bufsiz1 is 4096, so it should be big enough to
-           hold the full path.  However if the output is truncated the
-           subsequent call to mkstemp would fail.
-         */
-        if ((i = mkstemp(&bb_common_bufsiz1[0])) == -1
-            || chmod(bb_common_bufsiz1, 0600) == -1) {
+        snprintf(name_buf, sizeof(name_buf), "%sXXXXXX", fn);
+        i = mkstemp(&name_buf[0]);
+        if (i == -1 || chmod(name_buf, 0600) == -1) {
             bb_perror_nomsg_and_die();
         }
@@ -50 +44 @@
         if (!out) {
             close(i);
-            remove(bb_common_bufsiz1);
+            remove(name_buf);
+            return -2;
         }
-    } else {
-        in = stdin;
-        out = stdout;
     }
 
@@ -61 +53 @@
             continue;
         if (i == '\n') {
-            if (ConvType == CT_UNIX2DOS)
+            if (conv_type == CT_UNIX2DOS)
                 fputc('\r', out);
             fputc('\n', out);
@@ -72 +64 @@
         if (fclose(in) < 0 || fclose(out) < 0) {
             bb_perror_nomsg();
-            remove(bb_common_bufsiz1);
+            remove(name_buf);
             return -2;
         }
@@ -78 +70 @@
          * should be true since we put them into the same directory
          * so we _should_ be ok, but you never know... */
-        if (rename(bb_common_bufsiz1, fn) < 0) {
-            bb_perror_msg("cannot rename '%s' as '%s'", bb_common_bufsiz1, fn);
+        if (rename(name_buf, fn) < 0) {
+            bb_perror_msg("cannot rename '%s' as '%s'", name_buf, fn);
             return -1;
         }
@@ -87 +79 @@
 }
 
-int dos2unix_main(int argc, char *argv[])
+int dos2unix_main(int argc, char **argv);
+int dos2unix_main(int argc, char **argv)
 {
-    int o;
+    int o, conv_type;
 
     /* See if we are supposed to be doing dos2unix or unix2dos */
-    if (bb_applet_name[0] == 'd') {
-        ConvType = CT_DOS2UNIX; /*2 */
+    if (applet_name[0] == 'd') {
+        conv_type = CT_DOS2UNIX;    /* 2 */
     } else {
-        ConvType = CT_UNIX2DOS; /*1 */
+        conv_type = CT_UNIX2DOS;    /* 1 */
     }
-    /* -u and -d are mutally exclusive */
-    bb_opt_complementally = "?:u--d:d--u";
-    /* process parameters */
-    /* -u convert to unix */
-    /* -d convert to dos  */
-    o = bb_getopt_ulflags(argc, argv, "du");
+
+    /* -u convert to unix, -d convert to dos */
+    opt_complementary = "u--d:d--u"; /* mutually exclusive */
+    o = getopt32(argv, "du");
 
     /* Do the conversion requested by an argument else do the default
      * conversion depending on our name.  */
     if (o)
-        ConvType = o;
+        conv_type = o;
 
-    if (optind < argc) {
-        while (optind < argc)
-            if ((o = convert(argv[optind++])) < 0)
-                break;
-    } else
-        o = convert(NULL);
+    do {
+        /* might be convert(NULL) if there is no filename given */
+        o = convert(argv[optind], conv_type);
+        if (o < 0)
+            break;
+        optind++;
+    } while (optind < argc);
 
     return o;

branches/stable/mindi-busybox/coreutils/du.c

@@ -24 +24 @@
  */
 
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include "busybox.h"
-
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-static unsigned long disp_hr = KILOBYTE;
+#include "libbb.h"
+
+#if ENABLE_FEATURE_HUMAN_READABLE
+# if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+static unsigned long disp_hr = 1024;
 # else
 static unsigned long disp_hr = 512;
 # endif
-#elif defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-static unsigned int disp_k = 1;
-#else
-static unsigned int disp_k; /* bss inits to 0 */
+#elif ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+static unsigned disp_k = 1;
+#else
+static unsigned disp_k; /* bss inits to 0 */
 #endif
 
@@ -46 +41 @@
 static nlink_t count_hardlinks = 1;
 
-static int status
-#if EXIT_SUCCESS == 0
-    = EXIT_SUCCESS
-#endif
-    ;
+static int status;
 static int print_files;
 static int slink_depth;
@@ -58 +49 @@
 
 
-static void print(long size, char *filename)
+static void print(long size, const char *const filename)
 {
     /* TODO - May not want to defer error checking here. */
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    bb_printf("%s\t%s\n", make_human_readable_str(size, 512, disp_hr),
-           filename);
+#if ENABLE_FEATURE_HUMAN_READABLE
+    printf("%s\t%s\n", make_human_readable_str(size, 512, disp_hr),
+            filename);
 #else
     if (disp_k) {
@@ -69 +60 @@
         size >>= 1;
     }
-    bb_printf("%ld\t%s\n", size, filename);
+    printf("%ld\t%s\n", size, filename);
 #endif
 }
 
 /* tiny recursive du */
-static long du(char *filename)
+static long du(const char *const filename)
 {
     struct stat statbuf;
     long sum;
 
-    if ((lstat(filename, &statbuf)) != 0) {
+    if (lstat(filename, &statbuf) != 0) {
         bb_perror_msg("%s", filename);
         status = EXIT_FAILURE;
@@ -97 +88 @@
     if (S_ISLNK(statbuf.st_mode)) {
         if (slink_depth > du_depth) {   /* -H or -L */
-            if ((stat(filename, &statbuf)) != 0) {
+            if (stat(filename, &statbuf) != 0) {
                 bb_perror_msg("%s", filename);
                 status = EXIT_FAILURE;
@@ -111 +102 @@
     if (statbuf.st_nlink > count_hardlinks) {
         /* Add files/directories with links only once */
-        if (is_in_ino_dev_hashtable(&statbuf, NULL)) {
+        if (is_in_ino_dev_hashtable(&statbuf)) {
             return 0;
         }
@@ -122 +113 @@
         char *newfile;
 
-        dir = bb_opendir(filename);
+        dir = warn_opendir(filename);
         if (!dir) {
             status = EXIT_FAILURE;
@@ -136 +127 @@
 
             newfile = concat_subpath_file(filename, name);
-            if(newfile == NULL)
+            if (newfile == NULL)
                 continue;
             ++du_depth;
@@ -153 +144 @@
 }
 
+int du_main(int argc, char **argv);
 int du_main(int argc, char **argv)
 {
@@ -159 +151 @@
     int print_final_total;
     char *smax_print_depth;
-    unsigned long opt;
-
-#ifdef CONFIG_FEATURE_DU_DEFUALT_BLOCKSIZE_1K
+    unsigned opt;
+
+#if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
     if (getenv("POSIXLY_CORRECT")) {    /* TODO - a new libbb function? */
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
+#if ENABLE_FEATURE_HUMAN_READABLE
         disp_hr = 512;
 #else
@@ -171 +163 @@
 #endif
 
-    /* Note: SUSv3 specifies that -a and -s options can not be used together
+    /* Note: SUSv3 specifies that -a and -s options cannot be used together
      * in strictly conforming applications.  However, it also says that some
      * du implementations may produce output when -a and -s are used together.
@@ -177 +169 @@
      * ignore -a.  This is consistent with -s being equivalent to -d 0.
      */
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    bb_opt_complementally = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
-    opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc" "hm", &smax_print_depth);
-    if((opt & (1 << 9))) {
+#if ENABLE_FEATURE_HUMAN_READABLE
+    opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
+    opt = getopt32(argv, "aHkLsx" "d:" "lc" "hm", &smax_print_depth);
+    if (opt & (1 << 9)) {
         /* -h opt */
         disp_hr = 0;
     }
-    if((opt & (1 << 10))) {
+    if (opt & (1 << 10)) {
         /* -m opt */
-        disp_hr = MEGABYTE;
-    }
-    if((opt & (1 << 2))) {
+        disp_hr = 1024*1024;
+    }
+    if (opt & (1 << 2)) {
         /* -k opt */
-            disp_hr = KILOBYTE;
-    }
-#else
-    bb_opt_complementally = "H-L:L-H:s-d:d-s";
-    opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc", &smax_print_depth);
-#if !defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-    if((opt & (1 << 2))) {
+        disp_hr = 1024;
+    }
+#else
+    opt_complementary = "H-L:L-H:s-d:d-s";
+    opt = getopt32(argv, "aHkLsx" "d:" "lc", &smax_print_depth);
+#if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+    if (opt & (1 << 2)) {
         /* -k opt */
-            disp_k = 1;
-    }
-#endif
-#endif
-    if((opt & (1 << 0))) {
+        disp_k = 1;
+    }
+#endif
+#endif
+    if (opt & (1 << 0)) {
         /* -a opt */
         print_files = INT_MAX;
     }
-    if((opt & (1 << 1))) {
+    if (opt & (1 << 1)) {
         /* -H opt */
         slink_depth = 1;
     }
-    if((opt & (1 << 3))) {
+    if (opt & (1 << 3)) {
         /* -L opt */
-            slink_depth = INT_MAX;
-    }
-    if((opt & (1 << 4))) {
+        slink_depth = INT_MAX;
+    }
+    if (opt & (1 << 4)) {
         /* -s opt */
-            max_print_depth = 0;
-        }
+        max_print_depth = 0;
+    }
     one_file_system = opt & (1 << 5); /* -x opt */
-    if((opt & (1 << 6))) {
+    if (opt & (1 << 6)) {
         /* -d opt */
-        max_print_depth = bb_xgetularg10_bnd(smax_print_depth, 0, INT_MAX);
-    }
-    if((opt & (1 << 7))) {
+        max_print_depth = xatoi_u(smax_print_depth);
+    }
+    if (opt & (1 << 7)) {
         /* -l opt */
-        count_hardlinks = INT_MAX;
+        count_hardlinks = MAXINT(nlink_t);
     }
     print_final_total = opt & (1 << 8); /* -c opt */
@@ -232 +224 @@
     argv += optind;
     if (optind >= argc) {
-        *--argv = ".";
+        *--argv = (char*)".";
         if (slink_depth == 1) {
             slink_depth = 0;
@@ -244 +236 @@
         slink_depth = slink_depth_save;
     } while (*++argv);
-#ifdef CONFIG_FEATURE_CLEAN_UP
-    reset_ino_dev_hashtable();
-#endif
-
+    if (ENABLE_FEATURE_CLEAN_UP)
+        reset_ino_dev_hashtable();
     if (print_final_total) {
         print(total, "total");
     }
 
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }

branches/stable/mindi-busybox/coreutils/echo.c

@@ -21 +21 @@
  *     trailing newline.  SUSv3 specifies _no_ output after '\c'.
  * 2) SUSv3 specifies that octal escapes are of the form \0{#{#{#}}}.
- *    The previous version version did not allow 4-digit octals.
+ *    The previous version did not allow 4-digit octals.
  */
 
+#include "libbb.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "busybox.h"
-
-int bb_echo(int ATTRIBUTE_UNUSED argc, char **argv)
+int bb_echo(char **argv)
 {
-#ifndef CONFIG_FEATURE_FANCY_ECHO
-#define eflag '\\'
-    ++argv;
+    const char *arg;
+#if !ENABLE_FEATURE_FANCY_ECHO
+    enum {
+        eflag = '\\',
+        nflag = 1,  /* 1 -- print '\n' */
+    };
+    arg = *++argv;
+    if (!arg)
+        goto newline_ret;
 #else
     const char *p;
-    int nflag = 1;
-    int eflag = 0;
+    char nflag = 1;
+    char eflag = 0;
 
-    while (*++argv && (**argv == '-')) {
+    while (1) {
+        arg = *++argv;
+        if (!arg)
+            goto newline_ret;
+        if (*arg != '-')
+            break;
+
         /* If it appears that we are handling options, then make sure
          * that all of the options specified are actually valid.
          * Otherwise, the string should just be echoed.
          */
-
-        if (!*(p = *argv + 1)) {    /* A single '-', so echo it. */
+        p = arg + 1;
+        if (!*p)    /* A single '-', so echo it. */
             goto just_echo;
-        }
 
         do {
-            if (strrchr("neE", *p) == 0) {
+            if (!strrchr("neE", *p))
                 goto just_echo;
-            }
         } while (*++p);
 
         /* All of the options in this arg are valid, so handle them. */
-        p = *argv + 1;
+        p = arg + 1;
         do {
-            if (*p == 'n') {
+            if (*p == 'n')
                 nflag = 0;
-            } else if (*p == 'e') {
+            if (*p == 'e')
                 eflag = '\\';
-            } else {
-                eflag = 0;
-            }
         } while (*++p);
     }
+ just_echo:
+#endif
+    while (1) {
+        /* arg is already == *argv and isn't NULL */
+        int c;
 
-just_echo:
-#endif
-    while (*argv) {
-        register int c;
-
-        while ((c = *(*argv)++)) {
+        if (!eflag) {
+            /* optimization for very common case */
+            fputs(arg, stdout);
+        } else while ((c = *arg++)) {
             if (c == eflag) {   /* Check for escape seq. */
-                if (**argv == 'c') {
+                if (*arg == 'c') {
                     /* '\c' means cancel newline and
                      * ignore all subsequent chars. */
-                    return 0;
+                    goto ret;
                 }
-#ifndef CONFIG_FEATURE_FANCY_ECHO
+#if !ENABLE_FEATURE_FANCY_ECHO
                 /* SUSv3 specifies that octal escapes must begin with '0'. */
-                if (((unsigned int)(**argv - '1')) >= 7)
+                if ( (((unsigned char)*arg) - '1') >= 7)
 #endif
                 {
                     /* Since SUSv3 mandates a first digit of 0, 4-digit octals
                     * of the form \0### are accepted. */
-                    if ((**argv == '0') && (((unsigned int)(argv[0][1] - '0')) < 8)) {
-                        (*argv)++;
+                    if (*arg == '0' && ((unsigned char)(arg[1]) - '0') < 8) {
+                        arg++;
                     }
                     /* bb_process_escape_sequence can handle nul correctly */
-                    c = bb_process_escape_sequence((const char **) argv);
+                    c = bb_process_escape_sequence(&arg);
                 }
             }
@@ -98 +104 @@
         }
 
-        if (*++argv) {
-            putchar(' ');
-        }
+        arg = *++argv;
+        if (!arg)
+            break;
+        putchar(' ');
     }
 
-#ifdef CONFIG_FEATURE_FANCY_ECHO
+ newline_ret:
     if (nflag) {
         putchar('\n');
     }
-#else
-    putchar('\n');
-#endif
-    return 0;
+ ret:
+    return fflush(stdout);
 }
 
+/* This is a NOFORK applet. Be very careful! */
+
+int echo_main(int argc, char** argv);
 int echo_main(int argc, char** argv)
 {
-    (void)bb_echo(argc, argv);
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    return bb_echo(argv);
 }
 

branches/stable/mindi-busybox/coreutils/env.c

@@ -6 +6 @@
  *  The Regents of the University of California.  All rights reserved.
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * Original copyright notice is retained at the end of this file.
@@ -39 +27 @@
  * - multiple "-u unsetenv" support
  * - GNU long option support
- * - use bb_default_error_retval
+ * - use xfunc_error_retval
  */
 
+#include <getopt.h> /* struct option */
+extern char **environ;
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <getopt.h> /* struct option */
-#include "busybox.h"
+#include "libbb.h"
 
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
-static const struct option env_long_options[] = {
-    { "ignore-environment", 0, NULL, 'i' },
-    { "unset", 1, NULL, 'u' },
-    { 0, 0, 0, 0 }
-};
+static const char env_longopts[] ALIGN1 =
+    "ignore-environment\0" No_argument       "i"
+    "unset\0"              Required_argument "u"
+    ;
 #endif
 
+int env_main(int argc, char** argv);
 int env_main(int argc, char** argv)
 {
-    static char *cleanenv[1] = { NULL };
+    /* cleanenv was static - why? */
+    char *cleanenv[1];
+    char **ep;
+    unsigned opt;
+    llist_t *unset_env = NULL;
 
-    char **ep, *p;
-    unsigned long opt;
-    llist_t *unset_env = NULL;
-    extern char **environ;
-
-    bb_opt_complementally = "u::";
+    opt_complementary = "u::";
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
-    bb_applet_long_options = env_long_options;
+    applet_long_options = env_longopts;
 #endif
-
-    opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);
-
+    opt = getopt32(argv, "+iu:", &unset_env);
     argv += optind;
-    if (*argv && (argv[0][0] == '-') && !argv[0][1]) {
+    if (*argv && LONE_DASH(argv[0])) {
         opt |= 1;
         ++argv;
     }
-
-    if(opt & 1)
+    if (opt & 1) {
+        cleanenv[0] = NULL;
         environ = cleanenv;
-    else if(opt & 2) {
-        while(unset_env) {
+    } else {
+        while (unset_env) {
             unsetenv(unset_env->data);
             unset_env = unset_env->link;
@@ -90 +71 @@
     }
 
-    while (*argv && ((p = strchr(*argv, '=')) != NULL)) {
+    while (*argv && (strchr(*argv, '=') != NULL)) {
         if (putenv(*argv) < 0) {
             bb_perror_msg_and_die("putenv");
@@ -98 +79 @@
 
     if (*argv) {
-        execvp(*argv, argv);
+        BB_EXECVP(*argv, argv);
         /* SUSv3-mandated exit codes. */
-        bb_default_error_retval = (errno == ENOENT) ? 127 : 126;
+        xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
         bb_perror_msg_and_die("%s", *argv);
     }
@@ -108 +89 @@
     }
 
-    bb_fflush_stdout_and_exit(0);
+    fflush_stdout_and_exit(0);
 }
 

branches/stable/mindi-busybox/coreutils/expr.c

@@ -12 +12 @@
  *  - 64 math support
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -39 +26 @@
 /* no getopt needed */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <regex.h>
-#include <sys/types.h>
-#include <errno.h>
-#include "busybox.h"
-
+#include "libbb.h"
+#include "xregex.h"
 
 /* The kinds of value we can have.  */
@@ -57 +38 @@
 #if ENABLE_EXPR_MATH_SUPPORT_64
 typedef int64_t arith_t;
+
 #define PF_REZ      "ll"
 #define PF_REZ_TYPE (long long)
@@ -62 +44 @@
 #else
 typedef long arith_t;
+
 #define PF_REZ      "l"
 #define PF_REZ_TYPE (long)
@@ -67 +50 @@
 #endif
 
+/* TODO: use bb_strtol[l]? It's easier to check for errors... */
+
 /* A value is.... */
 struct valinfo {
-    TYPE type;                      /* Which kind. */
-    union {                         /* The value itself. */
+    TYPE type;          /* Which kind. */
+    union {             /* The value itself. */
         arith_t i;
         char *s;
@@ -78 +63 @@
 
 /* The arguments given to the program, minus the program name.  */
-static char **args;
-
-static VALUE *docolon (VALUE *sv, VALUE *pv);
-static VALUE *eval (void);
-static VALUE *int_value (arith_t i);
-static VALUE *str_value (char *s);
-static int nextarg (char *str);
-static int null (VALUE *v);
-static int toarith (VALUE *v);
-static void freev (VALUE *v);
-static void tostring (VALUE *v);
-
-int expr_main (int argc, char **argv)
+struct globals {
+    char **args;
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+
+/* forward declarations */
+static VALUE *eval(void);
+
+
+/* Return a VALUE for I.  */
+
+static VALUE *int_value(arith_t i)
 {
     VALUE *v;
 
-    if (argc == 1) {
-        bb_error_msg_and_die("too few arguments");
-    }
-
-    args = argv + 1;
-
-    v = eval ();
-    if (*args)
-        bb_error_msg_and_die ("syntax error");
-
-    if (v->type == integer)
-        printf ("%" PF_REZ "d\n", PF_REZ_TYPE v->u.i);
-    else
-        puts (v->u.s);
-
-    exit (null (v));
-}
-
-/* Return a VALUE for I.  */
-
-static VALUE *int_value (arith_t i)
-{
-    VALUE *v;
-
-    v = xmalloc (sizeof(VALUE));
+    v = xmalloc(sizeof(VALUE));
     v->type = integer;
     v->u.i = i;
@@ -126 +86 @@
 /* Return a VALUE for S.  */
 
-static VALUE *str_value (char *s)
+static VALUE *str_value(const char *s)
 {
     VALUE *v;
 
-    v = xmalloc (sizeof(VALUE));
+    v = xmalloc(sizeof(VALUE));
     v->type = string;
-    v->u.s = bb_xstrdup (s);
+    v->u.s = xstrdup(s);
     return v;
 }
@@ -138 +98 @@
 /* Free VALUE V, including structure components.  */
 
-static void freev (VALUE *v)
+static void freev(VALUE * v)
 {
     if (v->type == string)
-        free (v->u.s);
-    free (v);
+        free(v->u.s);
+    free(v);
 }
 
 /* Return nonzero if V is a null-string or zero-number.  */
 
-static int null (VALUE *v)
-{
-    switch (v->type) {
-        case integer:
-            return v->u.i == 0;
-        default: /* string: */
-            return v->u.s[0] == '\0' || strcmp (v->u.s, "0") == 0;
-    }
+static int null(VALUE * v)
+{
+    if (v->type == integer)
+        return v->u.i == 0;
+    /* string: */
+    return v->u.s[0] == '\0' || LONE_CHAR(v->u.s, '0');
 }
 
 /* Coerce V to a string value (can't fail).  */
 
-static void tostring (VALUE *v)
+static void tostring(VALUE * v)
 {
     if (v->type == integer) {
-        v->u.s = bb_xasprintf ("%" PF_REZ "d", PF_REZ_TYPE v->u.i);
+        v->u.s = xasprintf("%" PF_REZ "d", PF_REZ_TYPE v->u.i);
         v->type = string;
     }
@@ -169 +127 @@
 /* Coerce V to an integer value.  Return 1 on success, 0 on failure.  */
 
-static int toarith (VALUE *v)
-{
-    if(v->type == string) {
+static bool toarith(VALUE * v)
+{
+    if (v->type == string) {
         arith_t i;
         char *e;
@@ -180 +138 @@
         if ((v->u.s == e) || *e)
             return 0;
-        free (v->u.s);
+        free(v->u.s);
         v->u.i = i;
         v->type = integer;
@@ -190 +148 @@
    STR must not be NULL.  */
 
-static int
-nextarg (char *str)
-{
-    if (*args == NULL)
+static bool nextarg(const char *str)
+{
+    if (*G.args == NULL)
         return 0;
-    return strcmp (*args, str) == 0;
+    return strcmp(*G.args, str) == 0;
 }
 
 /* The comparison operator handling functions.  */
 
-static int cmp_common (VALUE *l, VALUE *r, int op)
+static int cmp_common(VALUE * l, VALUE * r, int op)
 {
     int cmpval;
 
     if (l->type == string || r->type == string) {
-        tostring (l);
-        tostring (r);
-        cmpval = strcmp (l->u.s, r->u.s);
-    }
+        tostring(l);
+        tostring(r);
+        cmpval = strcmp(l->u.s, r->u.s);
+    } else
+        cmpval = l->u.i - r->u.i;
+    if (op == '<')
+        return cmpval < 0;
+    if (op == ('L' + 'E'))
+        return cmpval <= 0;
+    if (op == '=')
+        return cmpval == 0;
+    if (op == '!')
+        return cmpval != 0;
+    if (op == '>')
+        return cmpval > 0;
+    /* >= */
+    return cmpval >= 0;
+}
+
+/* The arithmetic operator handling functions.  */
+
+static arith_t arithmetic_common(VALUE * l, VALUE * r, int op)
+{
+    arith_t li, ri;
+
+    if (!toarith(l) || !toarith(r))
+        bb_error_msg_and_die("non-numeric argument");
+    li = l->u.i;
+    ri = r->u.i;
+    if ((op == '/' || op == '%') && ri == 0)
+        bb_error_msg_and_die("division by zero");
+    if (op == '+')
+        return li + ri;
+    else if (op == '-')
+        return li - ri;
+    else if (op == '*')
+        return li * ri;
+    else if (op == '/')
+        return li / ri;
     else
-        cmpval = l->u.i - r->u.i;
-    switch(op) {
-        case '<':
-            return cmpval < 0;
-        case ('L'+'E'):
-            return cmpval <= 0;
-        case '=':
-            return cmpval == 0;
-        case '!':
-            return cmpval != 0;
-        case '>':
-            return cmpval > 0;
-        default: /* >= */
-            return cmpval >= 0;
-    }
-}
-
-/* The arithmetic operator handling functions.  */
-
-static arith_t arithmetic_common (VALUE *l, VALUE *r, int op)
-{
-  arith_t li, ri;
-
-  if (!toarith (l) || !toarith (r))
-    bb_error_msg_and_die ("non-numeric argument");
-  li = l->u.i;
-  ri = r->u.i;
-  if((op == '/' || op == '%') && ri == 0)
-    bb_error_msg_and_die ( "division by zero");
-  switch(op) {
-    case '+':
-        return li + ri;
-    case '-':
-        return li - ri;
-    case '*':
-        return li * ri;
-    case '/':
-        return li / ri;
-    default:
         return li % ri;
-  }
 }
 
@@ -257 +209 @@
    PV is the VALUE for the rhs (the pattern).  */
 
-static VALUE *docolon (VALUE *sv, VALUE *pv)
+static VALUE *docolon(VALUE * sv, VALUE * pv)
 {
     VALUE *v;
@@ -264 +216 @@
     regmatch_t re_regs[NMATCH];
 
-    tostring (sv);
-    tostring (pv);
+    tostring(sv);
+    tostring(pv);
 
     if (pv->u.s[0] == '^') {
-        fprintf (stderr, "\
+        bb_error_msg("\
 warning: unportable BRE: `%s': using `^' as the first character\n\
-of a basic regular expression is not portable; it is being ignored",
-        pv->u.s);
-    }
-
-    memset (&re_buffer, 0, sizeof (re_buffer));
-    memset (re_regs, 0, sizeof (*re_regs));
-    if( regcomp (&re_buffer, pv->u.s, 0) != 0 )
-        bb_error_msg_and_die("Invalid regular expression");
+of a basic regular expression is not portable; it is being ignored", pv->u.s);
+    }
+
+    memset(&re_buffer, 0, sizeof(re_buffer));
+    memset(re_regs, 0, sizeof(*re_regs));
+    xregcomp(&re_buffer, pv->u.s, 0);
 
     /* expr uses an anchored pattern match, so check that there was a
      * match and that the match starts at offset 0. */
-    if (regexec (&re_buffer, sv->u.s, NMATCH, re_regs, 0) != REG_NOMATCH &&
-            re_regs[0].rm_so == 0) {
+    if (regexec(&re_buffer, sv->u.s, NMATCH, re_regs, 0) != REG_NOMATCH &&
+        re_regs[0].rm_so == 0) {
         /* Were \(...\) used? */
         if (re_buffer.re_nsub > 0) {
             sv->u.s[re_regs[1].rm_eo] = '\0';
-            v = str_value (sv->u.s + re_regs[1].rm_so);
-        }
-        else
-            v = int_value (re_regs[0].rm_eo);
-    }
-    else {
+            v = str_value(sv->u.s + re_regs[1].rm_so);
+        } else
+            v = int_value(re_regs[0].rm_eo);
+    } else {
         /* Match failed -- return the right kind of null.  */
         if (re_buffer.re_nsub > 0)
-            v = str_value ("");
+            v = str_value("");
         else
-            v = int_value (0);
-    }
+            v = int_value(0);
+    }
+//FIXME: sounds like here is a bit missing: regfree(&re_buffer);
     return v;
 }
@@ -303 +252 @@
 /* Handle bare operands and ( expr ) syntax.  */
 
-static VALUE *eval7 (void)
+static VALUE *eval7(void)
 {
     VALUE *v;
 
-    if (!*args)
-        bb_error_msg_and_die ( "syntax error");
-
-    if (nextarg ("(")) {
-        args++;
-        v = eval ();
-        if (!nextarg (")"))
-            bb_error_msg_and_die ( "syntax error");
-            args++;
-            return v;
+    if (!*G.args)
+        bb_error_msg_and_die("syntax error");
+
+    if (nextarg("(")) {
+        G.args++;
+        v = eval();
+        if (!nextarg(")"))
+            bb_error_msg_and_die("syntax error");
+        G.args++;
+        return v;
+    }
+
+    if (nextarg(")"))
+        bb_error_msg_and_die("syntax error");
+
+    return str_value(*G.args++);
+}
+
+/* Handle match, substr, index, length, and quote keywords.  */
+
+static VALUE *eval6(void)
+{
+    static const char keywords[] ALIGN1 =
+        "quote\0""length\0""match\0""index\0""substr\0";
+
+    VALUE *r, *i1, *i2;
+    VALUE *l = l; /* silence gcc */
+    VALUE *v = v; /* silence gcc */
+    int key = *G.args ? index_in_strings(keywords, *G.args) + 1 : 0;
+
+    if (key == 0) /* not a keyword */
+        return eval7();
+    G.args++; /* We have a valid token, so get the next argument.  */
+    if (key == 1) { /* quote */
+        if (!*G.args)
+            bb_error_msg_and_die("syntax error");
+        return str_value(*G.args++);
+    }
+    if (key == 2) { /* length */
+        r = eval6();
+        tostring(r);
+        v = int_value(strlen(r->u.s));
+        freev(r);
+    } else
+        l = eval6();
+
+    if (key == 3) { /* match */
+        r = eval6();
+        v = docolon(l, r);
+        freev(l);
+        freev(r);
+    }
+    if (key == 4) { /* index */
+        r = eval6();
+        tostring(l);
+        tostring(r);
+        v = int_value(strcspn(l->u.s, r->u.s) + 1);
+        if (v->u.i == (arith_t) strlen(l->u.s) + 1)
+            v->u.i = 0;
+        freev(l);
+        freev(r);
+    }
+    if (key == 5) { /* substr */
+        i1 = eval6();
+        i2 = eval6();
+        tostring(l);
+        if (!toarith(i1) || !toarith(i2)
+         || i1->u.i > (arith_t) strlen(l->u.s)
+         || i1->u.i <= 0 || i2->u.i <= 0)
+            v = str_value("");
+        else {
+            v = xmalloc(sizeof(VALUE));
+            v->type = string;
+            v->u.s = xstrndup(l->u.s + i1->u.i - 1, i2->u.i);
         }
-
-    if (nextarg (")"))
-        bb_error_msg_and_die ( "syntax error");
-
-    return str_value (*args++);
-}
-
-/* Handle match, substr, index, length, and quote keywords.  */
-
-static VALUE *eval6 (void)
-{
-    VALUE *l, *r, *v, *i1, *i2;
-
-    if (nextarg ("quote")) {
-        args++;
-        if (!*args)
-            bb_error_msg_and_die ( "syntax error");
-        return str_value (*args++);
-    }
-    else if (nextarg ("length")) {
-        args++;
-        r = eval6 ();
-        tostring (r);
-        v = int_value (strlen (r->u.s));
-        freev (r);
-        return v;
-    }
-    else if (nextarg ("match")) {
-        args++;
-        l = eval6 ();
-        r = eval6 ();
-        v = docolon (l, r);
-        freev (l);
-        freev (r);
-        return v;
-    }
-    else if (nextarg ("index")) {
-        args++;
-        l = eval6 ();
-        r = eval6 ();
-        tostring (l);
-        tostring (r);
-        v = int_value (strcspn (l->u.s, r->u.s) + 1);
-        if (v->u.i == (arith_t) strlen (l->u.s) + 1)
-            v->u.i = 0;
-        freev (l);
-        freev (r);
-        return v;
-    }
-    else if (nextarg ("substr")) {
-        args++;
-        l = eval6 ();
-        i1 = eval6 ();
-        i2 = eval6 ();
-        tostring (l);
-        if (!toarith (i1) || !toarith (i2)
-            || i1->u.i > (arith_t) strlen (l->u.s)
-            || i1->u.i <= 0 || i2->u.i <= 0)
-        v = str_value ("");
-        else {
-            v = xmalloc (sizeof(VALUE));
-            v->type = string;
-            v->u.s = bb_xstrndup(l->u.s + i1->u.i - 1, i2->u.i);
-        }
-        freev (l);
-        freev (i1);
-        freev (i2);
-        return v;
-    }
-    else
-        return eval7 ();
+        freev(l);
+        freev(i1);
+        freev(i2);
+    }
+    return v;
+
 }
 
@@ -394 +342 @@
    Calls docolon to do the real work.  */
 
-static VALUE *eval5 (void)
+static VALUE *eval5(void)
 {
     VALUE *l, *r, *v;
 
-    l = eval6 ();
-    while (nextarg (":")) {
-        args++;
-        r = eval6 ();
-        v = docolon (l, r);
-        freev (l);
-        freev (r);
+    l = eval6();
+    while (nextarg(":")) {
+        G.args++;
+        r = eval6();
+        v = docolon(l, r);
+        freev(l);
+        freev(r);
         l = v;
     }
@@ -412 +360 @@
 /* Handle *, /, % operators.  */
 
-static VALUE *eval4 (void)
+static VALUE *eval4(void)
 {
     VALUE *l, *r;
@@ -418 +366 @@
     arith_t val;
 
-    l = eval5 ();
+    l = eval5();
     while (1) {
-        if (nextarg ("*"))
+        if (nextarg("*"))
             op = '*';
-        else if (nextarg ("/"))
+        else if (nextarg("/"))
             op = '/';
-        else if (nextarg ("%"))
+        else if (nextarg("%"))
             op = '%';
         else
             return l;
-        args++;
-        r = eval5 ();
-        val = arithmetic_common (l, r, op);
-        freev (l);
-        freev (r);
-        l = int_value (val);
+        G.args++;
+        r = eval5();
+        val = arithmetic_common(l, r, op);
+        freev(l);
+        freev(r);
+        l = int_value(val);
     }
 }
@@ -439 +387 @@
 /* Handle +, - operators.  */
 
-static VALUE *eval3 (void)
+static VALUE *eval3(void)
 {
     VALUE *l, *r;
@@ -445 +393 @@
     arith_t val;
 
-    l = eval4 ();
+    l = eval4();
     while (1) {
-        if (nextarg ("+"))
+        if (nextarg("+"))
             op = '+';
-        else if (nextarg ("-"))
+        else if (nextarg("-"))
             op = '-';
         else
             return l;
-        args++;
-        r = eval4 ();
-        val = arithmetic_common (l, r, op);
-        freev (l);
-        freev (r);
-        l = int_value (val);
+        G.args++;
+        r = eval4();
+        val = arithmetic_common(l, r, op);
+        freev(l);
+        freev(r);
+        l = int_value(val);
     }
 }
@@ -464 +412 @@
 /* Handle comparisons.  */
 
-static VALUE *eval2 (void)
+static VALUE *eval2(void)
 {
     VALUE *l, *r;
@@ -470 +418 @@
     arith_t val;
 
-    l = eval3 ();
+    l = eval3();
     while (1) {
-        if (nextarg ("<"))
+        if (nextarg("<"))
             op = '<';
-        else if (nextarg ("<="))
-            op = 'L'+'E';
-        else if (nextarg ("=") || nextarg ("=="))
+        else if (nextarg("<="))
+            op = 'L' + 'E';
+        else if (nextarg("=") || nextarg("=="))
             op = '=';
-        else if (nextarg ("!="))
+        else if (nextarg("!="))
             op = '!';
-        else if (nextarg (">="))
-            op = 'G'+'E';
-        else if (nextarg (">"))
+        else if (nextarg(">="))
+            op = 'G' + 'E';
+        else if (nextarg(">"))
             op = '>';
         else
             return l;
-        args++;
-        r = eval3 ();
-        toarith (l);
-        toarith (r);
-        val = cmp_common (l, r, op);
-        freev (l);
-        freev (r);
-        l = int_value (val);
+        G.args++;
+        r = eval3();
+        toarith(l);
+        toarith(r);
+        val = cmp_common(l, r, op);
+        freev(l);
+        freev(r);
+        l = int_value(val);
     }
 }
@@ -499 +447 @@
 /* Handle &.  */
 
-static VALUE *eval1 (void)
+static VALUE *eval1(void)
 {
     VALUE *l, *r;
 
-    l = eval2 ();
-    while (nextarg ("&")) {
-        args++;
-        r = eval2 ();
-        if (null (l) || null (r)) {
-            freev (l);
-            freev (r);
-            l = int_value (0);
-        }
-        else
-            freev (r);
+    l = eval2();
+    while (nextarg("&")) {
+        G.args++;
+        r = eval2();
+        if (null(l) || null(r)) {
+            freev(l);
+            freev(r);
+            l = int_value(0);
+        } else
+            freev(r);
     }
     return l;
@@ -520 +467 @@
 /* Handle |.  */
 
-static VALUE *eval (void)
+static VALUE *eval(void)
 {
     VALUE *l, *r;
 
-    l = eval1 ();
-    while (nextarg ("|")) {
-        args++;
-        r = eval1 ();
-        if (null (l)) {
-            freev (l);
+    l = eval1();
+    while (nextarg("|")) {
+        G.args++;
+        r = eval1();
+        if (null(l)) {
+            freev(l);
             l = r;
-        }
-        else
-            freev (r);
+        } else
+            freev(r);
     }
     return l;
 }
+
+int expr_main(int argc, char **argv);
+int expr_main(int argc, char **argv)
+{
+    VALUE *v;
+
+    if (argc == 1) {
+        bb_error_msg_and_die("too few arguments");
+    }
+
+    G.args = argv + 1;
+
+    v = eval();
+    if (*G.args)
+        bb_error_msg_and_die("syntax error");
+
+    if (v->type == integer)
+        printf("%" PF_REZ "d\n", PF_REZ_TYPE v->u.i);
+    else
+        puts(v->u.s);
+
+    fflush_stdout_and_exit(null(v));
+}

branches/stable/mindi-busybox/coreutils/false.c

@@ -11 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/false.html */
 
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int false_main(int ATTRIBUTE_UNUSED argc, char ATTRIBUTE_UNUSED **argv);
 int false_main(int ATTRIBUTE_UNUSED argc, char ATTRIBUTE_UNUSED **argv)
 {

branches/stable/mindi-busybox/coreutils/fold.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* fold -- wrap each input line to fit in specified width.
 
@@ -10 +11 @@
 */
 
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
 static unsigned long flags;
@@ -45 +39 @@
 }
 
+int fold_main(int argc, char **argv);
 int fold_main(int argc, char **argv)
 {
+    char *line_out = NULL;
+    int allocated_out = 0;
     char *w_opt;
     int width = 80;
@@ -52 +49 @@
     int errs = 0;
 
-    if(!ENABLE_DEBUG_YANK_SUSv2) {
+    if (ENABLE_INCLUDE_SUSv2) {
         /* Turn any numeric options into -w options.  */
         for (i = 1; i < argc; i++) {
@@ -61 +58 @@
                     break;
                 if (isdigit(*a)) {
-                    argv[i] = bb_xasprintf("-w%s", a);
+                    argv[i] = xasprintf("-w%s", a);
                 }
             }
@@ -67 +64 @@
     }
 
-    flags = bb_getopt_ulflags(argc, argv, "bsw:", &w_opt);
+    flags = getopt32(argv, "bsw:", &w_opt);
     if (flags & FLAG_WIDTH)
-        width = bb_xgetlarg(w_opt, 10, 1, 10000);
+        width = xatoul_range(w_opt, 1, 10000);
 
     argv += optind;
     if (!*argv) {
-        *--argv = "-";
+        *--argv = (char*)"-";
     }
 
     do {
-        FILE *istream = bb_wfopen_input(*argv);
+        FILE *istream = fopen_or_warn_stdin(*argv);
         int c;
         int column = 0;     /* Screen column where next char will go. */
         int offset_out = 0; /* Index in `line_out' for next char. */
-        static char *line_out = NULL;
-        static int allocated_out = 0;
 
         if (istream == NULL) {
@@ -101 +96 @@
                 continue;
             }
-
-rescan:
+ rescan:
             column = adjust_column(column, c);
 
@@ -151 +145 @@
         }
 
-        if (ferror(istream) || bb_fclose_nonstdin(istream)) {
+        if (ferror(istream) || fclose_if_not_stdin(istream)) {
             bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */
             errs |= EXIT_FAILURE;
@@ -157 +151 @@
     } while (*++argv);
 
-    bb_fflush_stdout_and_exit(errs);
+    fflush_stdout_and_exit(errs);
 }
-/* vi: set sw=4 ts=4: */

branches/stable/mindi-busybox/coreutils/head.c

@@ -12 +12 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <ctype.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-static const char head_opts[] =
+static const char head_opts[] ALIGN1 =
     "n:"
 #if ENABLE_FEATURE_FANCY_HEAD
@@ -31 +26 @@
     { "k", 1024 },
     { "m", 1024*1024 },
-    { NULL, 0 }
+    { }
 };
 #endif
-                                        
-static const char header_fmt_str[] = "\n==> %s <==\n";
 
+static const char header_fmt_str[] ALIGN1 = "\n==> %s <==\n";
+
+int head_main(int argc, char **argv);
 int head_main(int argc, char **argv)
 {
@@ -53 +49 @@
     int retval = EXIT_SUCCESS;
 
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
     /* Allow legacy syntax of an initial numeric option without -n. */
-    if ((argc > 1) && (argv[1][0] == '-')
-        /* && (isdigit)(argv[1][1]) */
-        && (((unsigned int)(argv[1][1] - '0')) <= 9)
+    if (argc > 1 && argv[1][0] == '-'
+     && isdigit(argv[1][1])
     ) {
         --argc;
@@ -66 +61 @@
 #endif
 
-    /* No size benefit in converting this to bb_getopt_ulflags */
+    /* No size benefit in converting this to getopt32 */
     while ((opt = getopt(argc, argv, head_opts)) > 0) {
-        switch(opt) {
+        switch (opt) {
 #if ENABLE_FEATURE_FANCY_HEAD
-            case 'q':
-                header_threshhold = INT_MAX;
-                break;
-            case 'v':
-                header_threshhold = -1;
-                break;
-            case 'c':
-                count_bytes = 1;
-                /* fall through */
+        case 'q':
+            header_threshhold = INT_MAX;
+            break;
+        case 'v':
+            header_threshhold = -1;
+            break;
+        case 'c':
+            count_bytes = 1;
+            /* fall through */
 #endif
-            case 'n':
-                p = optarg;
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
-            GET_COUNT:
+        case 'n':
+            p = optarg;
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
+ GET_COUNT:
 #endif
 
 #if !ENABLE_FEATURE_FANCY_HEAD
-                count = bb_xgetularg10(p);
+            count = xatoul(p);
 #else
-                count = bb_xgetularg_bnd_sfx(p, 10, 
-                                0, ULONG_MAX, 
-                                head_suffixes);
+            count = xatoul_sfx(p, head_suffixes);
 #endif
-                break;
-            default:
-                bb_show_usage();
+            break;
+        default:
+            bb_show_usage();
         }
     }
@@ -101 +94 @@
     argv += optind;
     if (!*argv) {
-        *--argv = "-";
+        *--argv = (char*)"-";
     }
 
@@ -120 +113 @@
 
     do {
-        if ((fp = bb_wfopen_input(*argv)) != NULL) {
+        fp = fopen_or_warn_stdin(*argv);
+        if (fp) {
             if (fp == stdin) {
                 *argv = (char *) bb_msg_standard_input;
             }
             if (header_threshhold) {
-                bb_printf(fmt, *argv);
+                printf(fmt, *argv);
             }
             i = count;
@@ -134 +128 @@
                 putchar(c);
             }
-            if (bb_fclose_nonstdin(fp)) {
+            if (fclose_if_not_stdin(fp)) {
                 bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */
                 retval = EXIT_FAILURE;
             }
-            bb_xferror_stdout();
+            die_if_ferror_stdout();
         }
         fmt = header_fmt_str;
     } while (*++argv);
 
-    bb_fflush_stdout_and_exit(retval);
+    fflush_stdout_and_exit(retval);
 }

branches/stable/mindi-busybox/coreutils/hostid.c

@@ -10 +10 @@
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int hostid_main(int argc, char ATTRIBUTE_UNUSED **argv);
 int hostid_main(int argc, char ATTRIBUTE_UNUSED **argv)
 {
@@ -20 +21 @@
     }
 
-    bb_printf("%lx\n", gethostid());
+    printf("%lx\n", gethostid());
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    return fflush(stdout);
 }

branches/stable/mindi-busybox/coreutils/id.c

@@ -11 +11 @@
 /* Hacked by Tito Ragusa (C) 2004 to handle usernames of whatever length and to
  * be more similar to GNU id.
+ * -Z option support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
  */
 
-#include "busybox.h"
-#include "pwd_.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#ifdef CONFIG_SELINUX
-#include <selinux/selinux.h>          /* for is_selinux_enabled() */
-#endif
+#include "libbb.h"
 
 #define PRINT_REAL        1
@@ -27 +20 @@
 #define JUST_USER         4
 #define JUST_GROUP        8
+#if ENABLE_SELINUX
+#define JUST_CONTEXT     16
+#endif
 
-static short printf_full(unsigned int id, const char *arg, const char prefix)
+static int printf_full(unsigned int id, const char *arg, const char prefix)
 {
     const char *fmt = "%cid=%u";
-    short status=EXIT_FAILURE;
+    int status = EXIT_FAILURE;
 
-    if(arg) {
+    if (arg) {
         fmt = "%cid=%u(%s)";
-        status=EXIT_SUCCESS;
+        status = EXIT_SUCCESS;
     }
-    bb_printf(fmt, prefix, id, arg);
+    printf(fmt, prefix, id, arg);
     return status;
 }
 
+int id_main(int argc, char **argv);
 int id_main(int argc, char **argv)
 {
@@ -48 +45 @@
     unsigned long flags;
     short status;
-
+#if ENABLE_SELINUX
+    security_context_t scontext;
+#endif
     /* Don't allow -n -r -nr -ug -rug -nug -rnug */
     /* Don't allow more than one username */
-    bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug";
-    flags = bb_getopt_ulflags(argc, argv, "rnug");
+    opt_complementary = "?1:u--g:g--u:r?ug:n?ug" USE_SELINUX(":u--Z:Z--u:g--Z:Z--g");
+    flags = getopt32(argv, "rnug" USE_SELINUX("Z"));
 
     /* This values could be overwritten later */
@@ -62 +61 @@
     }
 
-    if(argv[optind]) {
-        p=getpwnam(argv[optind]);
-        /* bb_xgetpwnam is needed because it exits on failure */
-        uid = bb_xgetpwnam(argv[optind]);
+    if (argv[optind]) {
+        p = getpwnam(argv[optind]);
+        /* xuname2uid is needed because it exits on failure */
+        uid = xuname2uid(argv[optind]);
         gid = p->pw_gid;
         /* in this case PRINT_REAL is the same */
     }
 
-    if(flags & (JUST_GROUP | JUST_USER)) {
+    if (flags & (JUST_GROUP | JUST_USER USE_SELINUX(| JUST_CONTEXT))) {
         /* JUST_GROUP and JUST_USER are mutually exclusive */
-        if(flags & NAME_NOT_NUMBER) {
-            /* bb_getpwuid and bb_getgrgid exit on failure so puts cannot segfault */
-            puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 ));
+        if (flags & NAME_NOT_NUMBER) {
+            /* bb_getXXXid(-1) exit on failure, puts cannot segfault */
+            puts((flags & JUST_USER) ? bb_getpwuid(NULL, -1, uid) : bb_getgrgid(NULL, -1, gid));
         } else {
-            bb_printf("%u\n",(flags & JUST_USER) ? uid : gid);
+            if (flags & JUST_USER) {
+                printf("%u\n", uid);
+            }
+            if (flags & JUST_GROUP) {
+                printf("%u\n", gid);
+            }
         }
+
+#if ENABLE_SELINUX
+        if (flags & JUST_CONTEXT) {
+            selinux_or_die();
+            if (argc - optind == 1) {
+                bb_error_msg_and_die("user name can't be passed with -Z");
+            }
+
+            if (getcon(&scontext)) {
+                bb_error_msg_and_die("can't get process context");
+            }
+            printf("%s\n", scontext);
+        }
+#endif
         /* exit */
-        bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit(EXIT_SUCCESS);
     }
 
     /* Print full info like GNU id */
-    /* bb_getpwuid doesn't exit on failure here */
-    status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
+    /* bb_getpwuid(0) doesn't exit on failure (returns NULL) */
+    status = printf_full(uid, bb_getpwuid(NULL, 0, uid), 'u');
     putchar(' ');
-    /* bb_getgrgid doesn't exit on failure here */
-    status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
+    status |= printf_full(gid, bb_getgrgid(NULL, 0, gid), 'g');
 
-#ifdef CONFIG_SELINUX
-    if ( is_selinux_enabled() ) {
-            security_context_t mysid;
-            char context[80];
-            int len = sizeof(context);
+#if ENABLE_SELINUX
+    if (is_selinux_enabled()) {
+        security_context_t mysid;
+        const char *context;
 
-            getcon(&mysid);
-            context[0] = '\0';
-            if (mysid) {
-                    len = strlen(mysid)+1;
-                    safe_strncpy(context, mysid, len);
-                    freecon(mysid);
-            }else{
-                    safe_strncpy(context, "unknown",8);
-            }
-        bb_printf(" context=%s", context);
+        context = "unknown";
+        getcon(&mysid);
+        if (mysid) {
+            context = alloca(strlen(mysid) + 1);
+            strcpy((char*)context, mysid);
+            freecon(mysid);
+        }
+        printf(" context=%s", context);
     }
 #endif
 
     putchar('\n');
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }

branches/stable/mindi-busybox/coreutils/install.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
- *  Copyright (C) 2003 by Glenn McGrath <bug1@iinet.net.au>
+ * Copyright (C) 2003 by Glenn McGrath
+ * SELinux support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * TODO: -d option, need a way of recursively making directories and changing
@@ -21 +10 @@
  */
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include <libgen.h>
 #include <getopt.h> /* struct option */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
-#define INSTALL_OPT_CMD 1
-#define INSTALL_OPT_DIRECTORY   2
-#define INSTALL_OPT_PRESERVE_TIME   4
-#define INSTALL_OPT_STRIP   8
-#define INSTALL_OPT_GROUP  16
-#define INSTALL_OPT_MODE  32
-#define INSTALL_OPT_OWNER  64
-
 #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
-static const struct option install_long_options[] = {
-    { "directory",  0,  NULL,   'd' },
-    { "preserve-timestamps",    0,  NULL,   'p' },
-    { "strip",  0,  NULL,   's' },
-    { "group",  0,  NULL,   'g' },
-    { "mode",   0,  NULL,   'm' },
-    { "owner",  0,  NULL,   'o' },
-    { 0,    0,  0,  0 }
-};
-#endif
-
+static const char install_longopts[] ALIGN1 =
+    "directory\0"           No_argument       "d"
+    "preserve-timestamps\0" No_argument       "p"
+    "strip\0"               No_argument       "s"
+    "group\0"               No_argument       "g"
+    "mode\0"                No_argument       "m"
+    "owner\0"               No_argument       "o"
+/* autofs build insists of using -b --suffix=.orig */
+/* TODO? (short option for --suffix is -S) */
+#if ENABLE_SELINUX
+    "context\0"             Required_argument "Z"
+    "preserve_context\0"    No_argument       "\xff"
+    "preserve-context\0"    No_argument       "\xff"
+#endif
+    ;
+#endif
+
+
+#if ENABLE_SELINUX
+static void setdefaultfilecon(const char *path)
+{
+    struct stat s;
+    security_context_t scontext = NULL;
+
+    if (!is_selinux_enabled()) {
+        return;
+    }
+    if (lstat(path, &s) != 0) {
+        return;
+    }
+
+    if (matchpathcon(path, s.st_mode, &scontext) < 0) {
+        goto out;
+    }
+    if (strcmp(scontext, "<<none>>") == 0) {
+        goto out;
+    }
+
+    if (lsetfilecon(path, scontext) < 0) {
+        if (errno != ENOTSUP) {
+            bb_perror_msg("warning: failed to change context of %s to %s", path, scontext);
+        }
+    }
+
+ out:
+    freecon(scontext);
+}
+
+#endif
+
+int install_main(int argc, char **argv);
 int install_main(int argc, char **argv)
 {
+    struct stat statbuf;
     mode_t mode;
     uid_t uid;
     gid_t gid;
-    char *gid_str = "-1";
-    char *uid_str = "-1";
-    char *mode_str = "0755";
+    char *arg, *last;
+    const char *gid_str;
+    const char *uid_str;
+    const char *mode_str;
     int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
-    int ret = EXIT_SUCCESS, flags, i, isdir;
+    int flags;
+    int ret = EXIT_SUCCESS;
+    int isdir;
+#if ENABLE_SELINUX
+    security_context_t scontext;
+    bool use_default_selinux_context = 1;
+#endif
+    enum {
+        OPT_c             = 1 << 0,
+        OPT_v             = 1 << 1,
+        OPT_b             = 1 << 2,
+        OPT_DIRECTORY     = 1 << 3,
+        OPT_PRESERVE_TIME = 1 << 4,
+        OPT_STRIP         = 1 << 5,
+        OPT_GROUP         = 1 << 6,
+        OPT_MODE          = 1 << 7,
+        OPT_OWNER         = 1 << 8,
+#if ENABLE_SELINUX
+        OPT_SET_SECURITY_CONTEXT = 1 << 9,
+        OPT_PRESERVE_SECURITY_CONTEXT = 1 << 10,
+#endif
+    };
 
 #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
-    bb_applet_long_options = install_long_options;
-#endif
-    bb_opt_complementally = "?:s--d:d--s";
-    /* -c exists for backwards compatibility, its needed */
-    flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str); /* 'a' must be 2nd */
+    applet_long_options = install_longopts;
+#endif
+    opt_complementary = "s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z");
+    /* -c exists for backwards compatibility, it's needed */
+    /* -v is ignored ("print name of each created directory") */
+    /* -b is ignored ("make a backup of each existing destination file") */
+    flags = getopt32(argv, "cvb" "dpsg:m:o:" USE_SELINUX("Z:"),
+            &gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext));
+    argc -= optind;
+    argv += optind;
+
+#if ENABLE_SELINUX
+    if (flags & (OPT_PRESERVE_SECURITY_CONTEXT|OPT_SET_SECURITY_CONTEXT)) {
+        selinux_or_die();
+        use_default_selinux_context = 0;
+        if (flags & OPT_PRESERVE_SECURITY_CONTEXT) {
+            copy_flags |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
+        }
+        if (flags & OPT_SET_SECURITY_CONTEXT) {
+            setfscreatecon_or_die(scontext);
+            copy_flags |= FILEUTILS_SET_SECURITY_CONTEXT;
+        }
+    }
+#endif
 
     /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
-    if (flags & INSTALL_OPT_PRESERVE_TIME) {
+    if (flags & OPT_PRESERVE_TIME) {
         copy_flags |= FILEUTILS_PRESERVE_STATUS;
     }
-    bb_parse_mode(mode_str, &mode);
-    gid = get_ug_id(gid_str, bb_xgetgrnam);
-    uid = get_ug_id(uid_str, bb_xgetpwnam);
-    umask(0);
+    mode = 0666;
+    if (flags & OPT_MODE)
+        bb_parse_mode(mode_str, &mode);
+    uid = (flags & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
+    gid = (flags & OPT_GROUP) ? get_ug_id(gid_str, xgroup2gid) : getgid();
+    if (flags & (OPT_OWNER|OPT_GROUP))
+        umask(0);
 
     /* Create directories
-     * dont use bb_make_directory() as it cant change uid or gid
+     * don't use bb_make_directory() as it can't change uid or gid
      * perhaps bb_make_directory() should be improved.
      */
-    if (flags & INSTALL_OPT_DIRECTORY) {
-        for (argv += optind; *argv; argv++) {
-            char *old_argv_ptr = *argv + 1;
-            char *argv_ptr;
-            do {
-                argv_ptr = strchr(old_argv_ptr, '/');
-                old_argv_ptr = argv_ptr;
-                if (argv_ptr) {
-                    *argv_ptr = '\0';
-                    old_argv_ptr++;
-                }
-                if (mkdir(*argv, mode) == -1) {
+    if (flags & OPT_DIRECTORY) {
+        while ((arg = *argv++) != NULL) {
+            char *slash = arg;
+            while (1) {
+                slash = strchr(slash + 1, '/');
+                if (slash)
+                    *slash = '\0';
+                if (mkdir(arg, mode | 0111) == -1) {
                     if (errno != EEXIST) {
-                        bb_perror_msg("coulnt create %s", *argv);
+                        bb_perror_msg("cannot create %s", arg);
                         ret = EXIT_FAILURE;
                         break;
                     }
-                }
-                else if (lchown(*argv, uid, gid) == -1) {
-                    bb_perror_msg("cannot change ownership of %s", *argv);
+                } /* dir was created, chown? */
+                else if ((flags & (OPT_OWNER|OPT_GROUP))
+                 && lchown(arg, uid, gid) == -1
+                ) {
+                    bb_perror_msg("cannot change ownership of %s", arg);
                     ret = EXIT_FAILURE;
                     break;
                 }
-                if (argv_ptr) {
-                    *argv_ptr = '/';
-                }
-            } while (old_argv_ptr);
-        }
-        return(ret);
-    }
-
-    {
-        struct stat statbuf;
-        isdir = lstat(argv[argc - 1], &statbuf)<0
-                    ? 0 : S_ISDIR(statbuf.st_mode);
-    }
-    for (i = optind; i < argc - 1; i++) {
-        char *dest;
-
-        dest = argv[argc - 1];
-        if (isdir) dest = concat_path_file(argv[argc - 1], basename(argv[i]));
-        ret |= copy_file(argv[i], dest, copy_flags);
+                if (!slash)
+                    break;
+                *slash = '/';
+            }
+        }
+        return ret;
+    }
+
+    if (argc < 2)
+        bb_show_usage();
+
+    last = argv[argc - 1];
+    argv[argc - 1] = NULL;
+    /* coreutils install resolves link in this case, don't use lstat */
+    isdir = stat(last, &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode);
+
+    while ((arg = *argv++) != NULL) {
+        char *dest = last;
+        if (isdir)
+            dest = concat_path_file(last, basename(arg));
+        if (copy_file(arg, dest, copy_flags)) {
+            /* copy is not made */
+            ret = EXIT_FAILURE;
+            goto next;
+        }
 
         /* Set the file mode */
-        if (chmod(dest, mode) == -1) {
+        if ((flags & OPT_MODE) && chmod(dest, mode) == -1) {
             bb_perror_msg("cannot change permissions of %s", dest);
             ret = EXIT_FAILURE;
         }
-
+#if ENABLE_SELINUX
+        if (use_default_selinux_context)
+            setdefaultfilecon(dest);
+#endif
         /* Set the user and group id */
-        if (lchown(dest, uid, gid) == -1) {
+        if ((flags & (OPT_OWNER|OPT_GROUP))
+         && lchown(dest, uid, gid) == -1
+        ) {
             bb_perror_msg("cannot change ownership of %s", dest);
             ret = EXIT_FAILURE;
         }
-        if (flags & INSTALL_OPT_STRIP) {
-            if (execlp("strip", "strip", dest, NULL) == -1) {
-                bb_error_msg("strip failed");
+        if (flags & OPT_STRIP) {
+            char *args[3];
+            args[0] = (char*)"strip";
+            args[1] = dest;
+            args[2] = NULL;
+            if (spawn_and_wait(args)) {
+                bb_perror_msg("strip");
                 ret = EXIT_FAILURE;
             }
         }
-        if(ENABLE_FEATURE_CLEAN_UP && isdir) free(dest);
-    }
-
-    return(ret);
+ next:
+        if (ENABLE_FEATURE_CLEAN_UP && isdir)
+            free(dest);
+    }
+
+    return ret;
 }

branches/stable/mindi-busybox/coreutils/length.c

@@ -3 +3 @@
 /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int length_main(int argc, char **argv);
 int length_main(int argc, char **argv)
 {
-    if ((argc != 2) ||  (**(++argv) == '-')) {
-        bb_show_usage();
+    if ((argc != 2) || (**(++argv) == '-')) {
+        bb_show_usage();
     }
 
-    bb_printf("%lu\n", (unsigned long)strlen(*argv));
+    printf("%u\n", (unsigned)strlen(*argv));
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    return fflush(stdout);
 }

branches/stable/mindi-busybox/coreutils/libcoreutils/coreutils.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
@@ -8 +9 @@
 typedef int (*stat_func)(const char *fn, struct stat *ps);
 
-extern int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf);
-extern int cp_mv_stat(const char *fn, struct stat *fn_stat);
+int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf);
+int cp_mv_stat(const char *fn, struct stat *fn_stat);
 
-extern mode_t getopt_mk_fifo_nod(int argc, char **argv);
+mode_t getopt_mk_fifo_nod(int argc, char **argv);
 
 #endif

branches/stable/mindi-busybox/coreutils/libcoreutils/cp_mv_stat.c

@@ -21 +21 @@
  */
 
-#include <errno.h>
-#include <sys/stat.h>
 #include "libbb.h"
 #include "coreutils.h"
@@ -30 +28 @@
     if (sf(fn, fn_stat) < 0) {
         if (errno != ENOENT) {
-            bb_perror_msg("unable to stat `%s'", fn);
+            bb_perror_msg("cannot stat '%s'", fn);
             return -1;
         }

branches/stable/mindi-busybox/coreutils/libcoreutils/getopt_mk_fifo_nod.c

@@ -21 +21 @@
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "libbb.h"
 #include "coreutils.h"
@@ -31 +28 @@
     mode_t mode = 0666;
     char *smode = NULL;
-
-    bb_getopt_ulflags(argc, argv, "m:", &smode);
-    if(smode) {
+#if ENABLE_SELINUX
+    security_context_t scontext;
+#endif
+    int opt;
+    opt = getopt32(argv, "m:" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext));
+    if (opt & 1) {
         if (bb_parse_mode(smode, &mode))
             umask(0);
     }
+
+#if ENABLE_SELINUX
+    if (opt & 2) {
+        selinux_or_die();
+        setfscreatecon_or_die(scontext);
+    }
+#endif
+
     return mode;
 }

branches/stable/mindi-busybox/coreutils/ln.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -25 +12 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
 
 #define LN_SYMLINK          1
@@ -37 +23 @@
 #define LN_SUFFIX           16
 
+int ln_main(int argc, char **argv);
 int ln_main(int argc, char **argv)
 {
@@ -44 +31 @@
     char *src_name;
     char *src;
-    char *suffix = "~";
+    char *suffix = (char*)"~";
     struct stat statbuf;
     int (*link_func)(const char *, const char *);
 
-    flag = bb_getopt_ulflags(argc, argv, "sfnbS:", &suffix);
+    flag = getopt32(argv, "sfnbS:", &suffix);
 
     if (argc == optind) {
@@ -59 +46 @@
     if (argc == optind + 1) {
         *--argv = last;
-        last = bb_get_last_path_component(bb_xstrdup(last));
+        last = bb_get_last_path_component(xstrdup(last));
     }
 
@@ -67 +54 @@
 
         if (is_directory(src,
-                         (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
-                         NULL)) {
-            src_name = bb_xstrdup(*argv);
+                        (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
+                        NULL)
+        ) {
+            src_name = xstrdup(*argv);
             src = concat_path_file(src, bb_get_last_path_component(src_name));
             free(src_name);
@@ -75 +63 @@
         }
         if (!(flag & LN_SYMLINK) && stat(*argv, &statbuf)) {
-            bb_perror_msg("%s", *argv);
-            status = EXIT_FAILURE;
-            free(src_name);
-            continue;
+            // coreutils: "ln dangling_symlink new_hardlink" works
+            if (lstat(*argv, &statbuf) || !S_ISLNK(statbuf.st_mode)) {
+                bb_perror_msg("%s", *argv);
+                status = EXIT_FAILURE;
+                free(src_name);
+                continue;
+            }
         }
 
         if (flag & LN_BACKUP) {
-                char *backup;
-                backup = bb_xasprintf("%s%s", src, suffix);
-                if (rename(src, backup) < 0 && errno != ENOENT) {
-                        bb_perror_msg("%s", src);
-                        status = EXIT_FAILURE;
-                        free(backup);
-                        continue;
-                }
+            char *backup;
+            backup = xasprintf("%s%s", src, suffix);
+            if (rename(src, backup) < 0 && errno != ENOENT) {
+                bb_perror_msg("%s", src);
+                status = EXIT_FAILURE;
                 free(backup);
-                /*
-                 * When the source and dest are both hard links to the same
-                 * inode, a rename may succeed even though nothing happened.
-                 * Therefore, always unlink().
-                 */
-                unlink(src);
+                continue;
+            }
+            free(backup);
+            /*
+             * When the source and dest are both hard links to the same
+             * inode, a rename may succeed even though nothing happened.
+             * Therefore, always unlink().
+             */
+            unlink(src);
         } else if (flag & LN_FORCE) {
             unlink(src);

branches/stable/mindi-busybox/coreutils/logname.c

@@ -21 +21 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int logname_main(int argc, char ATTRIBUTE_UNUSED **argv);
 int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
 {
-    const char *p;
+    char buf[128];
 
     if (argc > 1) {
@@ -34 +34 @@
     }
 
-    if ((p = getlogin()) != NULL) {
-        puts(p);
-        bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    /* Using _r function - avoid pulling in static buffer from libc */
+    if (getlogin_r(buf, sizeof(buf)) == 0) {
+        puts(buf);
+        return fflush(stdout);
     }
 

branches/stable/mindi-busybox/coreutils/ls.c

@@ -30 +30 @@
  */
 
+#include <getopt.h>
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
+
 enum {
-    TERMINAL_WIDTH = 80,    /* use 79 if terminal has linefold bug */
-    COLUMN_GAP = 2,     /* includes the file type char */
-};
-
-/************************************************************************/
-
-#include "busybox.h"
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <getopt.h> /* struct option */
-#include <sys/ioctl.h>
-#include <sys/sysmacros.h>     /* major() and minor() */
-#include <time.h>
+
+TERMINAL_WIDTH  = 80,           /* use 79 if terminal has linefold bug */
+COLUMN_GAP      = 2,            /* includes the file type char */
 
 /* what is the overall style of the listing */
-#define STYLE_COLUMNS   (1U<<21)    /* fill columns */
-#define STYLE_LONG      (2U<<21)    /* one record per line, extended info */
-#define STYLE_SINGLE    (3U<<21)    /* one record per line */
-
-#define STYLE_MASK                 STYLE_SINGLE
-#define STYLE_ONE_RECORD_FLAG      STYLE_LONG
+STYLE_COLUMNS   = 1 << 21,      /* fill columns */
+STYLE_LONG      = 2 << 21,      /* one record per line, extended info */
+STYLE_SINGLE    = 3 << 21,      /* one record per line */
+STYLE_MASK      = STYLE_SINGLE,
 
 /* 51306 lrwxrwxrwx  1 root     root         2 May 11 01:43 /bin/view -> vi* */
 /* what file information will be listed */
-#define LIST_INO    (1U<<0)
-#define LIST_BLOCKS (1U<<1)
-#define LIST_MODEBITS   (1U<<2)
-#define LIST_NLINKS (1U<<3)
-#define LIST_ID_NAME    (1U<<4)
-#define LIST_ID_NUMERIC (1U<<5)
-#define LIST_CONTEXT    (1U<<6)
-#define LIST_SIZE   (1U<<7)
-#define LIST_DEV    (1U<<8)
-#define LIST_DATE_TIME  (1U<<9)
-#define LIST_FULLTIME   (1U<<10)
-#define LIST_FILENAME   (1U<<11)
-#define LIST_SYMLINK    (1U<<12)
-#define LIST_FILETYPE   (1U<<13)
-#define LIST_EXEC   (1U<<14)
-
-#define LIST_MASK       ((LIST_EXEC << 1) - 1)
+LIST_INO        = 1 << 0,
+LIST_BLOCKS     = 1 << 1,
+LIST_MODEBITS   = 1 << 2,
+LIST_NLINKS     = 1 << 3,
+LIST_ID_NAME    = 1 << 4,
+LIST_ID_NUMERIC = 1 << 5,
+LIST_CONTEXT    = 1 << 6,
+LIST_SIZE       = 1 << 7,
+LIST_DEV        = 1 << 8,
+LIST_DATE_TIME  = 1 << 9,
+LIST_FULLTIME   = 1 << 10,
+LIST_FILENAME   = 1 << 11,
+LIST_SYMLINK    = 1 << 12,
+LIST_FILETYPE   = 1 << 13,
+LIST_EXEC       = 1 << 14,
+LIST_MASK       = (LIST_EXEC << 1) - 1,
 
 /* what files will be displayed */
-#define DISP_DIRNAME    (1U<<15)    /* 2 or more items? label directories */
-#define DISP_HIDDEN (1U<<16)    /* show filenames starting with .  */
-#define DISP_DOT    (1U<<17)    /* show . and .. */
-#define DISP_NOLIST (1U<<18)    /* show directory as itself, not contents */
-#define DISP_RECURSIVE  (1U<<19)    /* show directory and everything below it */
-#define DISP_ROWS   (1U<<20)    /* print across rows */
-
-#define DISP_MASK       (((DISP_ROWS << 1) - 1) & ~(DISP_DIRNAME - 1))
-
-// CONFIG_FEATURE_LS_SORTFILES
-/* how will the files be sorted */
-#define SORT_ORDER_FORWARD   0      /* sort in reverse order */
-#define SORT_ORDER_REVERSE   (1U<<27)   /* sort in reverse order */
-
-#define SORT_NAME      0        /* sort by file name */
-#define SORT_SIZE      (1U<<28)     /* sort by file size */
-#define SORT_ATIME     (2U<<28)     /* sort by last access time */
-#define SORT_CTIME     (3U<<28)     /* sort by last change time */
-#define SORT_MTIME     (4U<<28)     /* sort by last modification time */
-#define SORT_VERSION   (5U<<28)     /* sort by version */
-#define SORT_EXT       (6U<<28)     /* sort by file name extension */
-#define SORT_DIR       (7U<<28)     /* sort by file or directory */
-
-#define SORT_MASK      (7U<<28)
+DISP_DIRNAME    = 1 << 15,      /* 2 or more items? label directories */
+DISP_HIDDEN     = 1 << 16,      /* show filenames starting with . */
+DISP_DOT        = 1 << 17,      /* show . and .. */
+DISP_NOLIST     = 1 << 18,      /* show directory as itself, not contents */
+DISP_RECURSIVE  = 1 << 19,      /* show directory and everything below it */
+DISP_ROWS       = 1 << 20,      /* print across rows */
+DISP_MASK       = ((DISP_ROWS << 1) - 1) & ~(DISP_DIRNAME - 1),
+
+/* how will the files be sorted (CONFIG_FEATURE_LS_SORTFILES) */
+SORT_FORWARD    = 0,            /* sort in reverse order */
+SORT_REVERSE    = 1 << 27,      /* sort in reverse order */
+
+SORT_NAME       = 0,            /* sort by file name */
+SORT_SIZE       = 1 << 28,      /* sort by file size */
+SORT_ATIME      = 2 << 28,      /* sort by last access time */
+SORT_CTIME      = 3 << 28,      /* sort by last change time */
+SORT_MTIME      = 4 << 28,      /* sort by last modification time */
+SORT_VERSION    = 5 << 28,      /* sort by version */
+SORT_EXT        = 6 << 28,      /* sort by file name extension */
+SORT_DIR        = 7 << 28,      /* sort by file or directory */
+SORT_MASK       = (7 << 28) * ENABLE_FEATURE_LS_SORTFILES,
 
 /* which of the three times will be used */
-#define TIME_CHANGE    ((1U<<23) * ENABLE_FEATURE_LS_TIMESTAMPS)
-#define TIME_ACCESS    ((1U<<24) * ENABLE_FEATURE_LS_TIMESTAMPS)
-#define TIME_MASK      ((3U<<23) * ENABLE_FEATURE_LS_TIMESTAMPS)
-
-#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-#define FOLLOW_LINKS   (1U<<25)
-#endif
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-#define LS_DISP_HR     (1U<<26)
-#endif
-
-#define LIST_SHORT  (LIST_FILENAME)
-#define LIST_ISHORT (LIST_INO | LIST_FILENAME)
-#define LIST_LONG   (LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
-                        LIST_DATE_TIME | LIST_FILENAME | LIST_SYMLINK)
-#define LIST_ILONG  (LIST_INO | LIST_LONG)
-
-#define SPLIT_DIR      1
-#define SPLIT_FILE     0
-#define SPLIT_SUBDIR   2
+TIME_CHANGE     = (1 << 23) * ENABLE_FEATURE_LS_TIMESTAMPS,
+TIME_ACCESS     = (1 << 24) * ENABLE_FEATURE_LS_TIMESTAMPS,
+TIME_MASK       = (3 << 23) * ENABLE_FEATURE_LS_TIMESTAMPS,
+
+FOLLOW_LINKS    = (1 << 25) * ENABLE_FEATURE_LS_FOLLOWLINKS,
+
+LS_DISP_HR      = (1 << 26) * ENABLE_FEATURE_HUMAN_READABLE,
+
+LIST_SHORT      = LIST_FILENAME,
+LIST_LONG       = LIST_MODEBITS | LIST_NLINKS | LIST_ID_NAME | LIST_SIZE | \
+                  LIST_DATE_TIME | LIST_FILENAME | LIST_SYMLINK,
+
+SPLIT_DIR       = 1,
+SPLIT_FILE      = 0,
+SPLIT_SUBDIR    = 2,
+
+};
 
 #define TYPEINDEX(mode) (((mode) >> 12) & 0x0f)
 #define TYPECHAR(mode)  ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)])
-
-#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
-# define APPCHAR(mode)   ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)])
-#endif
-
-/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
-#ifdef CONFIG_FEATURE_LS_COLOR
-
-static int show_color = 0;
-
-/* long option entry used only for --color, which has no short option
- * equivalent.  */
-static const struct option ls_color_opt[] =
-{
-    {"color", optional_argument, NULL, 1},
-    {NULL, 0, NULL, 0}
-};
-
+#define APPCHAR(mode)   ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)])
 #define COLOR(mode) ("\000\043\043\043\042\000\043\043"\
              "\000\000\044\000\043\000\000\040" [TYPEINDEX(mode)])
 #define ATTR(mode)  ("\00\00\01\00\01\00\01\00"\
              "\00\00\01\00\01\00\00\01" [TYPEINDEX(mode)])
+
+/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
+#if ENABLE_FEATURE_LS_COLOR
+static smallint show_color;
+/* long option entry used only for --color, which has no short option
+ * equivalent */
+static const char ls_color_opt[] ALIGN1 =
+    "color\0" Optional_argument "\xff" /* no short equivalent */
+    ;
+#else
+enum { show_color = 0 };
 #endif
 
@@ -153 +131 @@
  * a directory entry and its stat info are stored here
  */
-struct dnode {          /* the basic node */
-    char *name;     /* the dir entry name */
-    char *fullname;     /* the dir entry name */
+struct dnode {                  /* the basic node */
+    const char *name;             /* the dir entry name */
+    const char *fullname;         /* the dir entry name */
     int   allocated;
-    struct stat dstat;  /* the file stat info */
-#ifdef CONFIG_SELINUX
-    security_context_t sid;
-#endif
-    struct dnode *next; /* point at the next node */
+    struct stat dstat;      /* the file stat info */
+    USE_SELINUX(security_context_t sid;)
+    struct dnode *next;     /* point at the next node */
 };
 typedef struct dnode dnode_t;
@@ -169 +145 @@
 static int list_single(struct dnode *);
 
-static unsigned int all_fmt;
-
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-static int terminal_width = TERMINAL_WIDTH;
-static unsigned short tabstops = COLUMN_GAP;
+static unsigned all_fmt;
+
+#if ENABLE_FEATURE_AUTOWIDTH
+static unsigned tabstops = COLUMN_GAP;
+static unsigned terminal_width = TERMINAL_WIDTH;
 #else
-#define tabstops COLUMN_GAP
-#define terminal_width TERMINAL_WIDTH
+enum {
+    tabstops = COLUMN_GAP,
+    terminal_width = TERMINAL_WIDTH,
+};
 #endif
 
 static int status = EXIT_SUCCESS;
 
-static struct dnode *my_stat(char *fullname, char *name)
+static struct dnode *my_stat(const char *fullname, const char *name, int force_follow)
 {
     struct stat dstat;
     struct dnode *cur;
-#ifdef CONFIG_SELINUX
-    security_context_t sid=NULL;
-#endif
-
-#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-    if (all_fmt & FOLLOW_LINKS) {
-#ifdef CONFIG_SELINUX
+    USE_SELINUX(security_context_t sid = NULL;)
+
+    if ((all_fmt & FOLLOW_LINKS) || force_follow) {
+#if ENABLE_SELINUX
         if (is_selinux_enabled())  {
-             getfilecon(fullname,&sid);
+             getfilecon(fullname, &sid);
         }
 #endif
@@ -201 +176 @@
             return 0;
         }
-    } else
-#endif
-    {
-#ifdef CONFIG_SELINUX
-            if  (is_selinux_enabled())  {
-          lgetfilecon(fullname,&sid);
+    } else {
+#if ENABLE_SELINUX
+        if (is_selinux_enabled()) {
+            lgetfilecon(fullname, &sid);
         }
 #endif
@@ -216 +189 @@
     }
 
-    cur = (struct dnode *) xmalloc(sizeof(struct dnode));
+    cur = xmalloc(sizeof(struct dnode));
     cur->fullname = fullname;
     cur->name = name;
     cur->dstat = dstat;
-#ifdef CONFIG_SELINUX
-    cur->sid = sid;
-#endif
+    USE_SELINUX(cur->sid = sid;)
     return cur;
 }
 
-/*----------------------------------------------------------------------*/
-#ifdef CONFIG_FEATURE_LS_COLOR
+#if ENABLE_FEATURE_LS_COLOR
 static char fgcolor(mode_t mode)
 {
     /* Check wheter the file is existing (if so, color it red!) */
-    if (errno == ENOENT) {
+    if (errno == ENOENT)
         return '\037';
-    }
     if (S_ISREG(mode) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
         return COLOR(0xF000);   /* File is executable ... */
@@ -239 +208 @@
 }
 
-/*----------------------------------------------------------------------*/
 static char bgcolor(mode_t mode)
 {
@@ -248 +216 @@
 #endif
 
-/*----------------------------------------------------------------------*/
-#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined(CONFIG_FEATURE_LS_COLOR)
+#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
 static char append_char(mode_t mode)
 {
@@ -264 +231 @@
 #endif
 
-/*----------------------------------------------------------------------*/
-
-#define countdirs(A,B) count_dirs((A), (B), 1)
-#define countsubdirs(A,B) count_dirs((A), (B), 0)
-
+#define countdirs(A, B) count_dirs((A), (B), 1)
+#define countsubdirs(A, B) count_dirs((A), (B), 0)
 static int count_dirs(struct dnode **dn, int nfiles, int notsubdirs)
 {
     int i, dirs;
 
-    if (dn == NULL || nfiles < 1)
-        return (0);
+    if (!dn)
+        return 0;
     dirs = 0;
     for (i = 0; i < nfiles; i++) {
-        if (S_ISDIR(dn[i]->dstat.st_mode)
-            && (notsubdirs ||
-            ((dn[i]->name[0] != '.') || (dn[i]->name[1]
-                        && ((dn[i]->name[1] != '.')
-                        || dn[i]->name[2])))))
+        const char *name;
+        if (!S_ISDIR(dn[i]->dstat.st_mode))
+            continue;
+        name = dn[i]->name;
+        if (notsubdirs
+         || name[0]!='.' || (name[1] && (name[1]!='.' || name[2]))
+        ) {
             dirs++;
-    }
-    return (dirs);
+        }
+    }
+    return dirs;
 }
 
@@ -293 +260 @@
 
     if (dnp == NULL)
-        return (0);
+        return 0;
     nfiles = 0;
-    for (cur = dnp[0]; cur->next != NULL; cur = cur->next)
+    for (cur = dnp[0]; cur->next; cur = cur->next)
         nfiles++;
     nfiles++;
-    return (nfiles);
+    return nfiles;
 }
 
@@ -304 +271 @@
 static struct dnode **dnalloc(int num)
 {
-    struct dnode **p;
-
     if (num < 1)
-        return (NULL);
-
-    p = (struct dnode **) xcalloc((size_t) num, (size_t) (sizeof(struct dnode *)));
-    return (p);
-}
-
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
+        return NULL;
+
+    return xzalloc(num * sizeof(struct dnode *));
+}
+
+#if ENABLE_FEATURE_LS_RECURSIVE
 static void dfree(struct dnode **dnp, int nfiles)
 {
@@ -323 +287 @@
     for (i = 0; i < nfiles; i++) {
         struct dnode *cur = dnp[i];
-        if(cur->allocated)
-            free(cur->fullname);    /* free the filename */
+        if (cur->allocated)
+            free((char*)cur->fullname); /* free the filename */
         free(cur);      /* free the dnode */
     }
@@ -330 +294 @@
 }
 #else
-#define dfree(...)
+#define dfree(...) ((void)0)
 #endif
 
@@ -339 +303 @@
 
     if (dn == NULL || nfiles < 1)
-        return (NULL);
+        return NULL;
 
     /* count how many dirs and regular files there are */
@@ -356 +320 @@
     for (d = i = 0; i < nfiles; i++) {
         if (S_ISDIR(dn[i]->dstat.st_mode)) {
-            if (which & (SPLIT_DIR|SPLIT_SUBDIR)) {
-                if ((which & SPLIT_DIR)
-                    || ((dn[i]->name[0] != '.')
-                        || (dn[i]->name[1]
-                            && ((dn[i]->name[1] != '.')
-                                || dn[i]->name[2])))) {
-                                    dnp[d++] = dn[i];
-                                }
+            const char *name;
+            if (!(which & (SPLIT_DIR|SPLIT_SUBDIR)))
+                continue;
+            name = dn[i]->name;
+            if ((which & SPLIT_DIR)
+             || name[0]!='.' || (name[1] && (name[1]!='.' || name[2]))
+            ) {
+                dnp[d++] = dn[i];
             }
         } else if (!(which & (SPLIT_DIR|SPLIT_SUBDIR))) {
@@ -369 +333 @@
         }
     }
-    return (dnp);
-}
-
-/*----------------------------------------------------------------------*/
-#ifdef CONFIG_FEATURE_LS_SORTFILES
+    return dnp;
+}
+
+#if ENABLE_FEATURE_LS_SORTFILES
 static int sortcmp(const void *a, const void *b)
 {
     struct dnode *d1 = *(struct dnode **)a;
     struct dnode *d2 = *(struct dnode **)b;
-    unsigned int sort_opts = all_fmt & SORT_MASK;
+    unsigned sort_opts = all_fmt & SORT_MASK;
     int dif;
 
-    dif = 0;            /* assume SORT_NAME */
+    dif = 0; /* assume SORT_NAME */
+    // TODO: use pre-initialized function pointer
+    // instead of branch forest
     if (sort_opts == SORT_SIZE) {
         dif = (int) (d2->dstat.st_size - d1->dstat.st_size);
@@ -397 +362 @@
 
     if (dif == 0) {
-        /* sort by name- may be a tie_breaker for time or size cmp */
+        /* sort by name - may be a tie_breaker for time or size cmp */
         if (ENABLE_LOCALE_SUPPORT) dif = strcoll(d1->name, d2->name);
         else dif = strcmp(d1->name, d2->name);
     }
 
-    if (all_fmt & SORT_ORDER_REVERSE) {
+    if (all_fmt & SORT_REVERSE) {
         dif = -dif;
     }
-    return (dif);
-}
-
-/*----------------------------------------------------------------------*/
+    return dif;
+}
+
 static void dnsort(struct dnode **dn, int size)
 {
-    qsort(dn, size, sizeof *dn, sortcmp);
+    qsort(dn, size, sizeof(*dn), sortcmp);
 }
 #else
-#define sortcmp(a, b) 0
-#define dnsort(dn, size)
-#endif
-
-
-/*----------------------------------------------------------------------*/
+#define dnsort(dn, size) ((void)0)
+#endif
+
+
 static void showfiles(struct dnode **dn, int nfiles)
 {
@@ -430 +392 @@
         return;
 
-    if (all_fmt & STYLE_ONE_RECORD_FLAG) {
+    if (all_fmt & STYLE_LONG) {
         ncols = 1;
     } else {
-        /* find the longest file name-  use that as the column width */
+        /* find the longest file name, use that as the column width */
         for (i = 0; i < nfiles; i++) {
-            int len = strlen(dn[i]->name) +
-#ifdef CONFIG_SELINUX
-            ((all_fmt & LIST_CONTEXT) ? 33 : 0) +
-#endif
-            ((all_fmt & LIST_INO) ? 8 : 0) +
-            ((all_fmt & LIST_BLOCKS) ? 5 : 0);
+            int len = strlen(dn[i]->name);
             if (column_width < len)
                 column_width = len;
         }
-        column_width += tabstops;
+        column_width += tabstops +
+            USE_SELINUX( ((all_fmt & LIST_CONTEXT) ? 33 : 0) + )
+                         ((all_fmt & LIST_INO) ? 8 : 0) +
+                         ((all_fmt & LIST_BLOCKS) ? 5 : 0);
         ncols = (int) (terminal_width / column_width);
     }
@@ -450 +410 @@
     if (ncols > 1) {
         nrows = nfiles / ncols;
-        if ((nrows * ncols) < nfiles)
+        if (nrows * ncols < nfiles)
             nrows++;                /* round up fractionals */
     } else {
@@ -466 +426 @@
                 if (column > 0) {
                     nexttab -= column;
-                    while (nexttab--) {
-                        putchar(' ');
-                        column++;
-                    }
-            }
+                    printf("%*s", nexttab, "");
+                    column += nexttab;
+                }
                 nexttab = column + column_width;
                 column += list_single(dn[i]);
-        }
+            }
         }
         putchar('\n');
@@ -480 +438 @@
 }
 
-/*----------------------------------------------------------------------*/
+
 static void showdirs(struct dnode **dn, int ndirs, int first)
 {
@@ -494 +452 @@
         if (all_fmt & (DISP_DIRNAME | DISP_RECURSIVE)) {
             if (!first)
-                printf("\n");
+                puts("");
             first = 0;
             printf("%s:\n", dn[i]->fullname);
@@ -502 +460 @@
         if (nfiles > 0) {
             /* list all files at this level */
-            if (ENABLE_FEATURE_LS_SORTFILES) dnsort(subdnp, nfiles);
+            dnsort(subdnp, nfiles);
             showfiles(subdnp, nfiles);
             if (ENABLE_FEATURE_LS_RECURSIVE) {
@@ -510 +468 @@
                     dndirs = countsubdirs(subdnp, nfiles);
                     if (dndirs > 0) {
-                        if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnd, dndirs);
+                        dnsort(dnd, dndirs);
                         showdirs(dnd, dndirs, 0);
                         /* free the array of dnode pointers to the dirs */
@@ -523 +481 @@
 }
 
-/*----------------------------------------------------------------------*/
+
 static struct dnode **list_dir(const char *path)
 {
@@ -532 +490 @@
 
     if (path == NULL)
-        return (NULL);
+        return NULL;
 
     dn = NULL;
     nfiles = 0;
-    dir = bb_opendir(path);
+    dir = warn_opendir(path);
     if (dir == NULL) {
         status = EXIT_FAILURE;
-        return (NULL);  /* could not open the dir */
+        return NULL;    /* could not open the dir */
     }
     while ((entry = readdir(dir)) != NULL) {
@@ -546 +504 @@
         /* are we going to list the file- it may be . or .. or a hidden file */
         if (entry->d_name[0] == '.') {
-            if ((entry->d_name[1] == 0 || (
-                entry->d_name[1] == '.'
-                && entry->d_name[2] == 0))
-                    && !(all_fmt & DISP_DOT))
+            if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2]))
+             && !(all_fmt & DISP_DOT)
+            ) {
+                continue;
+            }
+            if (!(all_fmt & DISP_HIDDEN))
+                continue;
+        }
+        fullname = concat_path_file(path, entry->d_name);
+        cur = my_stat(fullname, bb_basename(fullname), 0);
+        if (!cur) {
+            free(fullname);
             continue;
-            if (!(all_fmt & DISP_HIDDEN))
-            continue;
-        }
-        fullname = concat_path_file(path, entry->d_name);
-        cur = my_stat(fullname, strrchr(fullname, '/') + 1);
-        if (!cur)
-            continue;
+        }
         cur->allocated = 1;
         cur->next = dn;
@@ -566 +526 @@
 
     /* now that we know how many files there are
-       ** allocate memory for an array to hold dnode pointers
+     * allocate memory for an array to hold dnode pointers
      */
     if (dn == NULL)
-        return (NULL);
+        return NULL;
     dnp = dnalloc(nfiles);
     for (i = 0, cur = dn; i < nfiles; i++) {
@@ -576 +536 @@
     }
 
-    return (dnp);
-}
-
-/*----------------------------------------------------------------------*/
+    return dnp;
+}
+
+
+#if ENABLE_FEATURE_LS_TIMESTAMPS
+/* Do time() just once. Saves one syscall per file for "ls -l" */
+/* Initialized in main() */
+static time_t current_time_t;
+#endif
+
 static int list_single(struct dnode *dn)
 {
     int i, column = 0;
 
-#ifdef CONFIG_FEATURE_LS_USERNAME
-    char scratch[16];
-#endif
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
+#if ENABLE_FEATURE_LS_TIMESTAMPS
     char *filetime;
     time_t ttime, age;
 #endif
-#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined (CONFIG_FEATURE_LS_COLOR)
+#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
     struct stat info;
     char append;
@@ -597 +560 @@
 
     if (dn->fullname == NULL)
-        return (0);
-
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
+        return 0;
+
+#if ENABLE_FEATURE_LS_TIMESTAMPS
     ttime = dn->dstat.st_mtime; /* the default time */
     if (all_fmt & TIME_ACCESS)
@@ -607 +570 @@
     filetime = ctime(&ttime);
 #endif
-#ifdef CONFIG_FEATURE_LS_FILETYPES
+#if ENABLE_FEATURE_LS_FILETYPES
     append = append_char(dn->dstat.st_mode);
 #endif
@@ -614 +577 @@
         switch (all_fmt & (1 << i)) {
         case LIST_INO:
-            column += printf("%7ld ", (long int) dn->dstat.st_ino);
+            column += printf("%7ld ", (long) dn->dstat.st_ino);
             break;
         case LIST_BLOCKS:
-#if _FILE_OFFSET_BITS == 64
-            column += printf("%4lld ", (long long)dn->dstat.st_blocks >> 1);
-#else
-            column += printf("%4ld ", dn->dstat.st_blocks >> 1);
-#endif
+            column += printf("%4"OFF_FMT"d ", (off_t) dn->dstat.st_blocks >> 1);
             break;
         case LIST_MODEBITS:
@@ -630 +589 @@
             break;
         case LIST_ID_NAME:
-#ifdef CONFIG_FEATURE_LS_USERNAME
-            bb_getpwuid(scratch, dn->dstat.st_uid, sizeof(scratch));
-            printf("%-8.8s ", scratch);
-            bb_getgrgid(scratch, dn->dstat.st_gid, sizeof(scratch));
-            printf("%-8.8s", scratch);
+#if ENABLE_FEATURE_LS_USERNAME
+            printf("%-8.8s %-8.8s",
+                get_cached_username(dn->dstat.st_uid),
+                get_cached_groupname(dn->dstat.st_gid));
             column += 17;
             break;
@@ -647 +605 @@
                        (int) minor(dn->dstat.st_rdev));
             } else {
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
                 if (all_fmt & LS_DISP_HR) {
                     column += printf("%9s ",
-                            make_human_readable_str(dn->dstat.st_size, 1, 0));
-                } else
-#endif
-                {
-#if _FILE_OFFSET_BITS == 64
-                    column += printf("%9lld ", (long long) dn->dstat.st_size);
-#else
-                    column += printf("%9ld ", dn->dstat.st_size);
-#endif
+                        make_human_readable_str(dn->dstat.st_size, 1, 0));
+                } else {
+                    column += printf("%9"OFF_FMT"d ", (off_t) dn->dstat.st_size);
                 }
             }
             break;
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
+#if ENABLE_FEATURE_LS_TIMESTAMPS
         case LIST_FULLTIME:
             printf("%24.24s ", filetime);
@@ -669 +620 @@
         case LIST_DATE_TIME:
             if ((all_fmt & LIST_FULLTIME) == 0) {
-                age = time(NULL) - ttime;
+                /* current_time_t ~== time(NULL) */
+                age = current_time_t - ttime;
                 printf("%6.6s ", filetime + 4);
                 if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
@@ -681 +633 @@
             break;
 #endif
-#ifdef CONFIG_SELINUX
+#if ENABLE_SELINUX
         case LIST_CONTEXT:
             {
@@ -688 +640 @@
 
                 if (dn->sid) {
-                  /*  I assume sid initilized with NULL  */
-                  len = strlen(dn->sid)+1;
-                  safe_strncpy(context, dn->sid, len);
-                  freecon(dn->sid);
-                }else {
-                  safe_strncpy(context, "unknown", 8);
+                    /* I assume sid initilized with NULL */
+                    len = strlen(dn->sid) + 1;
+                    safe_strncpy(context, dn->sid, len);
+                    freecon(dn->sid);
+                } else {
+                    safe_strncpy(context, "unknown", 8);
                 }
                 printf("%-32s ", context);
@@ -701 +653 @@
 #endif
         case LIST_FILENAME:
-#ifdef CONFIG_FEATURE_LS_COLOR
             errno = 0;
+#if ENABLE_FEATURE_LS_COLOR
             if (show_color && !lstat(dn->fullname, &info)) {
                 printf("\033[%d;%dm", bgcolor(info.st_mode),
-                       fgcolor(info.st_mode));
+                        fgcolor(info.st_mode));
             }
 #endif
             column += printf("%s", dn->name);
-#ifdef CONFIG_FEATURE_LS_COLOR
             if (show_color) {
                 printf("\033[0m");
             }
-#endif
             break;
         case LIST_SYMLINK:
             if (S_ISLNK(dn->dstat.st_mode)) {
-                char *lpath = xreadlink(dn->fullname);
-
-                if (lpath) {
-                    printf(" -> ");
-#if defined(CONFIG_FEATURE_LS_FILETYPES) || defined (CONFIG_FEATURE_LS_COLOR)
-                    if (!stat(dn->fullname, &info)) {
-                        append = append_char(info.st_mode);
-                    }
-#endif
-#ifdef CONFIG_FEATURE_LS_COLOR
-                    if (show_color) {
-                        errno = 0;
-                        printf("\033[%d;%dm", bgcolor(info.st_mode),
-                               fgcolor(info.st_mode));
-                    }
-#endif
-                    column += printf("%s", lpath) + 4;
-#ifdef CONFIG_FEATURE_LS_COLOR
-                    if (show_color) {
-                        printf("\033[0m");
-                    }
-#endif
-                    free(lpath);
+                char *lpath = xmalloc_readlink_or_warn(dn->fullname);
+                if (!lpath) break;
+                printf(" -> ");
+#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
+                if (!stat(dn->fullname, &info)) {
+                    append = append_char(info.st_mode);
                 }
-            }
-            break;
-#ifdef CONFIG_FEATURE_LS_FILETYPES
+#endif
+#if ENABLE_FEATURE_LS_COLOR
+                if (show_color) {
+                    errno = 0;
+                    printf("\033[%d;%dm", bgcolor(info.st_mode),
+                           fgcolor(info.st_mode));
+                }
+#endif
+                column += printf("%s", lpath) + 4;
+                if (show_color) {
+                    printf("\033[0m");
+                }
+                free(lpath);
+            }
+            break;
+#if ENABLE_FEATURE_LS_FILETYPES
         case LIST_FILETYPE:
-            if (append != '\0') {
-                printf("%1c", append);
+            if (append) {
+                putchar(append);
                 column++;
             }
@@ -756 +702 @@
     return column;
 }
-
-/*----------------------------------------------------------------------*/
 
 /* "[-]Cadil1", POSIX mandated options, busybox always supports */
@@ -767 +711 @@
 /* "[-]K", SELinux mandated options, busybox optionally supports */
 /* "[-]e", I think we made this one up */
-
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-# define LS_STR_TIMESTAMPS  "cetu"
-#else
-# define LS_STR_TIMESTAMPS  ""
-#endif
-
-#ifdef CONFIG_FEATURE_LS_FILETYPES
-# define LS_STR_FILETYPES   "Fp"
-#else
-# define LS_STR_FILETYPES   ""
-#endif
-
-#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-# define LS_STR_FOLLOW_LINKS    "L"
-#else
-# define LS_STR_FOLLOW_LINKS    ""
-#endif
-
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
-# define LS_STR_RECURSIVE   "R"
-#else
-# define LS_STR_RECURSIVE   ""
-#endif
-
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-# define LS_STR_HUMAN_READABLE  "h"
-#else
-# define LS_STR_HUMAN_READABLE  ""
-#endif
-
-#ifdef CONFIG_SELINUX
-# define LS_STR_SELINUX "K"
-#else
-# define LS_STR_SELINUX ""
-#endif
-
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-# define LS_STR_AUTOWIDTH   "T:w:"
-#else
-# define LS_STR_AUTOWIDTH   ""
-#endif
-
-static const char ls_options[]="Cadil1gnsxAk" \
-    LS_STR_TIMESTAMPS \
-    USE_FEATURE_LS_SORTFILES("SXrv") \
-    LS_STR_FILETYPES \
-    LS_STR_FOLLOW_LINKS \
-    LS_STR_RECURSIVE \
-    LS_STR_HUMAN_READABLE \
-    LS_STR_SELINUX \
-    LS_STR_AUTOWIDTH;
-
-#define LIST_MASK_TRIGGER   0
-#define STYLE_MASK_TRIGGER  STYLE_MASK
-#define SORT_MASK_TRIGGER   SORT_MASK
-#define DISP_MASK_TRIGGER   DISP_ROWS
+static const char ls_options[] ALIGN1 =
+    "Cadil1gnsxAk"
+    USE_FEATURE_LS_TIMESTAMPS("cetu")
+    USE_FEATURE_LS_SORTFILES("SXrv")
+    USE_FEATURE_LS_FILETYPES("Fp")
+    USE_FEATURE_LS_FOLLOWLINKS("L")
+    USE_FEATURE_LS_RECURSIVE("R")
+    USE_FEATURE_HUMAN_READABLE("h")
+    USE_SELINUX("K")
+    USE_FEATURE_AUTOWIDTH("T:w:")
+    USE_SELINUX("Z");
+
+enum {
+    LIST_MASK_TRIGGER   = 0,
+    STYLE_MASK_TRIGGER  = STYLE_MASK,
+    DISP_MASK_TRIGGER   = DISP_ROWS,
+    SORT_MASK_TRIGGER   = SORT_MASK,
+};
 
 static const unsigned opt_flags[] = {
-    LIST_SHORT | STYLE_COLUMNS, /* C */
-    DISP_HIDDEN | DISP_DOT,     /* a */
-    DISP_NOLIST,                /* d */
-    LIST_INO,                   /* i */
-    LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */
-    LIST_SHORT | STYLE_SINGLE,  /* 1 */
-    0,                          /* g - ingored */
-    LIST_ID_NUMERIC,            /* n */
-    LIST_BLOCKS,                /* s */
-    DISP_ROWS,                  /* x */
-    DISP_HIDDEN,                /* A */
-#ifdef CONFIG_SELINUX
-    LIST_CONTEXT,               /* k */
-#else
-    0,                          /* k - ingored */
-#endif
-#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
-    TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME),   /* c */
-    LIST_FULLTIME,              /* e */
-    ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME,   /* t */
-    TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME),   /* u */
-#endif
-#ifdef CONFIG_FEATURE_LS_SORTFILES
-    SORT_SIZE,                  /* S */
-    SORT_EXT,                   /* X */
-    SORT_ORDER_REVERSE,         /* r */
-    SORT_VERSION,               /* v */
-#endif
-#ifdef CONFIG_FEATURE_LS_FILETYPES
-    LIST_FILETYPE | LIST_EXEC,  /* F */
-    LIST_FILETYPE,              /* p */
-#endif
-#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
-    FOLLOW_LINKS,               /* L */
-#endif
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
-    DISP_RECURSIVE,             /* R */
-#endif
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    LS_DISP_HR,                 /* h */
-#endif
-#ifdef CONFIG_SELINUX
+    LIST_SHORT | STYLE_COLUMNS, /* C */
+    DISP_HIDDEN | DISP_DOT,     /* a */
+    DISP_NOLIST,                /* d */
+    LIST_INO,                   /* i */
+    LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */
+    LIST_SHORT | STYLE_SINGLE,  /* 1 */
+    0,                          /* g - ingored */
+    LIST_ID_NUMERIC,            /* n */
+    LIST_BLOCKS,                /* s */
+    DISP_ROWS,                  /* x */
+    DISP_HIDDEN,                /* A */
+    ENABLE_SELINUX * LIST_CONTEXT, /* k (ignored if !SELINUX) */
+#if ENABLE_FEATURE_LS_TIMESTAMPS
+    TIME_CHANGE | (ENABLE_FEATURE_LS_SORTFILES * SORT_CTIME),   /* c */
+    LIST_FULLTIME,              /* e */
+    ENABLE_FEATURE_LS_SORTFILES * SORT_MTIME,   /* t */
+    TIME_ACCESS | (ENABLE_FEATURE_LS_SORTFILES * SORT_ATIME),   /* u */
+#endif
+#if ENABLE_FEATURE_LS_SORTFILES
+    SORT_SIZE,                  /* S */
+    SORT_EXT,                   /* X */
+    SORT_REVERSE,               /* r */
+    SORT_VERSION,               /* v */
+#endif
+#if ENABLE_FEATURE_LS_FILETYPES
+    LIST_FILETYPE | LIST_EXEC,  /* F */
+    LIST_FILETYPE,              /* p */
+#endif
+#if ENABLE_FEATURE_LS_FOLLOWLINKS
+    FOLLOW_LINKS,               /* L */
+#endif
+#if ENABLE_FEATURE_LS_RECURSIVE
+    DISP_RECURSIVE,             /* R */
+#endif
+#if ENABLE_FEATURE_HUMAN_READABLE
+    LS_DISP_HR,                 /* h */
+#endif
+#if ENABLE_SELINUX
     LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
 #endif
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-       0, 0,                    /* T, w - ignored */
+#if ENABLE_FEATURE_AUTOWIDTH
+    0, 0,                       /* T, w - ignored */
+#endif
+#if ENABLE_SELINUX
+    LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */
 #endif
     (1U<<31)
@@ -877 +781 @@
 
 
-/*----------------------------------------------------------------------*/
-
+/* THIS IS A "SAFE" APPLET, main() MAY BE CALLED INTERNALLY FROM SHELL */
+/* BE CAREFUL! */
+
+int ls_main(int argc, char **argv);
 int ls_main(int argc, char **argv)
 {
@@ -886 +792 @@
     struct dnode *dn;
     struct dnode *cur;
-    long opt;
+    unsigned opt;
     int nfiles = 0;
     int dnfiles;
@@ -894 +800 @@
     int i;
     char **av;
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-    char *tabstops_str = NULL;
-    char *terminal_width_str = NULL;
-#endif
-#ifdef CONFIG_FEATURE_LS_COLOR
-    char *color_opt;
+    USE_FEATURE_AUTOWIDTH(char *tabstops_str = NULL;)
+    USE_FEATURE_AUTOWIDTH(char *terminal_width_str = NULL;)
+    USE_FEATURE_LS_COLOR(char *color_opt;)
+
+#if ENABLE_FEATURE_LS_TIMESTAMPS
+    time(&current_time_t);
 #endif
 
     all_fmt = LIST_SHORT |
-        (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_ORDER_FORWARD));
-
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-    /* Obtain the terminal width.  */
-    get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL);
+        (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_FORWARD));
+
+#if ENABLE_FEATURE_AUTOWIDTH
+    /* Obtain the terminal width */
+    get_terminal_width_height(STDIN_FILENO, &terminal_width, NULL);
     /* Go one less... */
     terminal_width--;
 #endif
 
-#ifdef CONFIG_FEATURE_LS_COLOR
-    bb_applet_long_options = ls_color_opt;
-#endif
-
     /* process options */
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-    opt = bb_getopt_ulflags(argc, argv, ls_options, &tabstops_str, &terminal_width_str
-#ifdef CONFIG_FEATURE_LS_COLOR
-        , &color_opt
-#endif
-        );
-    if (tabstops_str) {
-        tabstops = atoi(tabstops_str);
-    }
-    if (terminal_width_str) {
-        terminal_width = atoi(terminal_width_str);
-    }
+    USE_FEATURE_LS_COLOR(applet_long_options = ls_color_opt;)
+#if ENABLE_FEATURE_AUTOWIDTH
+    opt = getopt32(argv, ls_options, &tabstops_str, &terminal_width_str
+                USE_FEATURE_LS_COLOR(, &color_opt));
+    if (tabstops_str)
+        tabstops = xatou(tabstops_str);
+    if (terminal_width_str)
+        terminal_width = xatou(terminal_width_str);
 #else
-    opt = bb_getopt_ulflags(argc, argv, ls_options
-#ifdef CONFIG_FEATURE_LS_COLOR
-        , &color_opt
-#endif
-        );
+    opt = getopt32(argv, ls_options USE_FEATURE_LS_COLOR(, &color_opt));
 #endif
     for (i = 0; opt_flags[i] != (1U<<31); i++) {
         if (opt & (1 << i)) {
-            unsigned int flags = opt_flags[i];
-
-            if (flags & LIST_MASK_TRIGGER) {
+            unsigned flags = opt_flags[i];
+
+            if (flags & LIST_MASK_TRIGGER)
                 all_fmt &= ~LIST_MASK;
-            }
-            if (flags & STYLE_MASK_TRIGGER) {
+            if (flags & STYLE_MASK_TRIGGER)
                 all_fmt &= ~STYLE_MASK;
-            }
-            if (ENABLE_FEATURE_LS_SORTFILES && (flags & SORT_MASK_TRIGGER)) {
+            if (flags & SORT_MASK_TRIGGER)
                 all_fmt &= ~SORT_MASK;
-            }
-            if (flags & DISP_MASK_TRIGGER) {
+            if (flags & DISP_MASK_TRIGGER)
                 all_fmt &= ~DISP_MASK;
-            }
-            if (flags & TIME_MASK) {
+            if (flags & TIME_MASK)
                 all_fmt &= ~TIME_MASK;
-            }
-            if (flags & LIST_CONTEXT) {
+            if (flags & LIST_CONTEXT)
                 all_fmt |= STYLE_SINGLE;
-            }
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-            if (opt == 'l') {
-                all_fmt &= ~LS_DISP_HR;
-            }
-#endif
+            /* huh?? opt cannot be 'l' */
+            //if (LS_DISP_HR && opt == 'l')
+            //  all_fmt &= ~LS_DISP_HR;
             all_fmt |= flags;
         }
     }
 
-#ifdef CONFIG_FEATURE_LS_COLOR
-    {
-        /* find color bit value - last position for short getopt */
-
-#if CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
-        char *p;
-
-        if ((p = getenv ("LS_COLORS")) != NULL &&
-            (*p == '\0' || (strcmp(p, "none") == 0))) {
-            ;
-        } else if (isatty(STDOUT_FILENO)) {
+#if ENABLE_FEATURE_LS_COLOR
+    /* find color bit value - last position for short getopt */
+    if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && isatty(STDOUT_FILENO)) {
+        char *p = getenv("LS_COLORS");
+        /* LS_COLORS is unset, or (not empty && not "none") ? */
+        if (!p || (p[0] && strcmp(p, "none")))
             show_color = 1;
-        }
-#endif
-
-        if((opt & (1 << i))) {  /* next flag after short options */
-            if (color_opt == NULL || strcmp("always", color_opt) == 0)
-                show_color = 1;
-            else if (color_opt != NULL && strcmp("never", color_opt) == 0)
-                show_color = 0;
-            else if (color_opt != NULL && strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO))
-                show_color = 1;
-        }
+    }
+    if (opt & (1 << i)) {  /* next flag after short options */
+        if (!color_opt || !strcmp("always", color_opt))
+            show_color = 1;
+        else if (color_opt && !strcmp("never", color_opt))
+            show_color = 0;
+        else if (color_opt && !strcmp("auto", color_opt) && isatty(STDOUT_FILENO))
+            show_color = 1;
     }
 #endif
 
     /* sort out which command line options take precedence */
-#ifdef CONFIG_FEATURE_LS_RECURSIVE
-    if (all_fmt & DISP_NOLIST)
+    if (ENABLE_FEATURE_LS_RECURSIVE && (all_fmt & DISP_NOLIST))
         all_fmt &= ~DISP_RECURSIVE; /* no recurse if listing only dir */
-#endif
     if (ENABLE_FEATURE_LS_TIMESTAMPS && ENABLE_FEATURE_LS_SORTFILES) {
         if (all_fmt & TIME_CHANGE)
@@ -1006 +882 @@
     if ((all_fmt & STYLE_MASK) != STYLE_LONG) /* only for long list */
         all_fmt &= ~(LIST_ID_NUMERIC|LIST_FULLTIME|LIST_ID_NAME|LIST_ID_NUMERIC);
-#ifdef CONFIG_FEATURE_LS_USERNAME
-    if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
-        all_fmt &= ~LIST_ID_NAME;   /* don't list names if numeric uid */
-#endif
+    if (ENABLE_FEATURE_LS_USERNAME)
+        if ((all_fmt & STYLE_MASK) == STYLE_LONG && (all_fmt & LIST_ID_NUMERIC))
+            all_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */
 
     /* choose a display format */
@@ -1024 +899 @@
     ac = argc - optind; /* how many cmd line args are left */
     if (ac < 1) {
-        static const char * const dotdir[] = { "." };
+        static const char *const dotdir[] = { "." };
 
         av = (char **) dotdir;
@@ -1036 +911 @@
         all_fmt |= DISP_DIRNAME;    /* 2 or more items? label directories */
 
-    /* stuff the command line file names into an dnode array */
+    /* stuff the command line file names into a dnode array */
     dn = NULL;
     for (oi = 0; oi < ac; oi++) {
-        cur = my_stat(av[oi], av[oi]);
+        /* ls w/o -l follows links on command line */
+        cur = my_stat(av[oi], av[oi], !(all_fmt & STYLE_LONG));
         if (!cur)
             continue;
@@ -1049 +925 @@
 
     /* now that we know how many files there are
-       ** allocate memory for an array to hold dnode pointers
+     * allocate memory for an array to hold dnode pointers
      */
     dnp = dnalloc(nfiles);
@@ -1058 +934 @@
 
     if (all_fmt & DISP_NOLIST) {
-        if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnp, nfiles);
+        dnsort(dnp, nfiles);
         if (nfiles > 0)
             showfiles(dnp, nfiles);
@@ -1067 +943 @@
         dnfiles = nfiles - dndirs;
         if (dnfiles > 0) {
-            if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnf, dnfiles);
+            dnsort(dnf, dnfiles);
             showfiles(dnf, dnfiles);
             if (ENABLE_FEATURE_CLEAN_UP)
@@ -1073 +949 @@
         }
         if (dndirs > 0) {
-            if (ENABLE_FEATURE_LS_SORTFILES) dnsort(dnd, dndirs);
+            dnsort(dnd, dndirs);
             showdirs(dnd, dndirs, dnfiles == 0);
             if (ENABLE_FEATURE_CLEAN_UP)
@@ -1081 +957 @@
     if (ENABLE_FEATURE_CLEAN_UP)
         dfree(dnp, nfiles);
-    return (status);
-}
+    return status;
+}

branches/stable/mindi-busybox/coreutils/md5_sha1_sum.c

@@ -7 +7 @@
  */
 
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "busybox.h"
+#include "libbb.h"
 
 typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
@@ -25 +17 @@
 /* This might be useful elsewhere */
 static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
-                                      unsigned char hash_length)
+                unsigned hash_length)
 {
-    int x, len, max;
-    unsigned char *hex_value;
-
-    max = (hash_length * 2) + 2;
-    hex_value = xmalloc(max);
-    for (x = len = 0; x < hash_length; x++) {
-        len += snprintf((char*)(hex_value + len), max - len, "%02x", hash_value[x]);
-    }
-    return (hex_value);
+    /* xzalloc zero-terminates */
+    char *hex_value = xzalloc((hash_length * 2) + 1);
+    bin2hex(hex_value, (char*)hash_value, hash_length);
+    return hex_value;
 }
 
@@ -50 +37 @@
     void (*final)(void*, void*);
 
-    if (strcmp(filename, "-") == 0) {
-        src_fd = STDIN_FILENO;
-    } else if(0 > (src_fd = open(filename, O_RDONLY))) {
-        bb_perror_msg("%s", filename);
-        return NULL;
+    src_fd = STDIN_FILENO;
+    if (NOT_LONE_DASH(filename)) {
+        src_fd = open_or_warn(filename, O_RDONLY);
+        if (src_fd < 0) {
+            return NULL;
+        }
     }
 
@@ -72 +60 @@
     }
 
-    while (0 < (count = read(src_fd, in_buf, 4096))) {
+    while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
         update(in_buf, count, &context);
     }
@@ -90 +78 @@
 }
 
-/* This could become a common function for md5 as well, by using md5_stream */
-static int hash_files(int argc, char **argv, hash_algo_t hash_algo)
+int md5_sha1_sum_main(int argc, char **argv);
+int md5_sha1_sum_main(int argc, char **argv)
 {
     int return_value = EXIT_SUCCESS;
     uint8_t *hash_value;
-    unsigned int flags;
+    unsigned flags;
+    hash_algo_t hash_algo = ENABLE_MD5SUM
+        ? (ENABLE_SHA1SUM ? (applet_name[0] == 'm' ? HASH_MD5 : HASH_SHA1) : HASH_MD5)
+        : HASH_SHA1;
 
     if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
-        flags = bb_getopt_ulflags(argc, argv, "scw");
+        flags = getopt32(argv, "scw");
     else optind = 1;
 
@@ -104 +95 @@
         if (flags & FLAG_SILENT) {
             bb_error_msg_and_die
-                ("the -s option is meaningful only when verifying checksums");
+                ("-%c is meaningful only when verifying checksums", 's');
         } else if (flags & FLAG_WARN) {
             bb_error_msg_and_die
-                ("the -w option is meaningful only when verifying checksums");
+                ("-%c is meaningful only when verifying checksums", 'w');
         }
     }
 
     if (argc == optind) {
-        argv[argc++] = "-";
+        argv[argc++] = (char*)"-";
     }
 
-    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && flags & FLAG_CHECK) {
+    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) {
         FILE *pre_computed_stream;
         int count_total = 0;
@@ -127 +118 @@
         }
 
-        if (strcmp(file_ptr, "-") == 0) {
-            pre_computed_stream = stdin;
-        } else {
-            pre_computed_stream = bb_xfopen(file_ptr, "r");
+        pre_computed_stream = stdin;
+        if (NOT_LONE_DASH(file_ptr)) {
+            pre_computed_stream = xfopen(file_ptr, "r");
         }
 
-        while ((line = bb_get_chomped_line_from_file(pre_computed_stream)) != NULL) {
+        while ((line = xmalloc_getline(pre_computed_stream)) != NULL) {
             char *filename_ptr;
 
             count_total++;
             filename_ptr = strstr(line, "  ");
+            /* handle format for binary checksums */
+            if (filename_ptr == NULL) {
+                filename_ptr = strstr(line, " *");
+            }
             if (filename_ptr == NULL) {
                 if (flags & FLAG_WARN) {
-                    bb_error_msg("Invalid format");
+                    bb_error_msg("invalid format");
                 }
                 count_failed++;
@@ -169 +163 @@
                          count_failed, count_total);
         }
-        if (bb_fclose_nonstdin(pre_computed_stream) == EOF) {
-            bb_perror_msg_and_die("Couldnt close file %s", file_ptr);
+        /*
+        if (fclose_if_not_stdin(pre_computed_stream) == EOF) {
+            bb_perror_msg_and_die("cannot close file %s", file_ptr);
         }
+        */
     } else {
         while (optind < argc) {
@@ -185 +181 @@
         }
     }
-    return (return_value);
+    return return_value;
 }
-
-#ifdef CONFIG_MD5SUM
-int md5sum_main(int argc, char **argv)
-{
-    return (hash_files(argc, argv, HASH_MD5));
-}
-#endif
-
-#ifdef CONFIG_SHA1SUM
-int sha1sum_main(int argc, char **argv)
-{
-    return (hash_files(argc, argv, HASH_SHA1));
-}
-#endif

branches/stable/mindi-busybox/coreutils/mkdir.c

@@ -5 +5 @@
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -30 +17 @@
  */
 
-#include <stdlib.h>
-#include <unistd.h>
+/* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
+ */
+
 #include <getopt.h> /* struct option */
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
 
 #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-static const struct option mkdir_long_options[] = {
-    { "mode", 1, NULL, 'm' },
-    { "parents", 0, NULL, 'p' },
-    { 0, 0, 0, 0 }
-};
+static const char mkdir_longopts[] ALIGN1 =
+    "mode\0"    Required_argument "m"
+    "parents\0" No_argument       "p"
+#if ENABLE_SELINUX
+    "context\0" Required_argument "Z"
+#endif
+    ;
 #endif
 
-int mkdir_main (int argc, char **argv)
+int mkdir_main(int argc, char **argv);
+int mkdir_main(int argc, char **argv)
 {
     mode_t mode = (mode_t)(-1);
     int status = EXIT_SUCCESS;
     int flags = 0;
-    unsigned long opt;
+    unsigned opt;
     char *smode;
+#if ENABLE_SELINUX
+    security_context_t scontext;
+#endif
 
 #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-    bb_applet_long_options = mkdir_long_options;
+    applet_long_options = mkdir_longopts;
 #endif
-    opt = bb_getopt_ulflags(argc, argv, "m:p", &smode);
-    if(opt & 1) {
-            mode = 0777;
-        if (!bb_parse_mode (smode, &mode)) {
-            bb_error_msg_and_die ("invalid mode `%s'", smode);
+    opt = getopt32(argv, "m:p" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext));
+    if (opt & 1) {
+        mode = 0777;
+        if (!bb_parse_mode(smode, &mode)) {
+            bb_error_msg_and_die("invalid mode '%s'", smode);
         }
     }
-    if(opt & 2)
+    if (opt & 2)
         flags |= FILEUTILS_RECUR;
+#if ENABLE_SELINUX
+    if (opt & 4) {
+        selinux_or_die();
+        setfscreatecon_or_die(scontext);
+    }
+#endif
 
     if (optind == argc) {

branches/stable/mindi-busybox/coreutils/mkfifo.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/mkfifo.html */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
+int mkfifo_main(int argc, char **argv);
 int mkfifo_main(int argc, char **argv)
 {
@@ -37 +22 @@
     mode = getopt_mk_fifo_nod(argc, argv);
 
-    if (!*(argv += optind)) {
+    argv += optind;
+    if (!*argv) {
         bb_show_usage();
     }

branches/stable/mindi-busybox/coreutils/mknod.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 #include <sys/sysmacros.h>  // For makedev
-#include <unistd.h>
-#include "busybox.h"
+
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
-static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
+static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
 static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
 
+int mknod_main(int argc, char **argv);
 int mknod_main(int argc, char **argv)
 {
@@ -49 +34 @@
         dev = 0;
         if ((*name != 'p') && ((argc -= 2) == 2)) {
-            /* Autodetect what the system supports; thexe macros should
+            /* Autodetect what the system supports; these macros should
              * optimize out to two constants. */
-            dev = makedev(bb_xgetularg10_bnd(argv[2], 0, major(UINT_MAX)),
-                          bb_xgetularg10_bnd(argv[3], 0, minor(UINT_MAX)));
+            dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
+                          xatoul_range(argv[3], 0, minor(UINT_MAX)));
         }
 

branches/stable/mindi-busybox/coreutils/mv.c

@@ -4 +4 @@
  *
  * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
+ * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -28 +16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <dirent.h>
-#include <errno.h>
-#include <stdlib.h>
 #include <getopt.h> /* struct option */
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
 #if ENABLE_FEATURE_MV_LONG_OPTIONS
-static const struct option mv_long_options[] = {
-    { "interactive", 0, NULL, 'i' },
-    { "force", 0, NULL, 'f' },
-    { 0, 0, 0, 0 }
-};
+static const char mv_longopts[] ALIGN1 =
+    "interactive\0" No_argument "i"
+    "force\0"       No_argument "f"
+    ;
 #endif
 
@@ -47 +31 @@
 #define OPT_FILEUTILS_INTERACTIVE 2
 
-static const char fmt[] = "cannot overwrite %sdirectory with %sdirectory";
+static const char fmt[] ALIGN1 =
+    "cannot overwrite %sdirectory with %sdirectory";
 
+int mv_main(int argc, char **argv);
 int mv_main(int argc, char **argv)
 {
@@ -57 +43 @@
     int dest_exists;
     int status = 0;
+    int copy_flag = 0;
 
 #if ENABLE_FEATURE_MV_LONG_OPTIONS
-    bb_applet_long_options = mv_long_options;
+    applet_long_options = mv_longopts;
 #endif
-    bb_opt_complementally = "f-i:i-f";
-    flags = bb_getopt_ulflags(argc, argv, "fi");
+    opt_complementary = "f-i:i-f";
+    flags = getopt32(argv, "fi");
     if (optind + 2 > argc) {
         bb_show_usage();
@@ -71 +58 @@
 
     if (optind + 2 == argc) {
-        if ((dest_exists = cp_mv_stat(last, &dest_stat)) < 0) {
+        dest_exists = cp_mv_stat(last, &dest_stat);
+        if (dest_exists < 0) {
             return 1;
         }
@@ -83 +71 @@
     do {
         dest = concat_path_file(last, bb_get_last_path_component(*argv));
-
-        if ((dest_exists = cp_mv_stat(dest, &dest_stat)) < 0) {
+        dest_exists = cp_mv_stat(dest, &dest_stat);
+        if (dest_exists < 0) {
             goto RET_1;
         }
@@ -93 +81 @@
             ((access(dest, W_OK) < 0 && isatty(0)) ||
             (flags & OPT_FILEUTILS_INTERACTIVE))) {
-            if (fprintf(stderr, "mv: overwrite `%s'? ", dest) < 0) {
+            if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) {
                 goto RET_1; /* Ouch! fprintf failed! */
             }
@@ -106 +94 @@
             if (errno != EXDEV ||
                 (source_exists = cp_mv_stat(*argv, &source_stat)) < 1) {
-                bb_perror_msg("unable to rename `%s'", *argv);
+                bb_perror_msg("cannot rename '%s'", *argv);
             } else {
                 if (dest_exists) {
@@ -121 +109 @@
                     }
                     if (unlink(dest) < 0) {
-                        bb_perror_msg("cannot remove `%s'", dest);
+                        bb_perror_msg("cannot remove '%s'", dest);
                         goto RET_1;
                     }
                 }
-                if ((copy_file(*argv, dest,
-                    FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS) >= 0) &&
+                copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS;
+#if ENABLE_SELINUX
+                copy_flag |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
+#endif
+                if ((copy_file(*argv, dest, copy_flag) >= 0) &&
                     (remove_file(*argv, FILEUTILS_RECUR | FILEUTILS_FORCE) >= 0)) {
                     goto RET_0;
@@ -140 +131 @@
     } while (*++argv != last);
 
-    return (status);
+    return status;
 }

branches/stable/mindi-busybox/coreutils/nice.c

@@ -5 +5 @@
  * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <unistd.h>
 #include <sys/resource.h>
-#include "busybox.h"
+#include "libbb.h"
 
-static inline int int_add_no_wrap(int a, int b)
-{
-    int s = a + b;
-
-    if (b < 0) {
-        if (s > a) s = INT_MIN;
-    } else {
-        if (s < a) s = INT_MAX;
-    }
-
-    return s;
-}
-
+int nice_main(int argc, char **argv);
 int nice_main(int argc, char **argv)
 {
-    static const char Xetpriority_msg[] = "cannot %cet priority";
-
     int old_priority, adjustment;
 
-    errno = 0;           /* Needed for getpriority error detection. */
     old_priority = getpriority(PRIO_PROCESS, 0);
-    if (errno) {
-        bb_perror_msg_and_die(Xetpriority_msg, 'g');
-    }
 
     if (!*++argv) { /* No args, so (GNU) output current nice value. */
-        bb_printf("%d\n", old_priority);
-        bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+        printf("%d\n", old_priority);
+        fflush_stdout_and_exit(EXIT_SUCCESS);
     }
 
     adjustment = 10;            /* Set default adjustment. */
 
-    if ((argv[0][0] == '-') && (argv[0][1] == 'n') && !argv[0][2]) { /* "-n" */
+    if (argv[0][0] == '-') {
+        if (argv[0][1] == 'n') { /* -n */
+            if (argv[0][2]) { /* -nNNNN (w/o space) */
+                argv[0] += 2; argv--; argc++;
+            }
+        } else { /* -NNN (NNN may be negative) == -n NNN */
+            argv[0] += 1; argv--; argc++;
+        }
         if (argc < 4) {         /* Missing priority and/or utility! */
             bb_show_usage();
         }
-        adjustment = bb_xgetlarg(argv[1], 10, INT_MIN, INT_MAX);
+        adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2);
         argv += 2;
     }
 
-    {  /* Set our priority.  Handle integer wrapping for old + adjust. */
-        int new_priority = int_add_no_wrap(old_priority, adjustment);
+    {  /* Set our priority. */
+        int prio = old_priority + adjustment;
 
-        if (setpriority(PRIO_PROCESS, 0, new_priority) < 0) {
-            bb_perror_msg_and_die(Xetpriority_msg, 's');
+        if (setpriority(PRIO_PROCESS, 0, prio) < 0) {
+            bb_perror_msg_and_die("setpriority(%d)", prio);
         }
     }
 
-    execvp(*argv, argv);        /* Now exec the desired program. */
+    BB_EXECVP(*argv, argv);     /* Now exec the desired program. */
 
     /* The exec failed... */
-    bb_default_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
+    xfunc_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
     bb_perror_msg_and_die("%s", *argv);
 }

branches/stable/mindi-busybox/coreutils/nohup.c

@@ -1 @@
-/* vi:set ts=4: */
+/* vi: set sw=4 ts=4: */
 /* nohup - invoke a utility immune to hangups.
- * 
+ *
  * Busybox version based on nohup specification at
  * http://www.opengroup.org/onlinepubs/007904975/utilities/nohup.html
- * 
+ *
  * Copyright 2006 Rob Landley <rob@landley.net>
- * 
+ * Copyright 2006 Bernhard Fischer
+ *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int nohup_main(int argc, char *argv[])
+int nohup_main(int argc, char **argv);
+int nohup_main(int argc, char **argv)
 {
-    int temp, nullfd;
-    char *nohupout = "nohup.out", *home = NULL;
+    int nullfd;
+    const char *nohupout;
+    char *home = NULL;
 
-    // I have no idea why the standard cares about this.
+    xfunc_error_retval = 127;
 
-    bb_default_error_retval = 127;
+    if (argc < 2) bb_show_usage();
 
-    if (argc<2) bb_show_usage();
+    nullfd = xopen(bb_dev_null, O_WRONLY|O_APPEND);
+    /* If stdin is a tty, detach from it. */
+    if (isatty(STDIN_FILENO))
+        dup2(nullfd, STDIN_FILENO);
 
-    nullfd = bb_xopen(bb_dev_null, O_WRONLY|O_APPEND);
-    // If stdin is a tty, detach from it.
-
-    if (isatty(0)) dup2(nullfd, 0);
-
-    // Redirect stdout to nohup.out, either in "." or in "$HOME".
-
-    if (isatty(1)) {
-        close(1);
+    nohupout = "nohup.out";
+    /* Redirect stdout to nohup.out, either in "." or in "$HOME". */
+    if (isatty(STDOUT_FILENO)) {
+        close(STDOUT_FILENO);
         if (open(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR) < 0) {
             home = getenv("HOME");
             if (home) {
-                home = concat_path_file(home, nohupout);
-                bb_xopen3(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR);
+                nohupout = concat_path_file(home, nohupout);
+                xopen3(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR);
             }
         }
-    } else dup2(nullfd, 1);
+    } else dup2(nullfd, STDOUT_FILENO);
 
-    // If we have a tty on strderr, announce filename and redirect to stdout.
-    // Else redirect to /dev/null.
+    /* If we have a tty on stderr, announce filename and redirect to stdout.
+     * Else redirect to /dev/null.
+     */
+    if (isatty(STDERR_FILENO)) {
+        bb_error_msg("appending to %s", nohupout);
+        dup2(STDOUT_FILENO, STDERR_FILENO);
+    } else dup2(nullfd, STDERR_FILENO);
 
-    temp = isatty(2);
-    if (temp) fdprintf(2,"Writing to %s\n", home ? home : nohupout);
-    dup2(temp ? 1 : nullfd, 2);
-    close(nullfd);
-    signal (SIGHUP, SIG_IGN);
+    if (nullfd > 2)
+        close(nullfd);
+    signal(SIGHUP, SIG_IGN);
 
-    // Exec our new program.
-
-    execvp(argv[1],argv+1);
-    if (ENABLE_FEATURE_CLEAN_UP) free(home);
-    bb_error_msg_and_die("exec %s",argv[1]);
+    BB_EXECVP(argv[1], argv+1);
+    if (ENABLE_FEATURE_CLEAN_UP && home)
+        free((char*)nohupout);
+    bb_perror_msg_and_die("%s", argv[1]);
 }

branches/stable/mindi-busybox/coreutils/od.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * od implementation for busybox
@@ -6 +7 @@
  *  The Regents of the University of California.  All rights reserved.
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * Original copyright notice is retained at the end of this file.
  */
 
-#include <ctype.h>
-#include <string.h>
+
+#include "libbb.h"
+#if ENABLE_DESKTOP
+/* This one provides -t (busybox's own build script needs it) */
+#include "od_bloaty.c"
+#else
 #include <getopt.h>
-#include <stdlib.h>
-#include "busybox.h"
+
 #include "dump.h"
 
-#define isdecdigit(c) (isdigit)(c)
+#define isdecdigit(c) isdigit(c)
 #define ishexdigit(c) (isxdigit)(c)
 
@@ -36 +28 @@
 odoffset(int argc, char ***argvp)
 {
-    register char *num, *p;
+    char *num, *p;
     int base;
     char *end;
@@ -140 +132 @@
 }
 
-static const char * const add_strings[] = {
+static const char *const add_strings[] = {
     "16/1 \"%3_u \" \"\\n\"",               /* a */
     "8/2 \" %06o \" \"\\n\"",               /* B, o */
@@ -156 +148 @@
 };
 
-static const char od_opts[] = "aBbcDdeFfHhIiLlOoXxv";
-
-static const char od_o2si[] = {
+static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv";
+
+static const char od_o2si[] ALIGN1 = {
     0, 1, 2, 3, 5,
     4, 6, 6, 7, 8,
@@ -165 +157 @@
 };
 
+int od_main(int argc, char **argv);
 int od_main(int argc, char **argv)
 {
@@ -199 +192 @@
     odoffset(argc, &argv);
 
-    return(bb_dump_dump(argv));
+    return bb_dump_dump(argv);
 }
+#endif /* ENABLE_DESKTOP */
 
 /*-

branches/stable/mindi-busybox/coreutils/printenv.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * printenv implementation for busybox
@@ -5 +6 @@
  * Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
+extern char **environ;
 
+int printenv_main(int argc, char **argv);
 int printenv_main(int argc, char **argv)
 {
-    extern char **environ;
-    int e = 0;
-
     /* no variables specified, show whole env */
-    if (argc == 1)
+    if (argc == 1) {
+        int e = 0;
         while (environ[e])
             puts(environ[e++]);
-
-    /* search for specified variables and print them out if found */
-    else {
-        int i;
-        size_t l;
+    } else {
+        /* search for specified variables and print them out if found */
         char *arg, *env;
 
-        for (i=1; (arg = argv[i]); ++i)
-            for (; (env = environ[e]); ++e) {
-                l = strlen(arg);
-                if (!strncmp(env, arg, l) && env[l] == '=')
-                    puts(env + l + 1);
-            }
+        while ((arg = *++argv) != NULL) {
+            env = getenv(arg);
+            if (env)
+                puts(env);
+        }
     }
 
-    bb_fflush_stdout_and_exit(0);
+    fflush_stdout_and_exit(0);
 }

branches/stable/mindi-busybox/coreutils/printf.c

@@ -31 +31 @@
    %b = print an argument string, interpreting backslash escapes
 
-   The `format' argument is re-used as many times as necessary
+   The 'format' argument is re-used as many times as necessary
    to convert all of the given arguments.
 
@@ -39 +39 @@
 //   19990508 Busy Boxed! Dave Cinege
 
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <assert.h>
-#include "busybox.h"
-
-static int print_formatted (char *format, int argc, char **argv);
-static void print_direc (char *start, size_t length,
-            int field_width, int precision, char *argument);
-
-typedef int (*converter)(char *arg, void *result);
-static void multiconvert(char *arg, void *result, converter convert)
-{
-    char s[16];
+#include "libbb.h"
+
+typedef void (*converter)(const char *arg, void *result);
+
+static void multiconvert(const char *arg, void *result, converter convert)
+{
+    char s[sizeof(int)*3 + 2];
+
     if (*arg == '"' || *arg == '\'') {
-        sprintf(s,"%d",(unsigned)*(++arg));
-        arg=s;
-    }
-    if(convert(arg,result)) fprintf(stderr, "%s", arg);
-}
-
-static unsigned long xstrtoul(char *arg)
+        sprintf(s, "%d", (unsigned char)arg[1]);
+        arg = s;
+    }
+    convert(arg, result);
+    /* if there was conversion error, print unconverted string */
+    if (errno)
+        fputs(arg, stderr);
+}
+
+static void conv_strtoul(const char *arg, void *result)
+{
+    *(unsigned long*)result = bb_strtoul(arg, NULL, 0);
+}
+static void conv_strtol(const char *arg, void *result)
+{
+    *(long*)result = bb_strtol(arg, NULL, 0);
+}
+static void conv_strtod(const char *arg, void *result)
+{
+    char *end;
+    /* Well, this one allows leading whitespace... so what */
+    /* What I like much less is that "-" is accepted too! :( */
+    *(double*)result = strtod(arg, &end);
+    if (end[0]) errno = ERANGE;
+}
+
+static unsigned long my_xstrtoul(const char *arg)
 {
     unsigned long result;
-
-    multiconvert(arg,&result, (converter)safe_strtoul);
+    multiconvert(arg, &result, conv_strtoul);
     return result;
 }
 
-static long xstrtol(char *arg)
+static long my_xstrtol(const char *arg)
 {
     long result;
-    multiconvert(arg, &result, (converter)safe_strtol);
+    multiconvert(arg, &result, conv_strtol);
     return result;
 }
 
-static double xstrtod(char *arg)
+static double my_xstrtod(const char *arg)
 {
     double result;
-    multiconvert(arg, &result, (converter)safe_strtod);
+    multiconvert(arg, &result, conv_strtod);
     return result;
 }
@@ -100 +108 @@
 }
 
-int printf_main(int argc, char **argv)
-{
-    char *format;
-    int args_used;
-
-    if (argc <= 1 || **(argv + 1) == '-') {
-        bb_show_usage();
-    }
-
-    format = argv[1];
-    argc -= 2;
-    argv += 2;
-
-    do {
-        args_used = print_formatted(format, argc, argv);
-        argc -= args_used;
-        argv += args_used;
-    }
-    while (args_used > 0 && argc > 0);
-
-/*
-  if (argc > 0)
-    fprintf(stderr, "excess args ignored");
-*/
-
-    return EXIT_SUCCESS;
+static void print_direc(char *start, size_t length, int field_width, int precision,
+        const char *argument)
+{
+    char *p;        /* Null-terminated copy of % directive. */
+
+    p = xmalloc((unsigned) (length + 1));
+    strncpy(p, start, length);
+    p[length] = 0;
+
+    switch (p[length - 1]) {
+    case 'd':
+    case 'i':
+        if (field_width < 0) {
+            if (precision < 0)
+                printf(p, my_xstrtol(argument));
+            else
+                printf(p, precision, my_xstrtol(argument));
+        } else {
+            if (precision < 0)
+                printf(p, field_width, my_xstrtol(argument));
+            else
+                printf(p, field_width, precision, my_xstrtol(argument));
+        }
+        break;
+    case 'o':
+    case 'u':
+    case 'x':
+    case 'X':
+        if (field_width < 0) {
+            if (precision < 0)
+                printf(p, my_xstrtoul(argument));
+            else
+                printf(p, precision, my_xstrtoul(argument));
+        } else {
+            if (precision < 0)
+                printf(p, field_width, my_xstrtoul(argument));
+            else
+                printf(p, field_width, precision, my_xstrtoul(argument));
+        }
+        break;
+    case 'f':
+    case 'e':
+    case 'E':
+    case 'g':
+    case 'G':
+        if (field_width < 0) {
+            if (precision < 0)
+                printf(p, my_xstrtod(argument));
+            else
+                printf(p, precision, my_xstrtod(argument));
+        } else {
+            if (precision < 0)
+                printf(p, field_width, my_xstrtod(argument));
+            else
+                printf(p, field_width, precision, my_xstrtod(argument));
+        }
+        break;
+    case 'c':
+        printf(p, *argument);
+        break;
+    case 's':
+        if (field_width < 0) {
+            if (precision < 0)
+                printf(p, argument);
+            else
+                printf(p, precision, argument);
+        } else {
+            if (precision < 0)
+                printf(p, field_width, argument);
+            else
+                printf(p, field_width, precision, argument);
+        }
+        break;
+    }
+
+    free(p);
 }
 
 /* Print the text in FORMAT, using ARGV (with ARGC elements) for
-   arguments to any `%' directives.
+   arguments to any '%' directives.
    Return the number of elements of ARGV used.  */
 
 static int print_formatted(char *format, int argc, char **argv)
 {
-    int save_argc = argc;       /* Preserve original value.  */
-    char *f;                    /* Pointer into `format'.  */
-    char *direc_start;          /* Start of % directive.  */
-    size_t direc_length;        /* Length of % directive.  */
-    int field_width;            /* Arg to first '*', or -1 if none.  */
-    int precision;              /* Arg to second '*', or -1 if none.  */
+    int save_argc = argc;   /* Preserve original value.  */
+    char *f;                /* Pointer into 'format'.  */
+    char *direc_start;      /* Start of % directive.  */
+    size_t direc_length;    /* Length of % directive.  */
+    int field_width;        /* Arg to first '*', or -1 if none.  */
+    int precision;          /* Arg to second '*', or -1 if none.  */
 
     for (f = format; *f; ++f) {
@@ -167 +225 @@
                 ++direc_length;
                 if (argc > 0) {
-                    field_width = xstrtoul(*argv);
+                    field_width = my_xstrtoul(*argv);
                     ++argv;
                     --argc;
                 } else
                     field_width = 0;
-            } else
+            } else {
                 while (isdigit(*f)) {
                     ++f;
                     ++direc_length;
                 }
+            }
             if (*f == '.') {
                 ++f;
@@ -184 +243 @@
                     ++direc_length;
                     if (argc > 0) {
-                        precision = xstrtoul(*argv);
+                        precision = my_xstrtoul(*argv);
                         ++argv;
                         --argc;
@@ -200 +259 @@
             }
             /*
-               if (!strchr ("diouxXfeEgGcs", *f))
-               fprintf(stderr, "%%%c: invalid directive", *f);
-             */
+            if (!strchr ("diouxXfeEgGcs", *f))
+            fprintf(stderr, "%%%c: invalid directive", *f);
+            */
             ++direc_length;
             if (argc > 0) {
@@ -213 +272 @@
                             precision, "");
             break;
-
         case '\\':
             if (*++f == 'c')
@@ -220 +278 @@
             f--;
             break;
-
         default:
             putchar(*f);
@@ -229 +286 @@
 }
 
-static void
-print_direc(char *start, size_t length, int field_width, int precision,
-            char *argument)
-{
-    char *p;                    /* Null-terminated copy of % directive. */
-
-    p = xmalloc((unsigned) (length + 1));
-    strncpy(p, start, length);
-    p[length] = 0;
-
-    switch (p[length - 1]) {
-    case 'd':
-    case 'i':
-        if (field_width < 0) {
-            if (precision < 0)
-                printf(p, xstrtol(argument));
-            else
-                printf(p, precision, xstrtol(argument));
-        } else {
-            if (precision < 0)
-                printf(p, field_width, xstrtol(argument));
-            else
-                printf(p, field_width, precision, xstrtol(argument));
-        }
-        break;
-
-    case 'o':
-    case 'u':
-    case 'x':
-    case 'X':
-        if (field_width < 0) {
-            if (precision < 0)
-                printf(p, xstrtoul(argument));
-            else
-                printf(p, precision, xstrtoul(argument));
-        } else {
-            if (precision < 0)
-                printf(p, field_width, xstrtoul(argument));
-            else
-                printf(p, field_width, precision, xstrtoul(argument));
-        }
-        break;
-
-    case 'f':
-    case 'e':
-    case 'E':
-    case 'g':
-    case 'G':
-        if (field_width < 0) {
-            if (precision < 0)
-                printf(p, xstrtod(argument));
-            else
-                printf(p, precision, xstrtod(argument));
-        } else {
-            if (precision < 0)
-                printf(p, field_width, xstrtod(argument));
-            else
-                printf(p, field_width, precision, xstrtod(argument));
-        }
-        break;
-
-    case 'c':
-        printf(p, *argument);
-        break;
-
-    case 's':
-        if (field_width < 0) {
-            if (precision < 0)
-                printf(p, argument);
-            else
-                printf(p, precision, argument);
-        } else {
-            if (precision < 0)
-                printf(p, field_width, argument);
-            else
-                printf(p, field_width, precision, argument);
-        }
-        break;
-    }
-
-    free(p);
-}
+int printf_main(int argc, char **argv);
+int printf_main(int argc, char **argv)
+{
+    char *format;
+    int args_used;
+
+    if (argc <= 1 || argv[1][0] == '-') {
+        bb_show_usage();
+    }
+
+    format = argv[1];
+    argc -= 2;
+    argv += 2;
+
+    do {
+        args_used = print_formatted(format, argc, argv);
+        argc -= args_used;
+        argv += args_used;
+    } while (args_used > 0 && argc > 0);
+
+/*  if (argc > 0)
+        fprintf(stderr, "excess args ignored");
+*/
+
+    return EXIT_SUCCESS;
+}

branches/stable/mindi-busybox/coreutils/pwd.c

@@ -5 +5 @@
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int pwd_main(int argc, char **argv);
 int pwd_main(int argc, char **argv)
 {
     char *buf;
 
-    if ((buf = xgetcwd(NULL)) != NULL) {
+    buf = xrealloc_getcwd_or_warn(NULL);
+    if (buf != NULL) {
         puts(buf);
-        bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+        free(buf);
+        return fflush(stdout);
     }
 

branches/stable/mindi-busybox/coreutils/realpath.c

@@ -6 +6 @@
  *
  * Now does proper error checking on output and returns a failure exit code
- * if one or more paths can not be resolved.
+ * if one or more paths cannot be resolved.
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <limits.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+int realpath_main(int argc, char **argv);
 int realpath_main(int argc, char **argv)
 {
@@ -45 +44 @@
 #endif
 
-    bb_fflush_stdout_and_exit(retval);
+    fflush_stdout_and_exit(retval);
 }

branches/stable/mindi-busybox/coreutils/rm.c

@@ -5 +5 @@
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -30 +16 @@
  */
 
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int rm_main(int argc, char **argv);
 int rm_main(int argc, char **argv)
 {
     int status = 0;
     int flags = 0;
-    unsigned long opt;
+    unsigned opt;
 
-    bb_opt_complementally = "f-i:i-f";
-    opt = bb_getopt_ulflags(argc, argv, "fiRr");
-    if(opt & 1)
-                flags |= FILEUTILS_FORCE;
-    if(opt & 2)
+    opt_complementary = "f-i:i-f";
+    opt = getopt32(argv, "fiRr");
+    argv += optind;
+    if (opt & 1)
+        flags |= FILEUTILS_FORCE;
+    if (opt & 2)
         flags |= FILEUTILS_INTERACTIVE;
-    if(opt & 12)
+    if (opt & 12)
         flags |= FILEUTILS_RECUR;
 
-    if (*(argv += optind) != NULL) {
+    if (*argv != NULL) {
         do {
             const char *base = bb_get_last_path_component(*argv);
 
-            if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
-                bb_error_msg("cannot remove `.' or `..'");
+            if (DOT_OR_DOTDOT(base)) {
+                bb_error_msg("cannot remove '.' or '..'");
             } else if (remove_file(*argv, flags) >= 0) {
                 continue;

branches/stable/mindi-busybox/coreutils/rmdir.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
-#include <stdlib.h>
-#include <unistd.h>
 #include <libgen.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+
+int rmdir_main(int argc, char **argv);
 int rmdir_main(int argc, char **argv)
 {
@@ -36 +25 @@
     char *path;
 
-    flags = bb_getopt_ulflags(argc, argv, "p");
-
+    flags = getopt32(argv, "p");
     argv += optind;
 
@@ -50 +38 @@
         do_dot = (*path == '.');
 
-        do {
+        while (1) {
             if (rmdir(path) < 0) {
-                bb_perror_msg("`%s'", path);    /* Match gnu rmdir msg. */
+                bb_perror_msg("'%s'", path);    /* Match gnu rmdir msg. */
                 status = EXIT_FAILURE;
             } else if (flags) {
@@ -60 +48 @@
                  * returns "." if there are no parents.  We must distinguish
                  * this from the case of the original path starting with '.'.
-         */
+                 */
                 if (do_dot || (*path != '.') || path[1]) {
                     continue;
@@ -66 +54 @@
             }
             break;
-        } while (1);
+        }
 
     } while (*++argv);

branches/stable/mindi-busybox/coreutils/seq.c

@@ -8 +8 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+
+int seq_main(int argc, char **argv);
 int seq_main(int argc, char **argv)
 {
-    double last, first, increment, i;
-    
-    first = increment = 1;
+    double last, increment, i;
+
+    i = increment = 1;
     switch (argc) {
         case 4:
-            increment=atof(argv[2]);
+            increment = atof(argv[2]);
         case 3:
-            first=atof(argv[1]);
+            i = atof(argv[1]);
         case 2:
-            last=atof(argv[argc -1]);
+            last = atof(argv[argc-1]);
             break;
         default:
@@ -30 +32 @@
 
     /* You should note that this is pos-5.0.91 semantics, -- FK. */
-    for (i = first;
-         (increment > 0 && i <= last) || (increment < 0 && i >=last);
-         i += increment)
-    {
+    while ((increment > 0 && i <= last) || (increment < 0 && i >= last)) {
         printf("%g\n", i);
+        i += increment;
     }
 
-    return EXIT_SUCCESS;
+    return fflush(stdout);
 }

branches/stable/mindi-busybox/coreutils/sleep.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -32 +19 @@
  */
 
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-#ifdef CONFIG_FEATURE_FANCY_SLEEP
-static const struct suffix_mult sleep_suffixes[] = {
+/* This is a NOFORK applet. Be very careful! */
+
+
+#if ENABLE_FEATURE_FANCY_SLEEP
+static const struct suffix_mult sfx[] = {
     { "s", 1 },
     { "m", 60 },
     { "h", 60*60 },
     { "d", 24*60*60 },
-    { NULL, 0 }
+    { }
 };
 #endif
 
+int sleep_main(int argc, char **argv);
 int sleep_main(int argc, char **argv)
 {
-    unsigned int duration;
+    unsigned duration;
 
-#ifdef CONFIG_FEATURE_FANCY_SLEEP
+#if ENABLE_FEATURE_FANCY_SLEEP
 
     if (argc < 2) {
@@ -60 +48 @@
     duration = 0;
     do {
-        duration += bb_xgetularg_bnd_sfx(*argv, 10,
-                                         0, UINT_MAX-duration,
-                                         sleep_suffixes);
+        duration += xatoul_range_sfx(*argv, 0, UINT_MAX-duration, sfx);
     } while (*++argv);
 
-#else  /* CONFIG_FEATURE_FANCY_SLEEP */
+#else  /* FEATURE_FANCY_SLEEP */
 
     if (argc != 2) {
@@ -71 +57 @@
     }
 
-#if UINT_MAX == ULONG_MAX
-    duration = bb_xgetularg10(argv[1]);
-#else
-    duration = bb_xgetularg10_bnd(argv[1], 0, UINT_MAX);
-#endif
+    duration = xatou(argv[1]);
 
-#endif /* CONFIG_FEATURE_FANCY_SLEEP */
+#endif /* FEATURE_FANCY_SLEEP */
 
     if (sleep(duration)) {

branches/stable/mindi-busybox/coreutils/sort.c

@@ -6 +6 @@
  *
  * MAINTAINER: Rob Landley <rob@landley.net>
- * 
+ *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
@@ -13 +13 @@
  */
 
-#include <ctype.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include "busybox.h"
-
-static int global_flags;
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
 
 /*
@@ -30 +24 @@
 
 /* These are sort types */
-#define FLAG_n          1       /* Numeric sort */
-#define FLAG_g          2       /* Sort using strtod() */
-#define FLAG_M          4       /* Sort date */
+static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:t:";
+enum {
+    FLAG_n  = 1,            /* Numeric sort */
+    FLAG_g  = 2,            /* Sort using strtod() */
+    FLAG_M  = 4,            /* Sort date */
 /* ucsz apply to root level only, not keys.  b at root level implies bb */
-#define FLAG_u          8       /* Unique */
-#define FLAG_c          16      /* Check: no output, exit(!ordered) */
-#define FLAG_s          32      /* Stable sort, no ascii fallback at end */
-#define FLAG_z          64      /* Input is null terminated, not \n */
+    FLAG_u  = 8,            /* Unique */
+    FLAG_c  = 0x10,         /* Check: no output, exit(!ordered) */
+    FLAG_s  = 0x20,         /* Stable sort, no ascii fallback at end */
+    FLAG_z  = 0x40,         /* Input is null terminated, not \n */
 /* These can be applied to search keys, the previous four can't */
-#define FLAG_b          128     /* Ignore leading blanks */
-#define FLAG_r          256     /* Reverse */
-#define FLAG_d          512     /* Ignore !(isalnum()|isspace()) */
-#define FLAG_f          1024    /* Force uppercase */
-#define FLAG_i          2048    /* Ignore !isprint() */
-#define FLAG_bb         32768   /* Ignore trailing blanks  */
-
-
-#ifdef CONFIG_FEATURE_SORT_BIG
+    FLAG_b  = 0x80,         /* Ignore leading blanks */
+    FLAG_r  = 0x100,        /* Reverse */
+    FLAG_d  = 0x200,        /* Ignore !(isalnum()|isspace()) */
+    FLAG_f  = 0x400,        /* Force uppercase */
+    FLAG_i  = 0x800,        /* Ignore !isprint() */
+    FLAG_m  = 0x1000,       /* ignored: merge already sorted files; do not sort */
+    FLAG_S  = 0x2000,       /* ignored: -S, --buffer-size=SIZE */
+    FLAG_T  = 0x4000,       /* ignored: -T, --temporary-directory=DIR */
+    FLAG_o  = 0x8000,
+    FLAG_k  = 0x10000,
+    FLAG_t  = 0x20000,
+    FLAG_bb = 0x80000000,   /* Ignore trailing blanks  */
+};
+
+#if ENABLE_FEATURE_SORT_BIG
 static char key_separator;
 
-static struct sort_key
-{
+static struct sort_key {
     struct sort_key *next_key;  /* linked list */
-    unsigned short range[4];    /* start word, start char, end word, end char */
-    int flags;
+    unsigned range[4];  /* start word, start char, end word, end char */
+    unsigned flags;
 } *key_list;
 
 static char *get_key(char *str, struct sort_key *key, int flags)
 {
-    int start=0,end,len,i,j;
+    int start = 0, end = 0, len, i, j;
 
     /* Special case whole string, so we don't have to make a copy */
-    if(key->range[0]==1 && !key->range[1] && !key->range[2] && !key->range[3]
-        && !(flags&(FLAG_b&FLAG_d&FLAG_f&FLAG_i&FLAG_bb))) return str;
-    /* Find start of key on first pass, end on second pass*/
-    len=strlen(str);
-
-    for(j=0;j<2;j++) {
-        if(!key->range[2*j]) end=len;
+    if (key->range[0] == 1 && !key->range[1] && !key->range[2] && !key->range[3]
+     && !(flags & (FLAG_b | FLAG_d | FLAG_f | FLAG_i | FLAG_bb))
+    ) {
+        return str;
+    }
+
+    /* Find start of key on first pass, end on second pass */
+    len = strlen(str);
+    for (j = 0; j < 2; j++) {
+        if (!key->range[2*j])
+            end = len;
         /* Loop through fields */
         else {
-            end=0;
-            for(i=1;i<key->range[2*j]+j;i++) {
-                /* Skip leading blanks or first separator */
-                if(str[end]) {
-                    if(!key_separator && isspace(str[end]))
-                        while(isspace(str[end])) end++;
-                }
-                /* Skip body of key */
-                for(;str[end];end++) {
-                    if(key_separator) {
-                        if(str[end]==key_separator) break;
-                    } else if(isspace(str[end])) break;
+            end = 0;
+            for (i = 1; i < key->range[2*j] + j; i++) {
+                if (key_separator) {
+                    /* Skip body of key and separator */
+                    while (str[end]) {
+                        if (str[end++] == key_separator)
+                            break;
+                    }
+                } else {
+                    /* Skip leading blanks */
+                    while (isspace(str[end]))
+                        end++;
+                    /* Skip body of key */
+                    while (str[end]) {
+                        if (isspace(str[end]))
+                            break;
+                        end++;
+                    }
                 }
             }
         }
-        if(!j) start=end;
-    }
-    /* Key with explicit separator starts after separator */
-    if(key_separator && str[start]==key_separator) start++;
+        if (!j) start = end;
+    }
     /* Strip leading whitespace if necessary */
-    if(flags&FLAG_b) while(isspace(str[start])) start++;
+//XXX: skip_whitespace()
+    if (flags & FLAG_b)
+        while (isspace(str[start])) start++;
     /* Strip trailing whitespace if necessary */
-    if(flags&FLAG_bb) while(end>start && isspace(str[end-1])) end--;
+    if (flags & FLAG_bb)
+        while (end > start && isspace(str[end-1])) end--;
     /* Handle offsets on start and end */
-    if(key->range[3]) {
-        end+=key->range[3]-1;
-        if(end>len) end=len;
-    }
-    if(key->range[1]) {
-        start+=key->range[1]-1;
-        if(start>len) start=len;
+    if (key->range[3]) {
+        end += key->range[3] - 1;
+        if (end > len) end = len;
+    }
+    if (key->range[1]) {
+        start += key->range[1] - 1;
+        if (start > len) start = len;
     }
     /* Make the copy */
-    if(end<start) end=start;
-    str=bb_xstrndup(str+start,end-start);
+    if (end < start) end = start;
+    str = xstrndup(str+start, end-start);
     /* Handle -d */
-    if(flags&FLAG_d) {
-        for(start=end=0;str[end];end++)
-            if(isspace(str[end]) || isalnum(str[end])) str[start++]=str[end];
-        str[start]=0;
+    if (flags & FLAG_d) {
+        for (start = end = 0; str[end]; end++)
+            if (isspace(str[end]) || isalnum(str[end]))
+                str[start++] = str[end];
+        str[start] = '\0';
     }
     /* Handle -i */
-    if(flags&FLAG_i) {
-        for(start=end=0;str[end];end++)
-            if(isprint(str[end])) str[start++]=str[end];
-        str[start]=0;
+    if (flags & FLAG_i) {
+        for (start = end = 0; str[end]; end++)
+            if (isprint(str[end]))
+                str[start++] = str[end];
+        str[start] = '\0';
     }
     /* Handle -f */
-    if(flags*FLAG_f) for(i=0;str[i];i++) str[i]=toupper(str[i]);
+    if (flags & FLAG_f)
+        for (i = 0; str[i]; i++)
+            str[i] = toupper(str[i]);
 
     return str;
@@ -126 +142 @@
 static struct sort_key *add_key(void)
 {
-    struct sort_key **pkey=&key_list;
-    while(*pkey) pkey=&((*pkey)->next_key);
-    return *pkey=xcalloc(1,sizeof(struct sort_key));
+    struct sort_key **pkey = &key_list;
+    while (*pkey)
+        pkey = &((*pkey)->next_key);
+    return *pkey = xzalloc(sizeof(struct sort_key));
 }
 
-#define GET_LINE(fp) (global_flags&FLAG_z) ? bb_get_chunk_from_file(fp,NULL) \
-                                           : bb_get_chomped_line_from_file(fp)
+#define GET_LINE(fp) \
+    ((option_mask32 & FLAG_z) \
+    ? bb_get_chunk_from_file(fp, NULL) \
+    : xmalloc_getline(fp))
 #else
-#define GET_LINE(fp)        bb_get_chomped_line_from_file(fp)
+#define GET_LINE(fp) xmalloc_getline(fp)
 #endif
 
@@ -140 +159 @@
 static int compare_keys(const void *xarg, const void *yarg)
 {
-    int flags=global_flags,retval=0;
-    char *x,*y;
-
-#ifdef CONFIG_FEATURE_SORT_BIG
+    int flags = option_mask32, retval = 0;
+    char *x, *y;
+
+#if ENABLE_FEATURE_SORT_BIG
     struct sort_key *key;
 
-    for(key=key_list;!retval && key;key=key->next_key) {
-        flags=(key->flags) ? key->flags : global_flags;
+    for (key = key_list; !retval && key; key = key->next_key) {
+        flags = key->flags ? key->flags : option_mask32;
         /* Chop out and modify key chunks, handling -dfib */
-        x=get_key(*(char **)xarg,key,flags);
-        y=get_key(*(char **)yarg,key,flags);
+        x = get_key(*(char **)xarg, key, flags);
+        y = get_key(*(char **)yarg, key, flags);
 #else
     /* This curly bracket serves no purpose but to match the nesting
-       level of the for() loop we're not using */
+       level of the for () loop we're not using */
     {
-        x=*(char **)xarg;
-        y=*(char **)yarg;
+        x = *(char **)xarg;
+        y = *(char **)yarg;
 #endif
         /* Perform actual comparison */
-        switch(flags&7) {
-            default:
-                bb_error_msg_and_die("Unknown sort type.");
-                break;
-            /* Ascii sort */
-            case 0:
-                retval=strcmp(x,y);
-                break;
-#ifdef CONFIG_FEATURE_SORT_BIG
-            case FLAG_g:
-            {
-                char *xx,*yy;
-                double dx=strtod(x,&xx), dy=strtod(y,&yy);
-                /* not numbers < NaN < -infinity < numbers < +infinity) */
-                if(x==xx) retval=(y==yy ? 0 : -1);
-                else if(y==yy) retval=1;
-                /* Check for isnan */
-                else if(dx != dx) retval = (dy != dy) ? 0 : -1;
-                else if(dy != dy) retval = 1;
-                /* Check for infinity.  Could underflow, but it avoids libm. */
-                else if(1.0/dx == 0.0) {
-                    if(dx<0) retval=((1.0/dy == 0.0 && dy<0) ? 0 : -1);
-                    else retval=((1.0/dy == 0.0 && dy>0) ? 0 : 1);
-                } else if(1.0/dy == 0.0) retval=dy<0 ? 1 : -1;
-                else retval=dx>dy ? 1 : (dx<dy ? -1 : 0);
-                break;
-            }
-            case FLAG_M:
-            {
-                struct tm thyme;
-                int dx;
-                char *xx,*yy;
-
-                xx=strptime(x,"%b",&thyme);
-                dx=thyme.tm_mon;
-                yy=strptime(y,"%b",&thyme);
-                if(!xx) retval=(!yy ? 0 : -1);
-                else if(!yy) retval=1;
-                else retval=(dx==thyme.tm_mon ? 0 : dx-thyme.tm_mon);
-                break;
-            }
-            /* Full floating point version of -n */
-            case FLAG_n:
-            {
-                double dx=atof(x),dy=atof(y);
-                retval=dx>dy ? 1 : (dx<dy ? -1 : 0);
-                break;
-            }
-        }
+        switch (flags & 7) {
+        default:
+            bb_error_msg_and_die("unknown sort type");
+            break;
+        /* Ascii sort */
+        case 0:
+#if ENABLE_LOCALE_SUPPORT
+            retval = strcoll(x, y);
+#else
+            retval = strcmp(x, y);
+#endif
+            break;
+#if ENABLE_FEATURE_SORT_BIG
+        case FLAG_g: {
+            char *xx, *yy;
+            double dx = strtod(x, &xx);
+            double dy = strtod(y, &yy);
+            /* not numbers < NaN < -infinity < numbers < +infinity) */
+            if (x == xx)
+                retval = (y == yy ? 0 : -1);
+            else if (y == yy)
+                retval = 1;
+            /* Check for isnan */
+            else if (dx != dx)
+                retval = (dy != dy) ? 0 : -1;
+            else if (dy != dy)
+                retval = 1;
+            /* Check for infinity.  Could underflow, but it avoids libm. */
+            else if (1.0 / dx == 0.0) {
+                if (dx < 0)
+                    retval = (1.0 / dy == 0.0 && dy < 0) ? 0 : -1;
+                else
+                    retval = (1.0 / dy == 0.0 && dy > 0) ? 0 : 1;
+            } else if (1.0 / dy == 0.0)
+                retval = (dy < 0) ? 1 : -1;
+            else
+                retval = (dx > dy) ? 1 : ((dx < dy) ? -1 : 0);
+            break;
+        }
+        case FLAG_M: {
+            struct tm thyme;
+            int dx;
+            char *xx, *yy;
+
+            xx = strptime(x, "%b", &thyme);
+            dx = thyme.tm_mon;
+            yy = strptime(y, "%b", &thyme);
+            if (!xx)
+                retval = (!yy) ? 0 : -1;
+            else if (!yy)
+                retval = 1;
+            else
+                retval = (dx == thyme.tm_mon) ? 0 : dx - thyme.tm_mon;
+            break;
+        }
+        /* Full floating point version of -n */
+        case FLAG_n: {
+            double dx = atof(x);
+            double dy = atof(y);
+            retval = (dx > dy) ? 1 : ((dx < dy) ? -1 : 0);
+            break;
+        }
+        } /* switch */
         /* Free key copies. */
-        if(x!=*(char **)xarg) free(x);
-        if(y!=*(char **)yarg) free(y);
-        if(retval) break;
+        if (x != *(char **)xarg) free(x);
+        if (y != *(char **)yarg) free(y);
+        /* if (retval) break; - done by for () anyway */
 #else
-            /* Integer version of -n for tiny systems */
-            case FLAG_n:
-                retval=atoi(x)-atoi(y);
-                break;
-        }
-#endif
-    }
+        /* Integer version of -n for tiny systems */
+        case FLAG_n:
+            retval = atoi(x) - atoi(y);
+            break;
+        } /* switch */
+#endif
+    } /* for */
+
     /* Perform fallback sort if necessary */
-    if(!retval && !(global_flags&FLAG_s))
-            retval=strcmp(*(char **)xarg, *(char **)yarg);
-//dprintf(2,"reverse=%d\n",flags&FLAG_r);
-    return ((flags&FLAG_r)?-1:1)*retval;
+    if (!retval && !(option_mask32 & FLAG_s))
+        retval = strcmp(*(char **)xarg, *(char **)yarg);
+
+    if (flags & FLAG_r) return -retval;
+    return retval;
 }
 
+#if ENABLE_FEATURE_SORT_BIG
+static unsigned str2u(char **str)
+{
+    unsigned long lu;
+    if (!isdigit((*str)[0]))
+        bb_error_msg_and_die("bad field specification");
+    lu = strtoul(*str, str, 10);
+    if ((sizeof(long) > sizeof(int) && lu > INT_MAX) || !lu)
+        bb_error_msg_and_die("bad field specification");
+    return lu;
+}
+#endif
+
+int sort_main(int argc, char **argv);
 int sort_main(int argc, char **argv)
 {
-    FILE *fp,*outfile=NULL;
-    int linecount=0,i,flag;
-    char *line,**lines=NULL,*optlist="ngMucszbrdfimS:T:o:k:t:";
-    int c;
-
-    bb_default_error_retval = 2;
+    FILE *fp, *outfile = stdout;
+    char *line, **lines = NULL;
+    char *str_ignored, *str_o, *str_t;
+    llist_t *lst_k = NULL;
+    int i, flag;
+    int linecount = 0;
+
+    xfunc_error_retval = 2;
+
     /* Parse command line options */
-    while((c=getopt(argc,argv,optlist))>0) {
-        line=strchr(optlist,c);
-        if(!line) bb_show_usage();
-        switch(*line) {
-#ifdef CONFIG_FEATURE_SORT_BIG
-            case 'o':
-                if(outfile) bb_error_msg_and_die("Too many -o.");
-                outfile=bb_xfopen(optarg,"w");
-                break;
-            case 't':
-                if(key_separator || optarg[1])
-                    bb_error_msg_and_die("Too many -t.");
-                key_separator=*optarg;
-                break;
-            /* parse sort key */
-            case 'k':
-            {
-                struct sort_key *key=add_key();
-                char *temp, *temp2;
-
-                temp=optarg;
-                for(i=0;*temp;) {
-                    /* Start of range */
-                    key->range[2*i]=(unsigned short)strtol(temp,&temp,10);
-                    if(*temp=='.')
-                        key->range[(2*i)+1]=(unsigned short)strtol(temp+1,&temp,10);
-                    for(;*temp;temp++) {
-                        if(*temp==',' && !i++) {
-                            temp++;
-                            break;
-                        } /* no else needed: fall through to syntax error
-                             because comma isn't in optlist */
-                        temp2=strchr(optlist,*temp);
-                        flag=(1<<(temp2-optlist));
-                        if(!temp2 || (flag>FLAG_M && flag<FLAG_b))
-                            bb_error_msg_and_die("Unknown key option.");
-                        /* b after , means strip _trailing_ space */
-                        if(i && flag==FLAG_b) flag=FLAG_bb;
-                        key->flags|=flag;
-                    }
-                }
-                break;
+    /* -o and -t can be given at most once */
+    opt_complementary = "o--o:t--t:" /* -t, -o: maximum one of each */
+            "k::"; /* -k takes list */
+    getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t);
+#if ENABLE_FEATURE_SORT_BIG
+    if (option_mask32 & FLAG_o) outfile = xfopen(str_o, "w");
+    if (option_mask32 & FLAG_t) {
+        if (!str_t[0] || str_t[1])
+            bb_error_msg_and_die("bad -t parameter");
+        key_separator = str_t[0];
+    }
+    /* parse sort key */
+    while (lst_k) {
+        enum {
+            FLAG_allowed_for_k =
+                FLAG_n | /* Numeric sort */
+                FLAG_g | /* Sort using strtod() */
+                FLAG_M | /* Sort date */
+                FLAG_b | /* Ignore leading blanks */
+                FLAG_r | /* Reverse */
+                FLAG_d | /* Ignore !(isalnum()|isspace()) */
+                FLAG_f | /* Force uppercase */
+                FLAG_i | /* Ignore !isprint() */
+            0
+        };
+        struct sort_key *key = add_key();
+        char *str_k = lst_k->data;
+        const char *temp2;
+
+        i = 0; /* i==0 before comma, 1 after (-k3,6) */
+        while (*str_k) {
+            /* Start of range */
+            /* Cannot use bb_strtou - suffix can be a letter */
+            key->range[2*i] = str2u(&str_k);
+            if (*str_k == '.') {
+                str_k++;
+                key->range[2*i+1] = str2u(&str_k);
             }
-#endif
-            default:
-                global_flags|=(1<<(line-optlist));
-                /* global b strips leading and trailing spaces */
-                if(global_flags&FLAG_b) global_flags|=FLAG_bb;
-                break;
-        }
-    }
+            while (*str_k) {
+                if (*str_k == ',' && !i++) {
+                    str_k++;
+                    break;
+                } /* no else needed: fall through to syntax error
+                     because comma isn't in OPT_STR */
+                temp2 = strchr(OPT_STR, *str_k);
+                if (!temp2)
+                    bb_error_msg_and_die("unknown key option");
+                flag = 1 << (temp2 - OPT_STR);
+                if (flag & ~FLAG_allowed_for_k)
+                    bb_error_msg_and_die("unknown sort type");
+                /* b after ',' means strip _trailing_ space */
+                if (i && flag == FLAG_b) flag = FLAG_bb;
+                key->flags |= flag;
+                str_k++;
+            }
+        }
+        /* leaking lst_k... */
+        lst_k = lst_k->link;
+    }
+#endif
+    /* global b strips leading and trailing spaces */
+    if (option_mask32 & FLAG_b) option_mask32 |= FLAG_bb;
+
     /* Open input files and read data */
-    for(i=argv[optind] ? optind : optind-1;argv[i];i++) {
-        if(i<optind || (*argv[i]=='-' && !argv[i][1])) fp=stdin;
-        else fp=bb_xfopen(argv[i],"r");
-        for(;;) {
-            line=GET_LINE(fp);
-            if(!line) break;
-            if(!(linecount&63))
-                lines=xrealloc(lines, sizeof(char *)*(linecount+64));
-            lines[linecount++]=line;
+    for (i = argv[optind] ? optind : optind-1; argv[i]; i++) {
+        fp = stdin;
+        if (i >= optind && NOT_LONE_DASH(argv[i]))
+            fp = xfopen(argv[i], "r");
+        for (;;) {
+            line = GET_LINE(fp);
+            if (!line) break;
+            if (!(linecount & 63))
+                lines = xrealloc(lines, sizeof(char *) * (linecount + 64));
+            lines[linecount++] = line;
         }
         fclose(fp);
     }
-#ifdef CONFIG_FEATURE_SORT_BIG
+#if ENABLE_FEATURE_SORT_BIG
     /* if no key, perform alphabetic sort */
-    if(!key_list) add_key()->range[0]=1;
+    if (!key_list)
+        add_key()->range[0] = 1;
     /* handle -c */
-    if(global_flags&FLAG_c) {
-        int j=(global_flags&FLAG_u) ? -1 : 0;
-        for(i=1;i<linecount;i++)
-            if(compare_keys(&lines[i-1],&lines[i])>j) {
-                fprintf(stderr,"Check line %d\n",i);
+    if (option_mask32 & FLAG_c) {
+        int j = (option_mask32 & FLAG_u) ? -1 : 0;
+        for (i = 1; i < linecount; i++)
+            if (compare_keys(&lines[i-1], &lines[i]) > j) {
+                fprintf(stderr, "Check line %d\n", i);
                 return 1;
             }
@@ -315 +381 @@
 #endif
     /* Perform the actual sort */
-    qsort(lines,linecount,sizeof(char *),compare_keys);
+    qsort(lines, linecount, sizeof(char *), compare_keys);
     /* handle -u */
-    if(global_flags&FLAG_u) {
-        for(flag=0,i=1;i<linecount;i++) {
-            if(!compare_keys(&lines[flag],&lines[i])) free(lines[i]);
-            else lines[++flag]=lines[i];
-        }
-        if(linecount) linecount=flag+1;
+    if (option_mask32 & FLAG_u) {
+        flag = 0;
+        /* coreutils 6.3 drop lines for which only key is the same */
+        /* -- disabling last-resort compare... */
+        option_mask32 |= FLAG_s;
+        for (i = 1; i < linecount; i++) {
+            if (!compare_keys(&lines[flag], &lines[i]))
+                free(lines[i]);
+            else
+                lines[++flag] = lines[i];
+        }
+        if (linecount) linecount = flag+1;
     }
     /* Print it */
-    if(!outfile) outfile=stdout;
-    for(i=0;i<linecount;i++) fprintf(outfile,"%s\n",lines[i]);
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    for (i = 0; i < linecount; i++)
+        fprintf(outfile, "%s\n", lines[i]);
+
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }

branches/stable/mindi-busybox/coreutils/stat.c

@@ -1 @@
-/* vi:set ts=4:*/
+/* vi: set sw=4 ts=4: */
 /*
  * stat -- display file or file system status
@@ -6 +6 @@
  * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.org>
+ * Copyright (C) 2006 by Yoshinori Sato <ysato@users.sourceforge.jp>
  *
  * Written by Michael Meskes
@@ -13 +14 @@
  */
 
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/vfs.h>
-#include <time.h>
-#include <getopt.h> /* optind */
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/statvfs.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* vars to control behavior */
-#define OPT_TERSE 2
-#define OPT_DEREFERENCE 4
-static long flags;
-
-static char const *file_type(struct stat const *st)
+#define OPT_FILESYS     (1<<0)
+#define OPT_TERSE       (1<<1)
+#define OPT_DEREFERENCE (1<<2)
+#define OPT_SELINUX     (1<<3)
+
+static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")] ALIGN1;
+
+static char const * file_type(struct stat const *st)
 {
     /* See POSIX 1003.1-2001 XCU Table 4-8 lines 17093-17107
@@ -57 +49 @@
 static char const *human_time(time_t t)
 {
+    /* Old
     static char *str;
     str = ctime(&t);
     str[strlen(str)-1] = '\0';
     return str;
+    */
+    /* coreutils 6.3 compat: */
+
+    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S.000000000", localtime(&t));
+    return buf;
 }
 
@@ -73 +71 @@
     static const struct types {
         long type;
-        const char *fs;
+        const char *const fs;
     } humantypes[] = {
         { 0xADFF,     "affs" },
@@ -112 +110 @@
         { 0, "UNKNOWN" }
     };
-    for (i=0; humantypes[i].type; ++i)
+    for (i = 0; humantypes[i].type; ++i)
         if (humantypes[i].type == f_type)
             break;
@@ -118 +116 @@
 }
 
-#ifdef CONFIG_FEATURE_STAT_FORMAT
+#if ENABLE_FEATURE_STAT_FORMAT
 /* print statfs info */
-static void print_statfs(char *pformat, size_t buf_len, char m,
-             char const *filename, void const *data)
+static void print_statfs(char *pformat, const size_t buf_len, const char m,
+             const char *const filename, void const *data
+             USE_SELINUX(, security_context_t scontext))
 {
     struct statfs const *statfsbuf = data;
-
-    switch (m) {
-    case 'n':
+    if (m == 'n') {
         strncat(pformat, "s", buf_len);
         printf(pformat, filename);
-        break;
-    case 'i':
+    } else if (m == 'i') {
         strncat(pformat, "Lx", buf_len);
         printf(pformat, statfsbuf->f_fsid);
-        break;
-    case 'l':
+    } else if (m == 'l') {
         strncat(pformat, "lu", buf_len);
         printf(pformat, statfsbuf->f_namelen);
-        break;
-    case 't':
+    } else if (m == 't') {
         strncat(pformat, "lx", buf_len);
-        printf(pformat, (unsigned long int) (statfsbuf->f_type));  /* no equiv. */
-        break;
-    case 'T':
+        printf(pformat, (unsigned long) (statfsbuf->f_type)); /* no equiv */
+    } else if (m == 'T') {
         strncat(pformat, "s", buf_len);
         printf(pformat, human_fstype(statfsbuf->f_type));
-        break;
-    case 'b':
+    } else if (m == 'b') {
         strncat(pformat, "jd", buf_len);
         printf(pformat, (intmax_t) (statfsbuf->f_blocks));
-        break;
-    case 'f':
+    } else if (m == 'f') {
         strncat(pformat, "jd", buf_len);
         printf(pformat, (intmax_t) (statfsbuf->f_bfree));
-        break;
-    case 'a':
+    } else if (m == 'a') {
         strncat(pformat, "jd", buf_len);
         printf(pformat, (intmax_t) (statfsbuf->f_bavail));
-        break;
-    case 'S':
-    case 's':
+    } else if (m == 's' || m == 'S') {
         strncat(pformat, "lu", buf_len);
-        printf(pformat, (unsigned long int) (statfsbuf->f_bsize));
-        break;
-    case 'c':
+        printf(pformat, (unsigned long) (statfsbuf->f_bsize));
+    } else if (m == 'c') {
         strncat(pformat, "jd", buf_len);
         printf(pformat, (intmax_t) (statfsbuf->f_files));
-        break;
-    case 'd':
+    } else if (m == 'd') {
         strncat(pformat, "jd", buf_len);
         printf(pformat, (intmax_t) (statfsbuf->f_ffree));
-        break;
-    default:
+#if ENABLE_SELINUX
+    } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) {
+        strncat(pformat, "s", buf_len);
+        printf(scontext);
+#endif
+    } else {
         strncat(pformat, "c", buf_len);
         printf(pformat, m);
-        break;
     }
 }
 
 /* print stat info */
-static void print_stat(char *pformat, size_t buf_len, char m,
-               char const *filename, void const *data)
+static void print_stat(char *pformat, const size_t buf_len, const char m,
+               const char *const filename, void const *data
+               USE_SELINUX(, security_context_t scontext))
 {
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
@@ -187 +177 @@
     struct group *gw_ent;
 
-    switch (m) {
-    case 'n':
+    if (m == 'n') {
         strncat(pformat, "s", buf_len);
         printf(pformat, filename);
-        break;
-    case 'N':
+    } else if (m == 'N') {
         strncat(pformat, "s", buf_len);
         if (S_ISLNK(statbuf->st_mode)) {
-            char *linkname = xreadlink(filename);
+            char *linkname = xmalloc_readlink_or_warn(filename);
             if (linkname == NULL) {
                 bb_perror_msg("cannot read symbolic link '%s'", filename);
@@ -207 +195 @@
             printf(pformat, filename);
         }
-        break;
-    case 'd':
+    } else if (m == 'd') {
         strncat(pformat, "ju", buf_len);
         printf(pformat, (uintmax_t) statbuf->st_dev);
-        break;
-    case 'D':
+    } else if (m == 'D') {
         strncat(pformat, "jx", buf_len);
         printf(pformat, (uintmax_t) statbuf->st_dev);
-        break;
-    case 'i':
+    } else if (m == 'i') {
         strncat(pformat, "ju", buf_len);
         printf(pformat, (uintmax_t) statbuf->st_ino);
-        break;
-    case 'a':
+    } else if (m == 'a') {
         strncat(pformat, "lo", buf_len);
-        printf(pformat, (unsigned long int) (statbuf->st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)));
-        break;
-    case 'A':
+        printf(pformat, (unsigned long) (statbuf->st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)));
+    } else if (m == 'A') {
         strncat(pformat, "s", buf_len);
         printf(pformat, bb_mode_string(statbuf->st_mode));
-        break;
-    case 'f':
+    } else if (m == 'f') {
         strncat(pformat, "lx", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_mode);
-        break;
-    case 'F':
+        printf(pformat, (unsigned long) statbuf->st_mode);
+    } else if (m == 'F') {
         strncat(pformat, "s", buf_len);
         printf(pformat, file_type(statbuf));
-        break;
-    case 'h':
+    } else if (m == 'h') {
         strncat(pformat, "lu", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_nlink);
-        break;
-    case 'u':
+        printf(pformat, (unsigned long) statbuf->st_nlink);
+    } else if (m == 'u') {
         strncat(pformat, "lu", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_uid);
-        break;
-    case 'U':
+        printf(pformat, (unsigned long) statbuf->st_uid);
+    } else if (m == 'U') {
         strncat(pformat, "s", buf_len);
         setpwent();
         pw_ent = getpwuid(statbuf->st_uid);
         printf(pformat, (pw_ent != 0L) ? pw_ent->pw_name : "UNKNOWN");
-        break;
-    case 'g':
+    } else if (m == 'g') {
         strncat(pformat, "lu", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_gid);
-        break;
-    case 'G':
+        printf(pformat, (unsigned long) statbuf->st_gid);
+    } else if (m == 'G') {
         strncat(pformat, "s", buf_len);
         setgrent();
         gw_ent = getgrgid(statbuf->st_gid);
         printf(pformat, (gw_ent != 0L) ? gw_ent->gr_name : "UNKNOWN");
-        break;
-    case 't':
+    } else if (m == 't') {
         strncat(pformat, "lx", buf_len);
-        printf(pformat, (unsigned long int) major(statbuf->st_rdev));
-        break;
-    case 'T':
+        printf(pformat, (unsigned long) major(statbuf->st_rdev));
+    } else if (m == 'T') {
         strncat(pformat, "lx", buf_len);
-        printf(pformat, (unsigned long int) minor(statbuf->st_rdev));
-        break;
-    case 's':
+        printf(pformat, (unsigned long) minor(statbuf->st_rdev));
+    } else if (m == 's') {
         strncat(pformat, "ju", buf_len);
         printf(pformat, (uintmax_t) (statbuf->st_size));
-        break;
-    case 'B':
+    } else if (m == 'B') {
         strncat(pformat, "lu", buf_len);
-        printf(pformat, (unsigned long int) 512); //ST_NBLOCKSIZE
-        break;
-    case 'b':
+        printf(pformat, (unsigned long) 512); //ST_NBLOCKSIZE
+    } else if (m == 'b') {
         strncat(pformat, "ju", buf_len);
         printf(pformat, (uintmax_t) statbuf->st_blocks);
-        break;
-    case 'o':
+    } else if (m == 'o') {
         strncat(pformat, "lu", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_blksize);
-        break;
-    case 'x':
+        printf(pformat, (unsigned long) statbuf->st_blksize);
+    } else if (m == 'x') {
         strncat(pformat, "s", buf_len);
         printf(pformat, human_time(statbuf->st_atime));
-        break;
-    case 'X':
+    } else if (m == 'X') {
         strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_atime);
-        break;
-    case 'y':
+        printf(pformat, (unsigned long) statbuf->st_atime);
+    } else if (m == 'y') {
         strncat(pformat, "s", buf_len);
         printf(pformat, human_time(statbuf->st_mtime));
-        break;
-    case 'Y':
+    } else if (m == 'Y') {
         strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_mtime);
-        break;
-    case 'z':
+        printf(pformat, (unsigned long) statbuf->st_mtime);
+    } else if (m == 'z') {
         strncat(pformat, "s", buf_len);
         printf(pformat, human_time(statbuf->st_ctime));
-        break;
-    case 'Z':
+    } else if (m == 'Z') {
         strncat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu", buf_len);
-        printf(pformat, (unsigned long int) statbuf->st_ctime);
-        break;
-    default:
+        printf(pformat, (unsigned long) statbuf->st_ctime);
+#if ENABLE_SELINUX
+    } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) {
+        strncat(pformat, "s", buf_len);
+        printf(pformat, scontext);
+#endif
+    } else {
         strncat(pformat, "c", buf_len);
         printf(pformat, m);
-        break;
     }
 }
 
 static void print_it(char const *masterformat, char const *filename,
-             void (*print_func) (char *, size_t, char, char const *, void const *),
-             void const *data)
+             void (*print_func) (char *, size_t, char, char const *, void const *
+                                 USE_SELINUX(, security_context_t scontext)),
+                     void const *data USE_SELINUX(, security_context_t scontext) )
 {
     char *b;
 
     /* create a working copy of the format string */
-    char *format = bb_xstrdup(masterformat);
-
-    /* Add 2 to accommodate our conversion of the stat `%s' format string
-     * to the printf `%llu' one.  */
+    char *format = xstrdup(masterformat);
+
+    /* Add 2 to accomodate our conversion of the stat '%s' format string
+     * to the printf '%llu' one.  */
     size_t n_alloc = strlen(format) + 2 + 1;
     char *dest = xmalloc(n_alloc);
@@ -331 +299 @@
     b = format;
     while (b) {
+        size_t len;
         char *p = strchr(b, '%');
-        if (p != NULL) {
-            size_t len;
-            *p++ = '\0';
-            fputs(b, stdout);
-
-            len = strspn(p, "#-+.I 0123456789");
-            dest[0] = '%';
-            memcpy(dest + 1, p, len);
-            dest[1 + len] = 0;
-            p += len;
-
-            b = p + 1;
-            switch (*p) {
-                case '\0':
-                    b = NULL;
-                    /* fall through */
-                case '%':
-                    putchar('%');
-                    break;
-                default:
-                    print_func(dest, n_alloc, *p, filename, data);
-                    break;
-            }
-
-        } else {
-            fputs(b, stdout);
+        if (!p) {
+            /* coreutils 6.3 always print <cr> at the end */
+            /*fputs(b, stdout);*/
+            puts(b);
+            break;
+        }
+        *p++ = '\0';
+        fputs(b, stdout);
+
+        len = strspn(p, "#-+.I 0123456789");
+        dest[0] = '%';
+        memcpy(dest + 1, p, len);
+        dest[1 + len] = 0;
+        p += len;
+
+        b = p + 1;
+        switch (*p) {
+        case '\0':
             b = NULL;
+            /* fall through */
+        case '%':
+            putchar('%');
+            break;
+        default:
+            print_func(dest, n_alloc, *p, filename, data USE_SELINUX(,scontext));
+            break;
         }
     }
@@ -368 +336 @@
 
 /* Stat the file system and print what we find.  */
-static int do_statfs(char const *filename, char const *format)
+static bool do_statfs(char const *filename, char const *format)
 {
     struct statfs statfsbuf;
-
+#if ENABLE_SELINUX
+    security_context_t scontext = NULL;
+
+    if (option_mask32 & OPT_SELINUX) {
+        if ((option_mask32 & OPT_DEREFERENCE
+             ? lgetfilecon(filename, &scontext)
+             : getfilecon(filename, &scontext)
+            ) < 0
+        ) {
+            bb_perror_msg(filename);
+            return 0;
+        }
+    }
+#endif
     if (statfs(filename, &statfsbuf) != 0) {
         bb_perror_msg("cannot read file system information for '%s'", filename);
@@ -377 +358 @@
     }
 
-#ifdef CONFIG_FEATURE_STAT_FORMAT
+#if ENABLE_FEATURE_STAT_FORMAT
     if (format == NULL)
-        format = (flags & OPT_TERSE
+#if !ENABLE_SELINUX
+        format = (option_mask32 & OPT_TERSE
             ? "%n %i %l %t %s %b %f %a %c %d\n"
             : "  File: \"%n\"\n"
@@ -385 +367 @@
               "Block size: %-10s\n"
               "Blocks: Total: %-10b Free: %-10f Available: %a\n"
-              "Inodes: Total: %-10c Free: %d\n");
-    print_it(format, filename, print_statfs, &statfsbuf);
+              "Inodes: Total: %-10c Free: %d");
+    print_it(format, filename, print_statfs, &statfsbuf USE_SELINUX(, scontext));
 #else
-
-    format = (flags & OPT_TERSE
+    format = (option_mask32 & OPT_TERSE
+            ? (option_mask32 & OPT_SELINUX ? "%n %i %l %t %s %b %f %a %c %d %C\n":
+            "%n %i %l %t %s %b %f %a %c %d\n")
+            : (option_mask32 & OPT_SELINUX ?
+            "  File: \"%n\"\n"
+            "    ID: %-8i Namelen: %-7l Type: %T\n"
+            "Block size: %-10s\n"
+            "Blocks: Total: %-10b Free: %-10f Available: %a\n"
+            "Inodes: Total: %-10c Free: %d"
+            "  S_context: %C\n":
+            "  File: \"%n\"\n"
+            "    ID: %-8i Namelen: %-7l Type: %T\n"
+            "Block size: %-10s\n"
+            "Blocks: Total: %-10b Free: %-10f Available: %a\n"
+            "Inodes: Total: %-10c Free: %d\n")
+            );
+    print_it(format, filename, print_statfs, &statfsbuf USE_SELINUX(, scontext));
+#endif /* SELINUX */
+#else /* FEATURE_STAT_FORMAT */
+    format = (option_mask32 & OPT_TERSE
         ? "%s %llx %lu "
         : "  File: \"%s\"\n"
@@ -398 +398 @@
            statfsbuf.f_namelen);
 
-    if (flags & OPT_TERSE)
-        printf("%lx ", (unsigned long int) (statfsbuf.f_type));
+    if (option_mask32 & OPT_TERSE)
+        printf("%lx ", (unsigned long) (statfsbuf.f_type));
     else
         printf("Type: %s\n", human_fstype(statfsbuf.f_type));
 
-    format = (flags & OPT_TERSE
+#if !ENABLE_SELINUX
+    format = (option_mask32 & OPT_TERSE
         ? "%lu %ld %ld %ld %ld %ld\n"
         : "Block size: %-10lu\n"
@@ -409 +410 @@
           "Inodes: Total: %-10jd Free: %jd\n");
     printf(format,
-           (unsigned long int) (statfsbuf.f_bsize),
+           (unsigned long) (statfsbuf.f_bsize),
            (intmax_t) (statfsbuf.f_blocks),
            (intmax_t) (statfsbuf.f_bfree),
@@ -415 +416 @@
            (intmax_t) (statfsbuf.f_files),
            (intmax_t) (statfsbuf.f_ffree));
-#endif
-
+#else
+    format = (option_mask32 & OPT_TERSE
+        ? (option_mask32 & OPT_SELINUX ? "%lu %ld %ld %ld %ld %ld %C\n":
+        "%lu %ld %ld %ld %ld %ld\n")
+        : (option_mask32 & OPT_SELINUX ?
+        "Block size: %-10lu\n"
+        "Blocks: Total: %-10jd Free: %-10jd Available: %jd\n"
+        "Inodes: Total: %-10jd Free: %jd"
+        "S_context: %C\n":
+        "Block size: %-10lu\n"
+        "Blocks: Total: %-10jd Free: %-10jd Available: %jd\n"
+        "Inodes: Total: %-10jd Free: %jd\n"));
+    printf(format,
+           (unsigned long) (statfsbuf.f_bsize),
+           (intmax_t) (statfsbuf.f_blocks),
+           (intmax_t) (statfsbuf.f_bfree),
+           (intmax_t) (statfsbuf.f_bavail),
+           (intmax_t) (statfsbuf.f_files),
+           (intmax_t) (statfsbuf.f_ffree),
+        scontext);
+
+    if (scontext)
+        freecon(scontext);
+#endif
+#endif  /* FEATURE_STAT_FORMAT */
     return 1;
 }
 
 /* stat the file and print what we find */
-static int do_stat(char const *filename, char const *format)
+static bool do_stat(char const *filename, char const *format)
 {
     struct stat statbuf;
-
-    if ((flags & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) {
+#if ENABLE_SELINUX
+    security_context_t scontext = NULL;
+
+    if (option_mask32 & OPT_SELINUX) {
+        if ((option_mask32 & OPT_DEREFERENCE
+             ? lgetfilecon(filename, &scontext)
+             : getfilecon(filename, &scontext)
+            ) < 0
+        ) {
+            bb_perror_msg(filename);
+            return 0;
+        }
+    }
+#endif
+    if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) {
         bb_perror_msg("cannot stat '%s'", filename);
         return 0;
     }
 
-#ifdef CONFIG_FEATURE_STAT_FORMAT
+#if ENABLE_FEATURE_STAT_FORMAT
     if (format == NULL) {
-        if (flags & OPT_TERSE) {
-            format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";
+#if !ENABLE_SELINUX
+        if (option_mask32 & OPT_TERSE) {
+            format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o";
         } else {
             if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) {
@@ -452 +490 @@
             }
         }
-    }
-    print_it(format, filename, print_stat, &statbuf);
 #else
-    if (flags & OPT_TERSE) {
-        printf("%s %ju %ju %lx %lu %lu %jx %ju %lu %lx %lx %lu %lu %lu %lu\n",
+        if (option_mask32 & OPT_TERSE) {
+            format = (option_mask32 & OPT_SELINUX ?
+                  "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n":
+                  "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n");
+        } else {
+            if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) {
+                format = (option_mask32 & OPT_SELINUX ?
+                      "  File: \"%N\"\n"
+                      "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                      "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
+                      " Device type: %t,%T\n"
+                      "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                      "   S_Context: %C\n"
+                      "Access: %x\n" "Modify: %y\n" "Change: %z\n":
+                      "  File: \"%N\"\n"
+                      "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                      "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
+                      " Device type: %t,%T\n"
+                      "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                      "Access: %x\n" "Modify: %y\n" "Change: %z\n");
+            } else {
+                format = (option_mask32 & OPT_SELINUX ?
+                      "  File: \"%N\"\n"
+                      "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                      "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
+                      "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                      "S_Context: %C\n"
+                      "Access: %x\n" "Modify: %y\n" "Change: %z\n":
+                      "  File: \"%N\"\n"
+                      "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                      "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
+                      "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                      "Access: %x\n" "Modify: %y\n" "Change: %z\n");
+            }
+        }
+#endif
+    }
+    print_it(format, filename, print_stat, &statbuf USE_SELINUX(, scontext));
+#else   /* FEATURE_STAT_FORMAT */
+    if (option_mask32 & OPT_TERSE) {
+        printf("%s %ju %ju %lx %lu %lu %jx %ju %lu %lx %lx %lu %lu %lu %lu"
+               SKIP_SELINUX("\n"),
                filename,
                (uintmax_t) (statbuf.st_size),
                (uintmax_t) statbuf.st_blocks,
-               (unsigned long int) statbuf.st_mode,
-               (unsigned long int) statbuf.st_uid,
-               (unsigned long int) statbuf.st_gid,
+               (unsigned long) statbuf.st_mode,
+               (unsigned long) statbuf.st_uid,
+               (unsigned long) statbuf.st_gid,
                (uintmax_t) statbuf.st_dev,
                (uintmax_t) statbuf.st_ino,
-               (unsigned long int) statbuf.st_nlink,
-               (unsigned long int) major(statbuf.st_rdev),
-               (unsigned long int) minor(statbuf.st_rdev),
-               (unsigned long int) statbuf.st_atime,
-               (unsigned long int) statbuf.st_mtime,
-               (unsigned long int) statbuf.st_ctime,
-               (unsigned long int) statbuf.st_blksize
+               (unsigned long) statbuf.st_nlink,
+               (unsigned long) major(statbuf.st_rdev),
+               (unsigned long) minor(statbuf.st_rdev),
+               (unsigned long) statbuf.st_atime,
+               (unsigned long) statbuf.st_mtime,
+               (unsigned long) statbuf.st_ctime,
+               (unsigned long) statbuf.st_blksize
         );
+#if ENABLE_SELINUX
+        if (option_mask32 & OPT_SELINUX)
+            printf(" %lc\n", *scontext);
+        else
+            putchar('\n');
+#endif
     } else {
         char *linkname = NULL;
@@ -484 +566 @@
 
         if (S_ISLNK(statbuf.st_mode))
-            linkname = xreadlink(filename);
+            linkname = xmalloc_readlink_or_warn(filename);
         if (linkname)
             printf("  File: \"%s\" -> \"%s\"\n", filename, linkname);
@@ -494 +576 @@
                (uintmax_t) (statbuf.st_size),
                (uintmax_t) statbuf.st_blocks,
-               (unsigned long int) statbuf.st_blksize,
+               (unsigned long) statbuf.st_blksize,
                file_type(&statbuf),
                (uintmax_t) statbuf.st_dev,
                (uintmax_t) statbuf.st_dev,
                (uintmax_t) statbuf.st_ino,
-               (unsigned long int) statbuf.st_nlink);
+               (unsigned long) statbuf.st_nlink);
         if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode))
             printf(" Device type: %lx,%lx\n",
-                   (unsigned long int) major(statbuf.st_rdev),
-                   (unsigned long int) minor(statbuf.st_rdev));
+                   (unsigned long) major(statbuf.st_rdev),
+                   (unsigned long) minor(statbuf.st_rdev));
         else
             putchar('\n');
-        printf("Access: (%04lo/%10.10s)  Uid: (%5lu/%8s)   Gid: (%5lu/%8s)\n"
-               "Access: %s\n" "Modify: %s\n" "Change: %s\n",
-               (unsigned long int) (statbuf.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)),
+        printf("Access: (%04lo/%10.10s)  Uid: (%5lu/%8s)   Gid: (%5lu/%8s)\n",
+               (unsigned long) (statbuf.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)),
                bb_mode_string(statbuf.st_mode),
-               (unsigned long int) statbuf.st_uid,
+               (unsigned long) statbuf.st_uid,
                (pw_ent != 0L) ? pw_ent->pw_name : "UNKNOWN",
-               (unsigned long int) statbuf.st_gid,
-               (gw_ent != 0L) ? gw_ent->gr_name : "UNKNOWN",
+               (unsigned long) statbuf.st_gid,
+               (gw_ent != 0L) ? gw_ent->gr_name : "UNKNOWN");
+#if ENABLE_SELINUX
+        printf("   S_Context: %lc\n", *scontext);
+#endif
+        printf("Access: %s\n" "Modify: %s\n" "Change: %s\n",
                human_time(statbuf.st_atime),
                human_time(statbuf.st_mtime),
                human_time(statbuf.st_ctime));
     }
-#endif
+#endif  /* FEATURE_STAT_FORMAT */
     return 1;
 }
 
+int stat_main(int argc, char **argv);
 int stat_main(int argc, char **argv)
 {
+    char *format = NULL;
     int i;
-    char *format = NULL;
     int ok = 1;
-    int (*statfunc)(char const *, char const *) = do_stat;
-
-    flags = bb_getopt_ulflags(argc, argv, "ftL"
-    USE_FEATURE_STAT_FORMAT("c:", &format)
+    bool (*statfunc)(char const *, char const *) = do_stat;
+
+    getopt32(argv, "ftL"
+        USE_SELINUX("Z")
+        USE_FEATURE_STAT_FORMAT("c:", &format)
     );
 
-    if (flags & 1)                /* -f */
+    if (option_mask32 & OPT_FILESYS) /* -f */
         statfunc = do_statfs;
     if (argc == optind)           /* files */
         bb_show_usage();
 
+#if ENABLE_SELINUX
+    if (option_mask32 & OPT_SELINUX) {
+        selinux_or_die();
+    }
+#endif  /* ENABLE_SELINUX */
     for (i = optind; i < argc; ++i)
         ok &= statfunc(argv[i], format);

branches/stable/mindi-busybox/coreutils/stty.c

@@ -22 +22 @@
    */
 
-//#define TEST
-
-#include "busybox.h"
-#include <stddef.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-
-#include <sys/param.h>
-#include <unistd.h>
-
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <fcntl.h>
-
-#define STREQ(a, b) (strcmp ((a), (b)) == 0)
-
+#include "libbb.h"
 
 #ifndef _POSIX_VDISABLE
@@ -56 +29 @@
 
 #define Control(c) ((c) & 0x1f)
-/* Canonical values for control characters. */
+/* Canonical values for control characters */
 #ifndef CINTR
-# define CINTR Control ('c')
+# define CINTR Control('c')
 #endif
 #ifndef CQUIT
@@ -67 +40 @@
 #endif
 #ifndef CKILL
-# define CKILL Control ('u')
+# define CKILL Control('u')
 #endif
 #ifndef CEOF
-# define CEOF Control ('d')
+# define CEOF Control('d')
 #endif
 #ifndef CEOL
@@ -76 +49 @@
 #endif
 #ifndef CSTART
-# define CSTART Control ('q')
+# define CSTART Control('q')
 #endif
 #ifndef CSTOP
-# define CSTOP Control ('s')
+# define CSTOP Control('s')
 #endif
 #ifndef CSUSP
-# define CSUSP Control ('z')
+# define CSUSP Control('z')
 #endif
 #if defined(VEOL2) && !defined(CEOL2)
 # define CEOL2 _POSIX_VDISABLE
 #endif
-/* ISC renamed swtch to susp for termios, but we'll accept either name.  */
+/* ISC renamed swtch to susp for termios, but we'll accept either name */
 #if defined(VSUSP) && !defined(VSWTCH)
 # define VSWTCH VSUSP
@@ -96 +69 @@
 #endif
 
-/* SunOS 5.3 loses (^Z doesn't work) if `swtch' is the same as `susp'.
-   So the default is to disable `swtch.'  */
-#if defined (__sparc__) && defined (__svr4__)
+/* SunOS 5.3 loses (^Z doesn't work) if 'swtch' is the same as 'susp'.
+   So the default is to disable 'swtch.'  */
+#if defined(__sparc__) && defined(__svr4__)
 # undef CSWTCH
 # define CSWTCH _POSIX_VDISABLE
 #endif
 
-#if defined(VWERSE) && !defined (VWERASE)       /* AIX-3.2.5 */
+#if defined(VWERSE) && !defined(VWERASE)       /* AIX-3.2.5 */
 # define VWERASE VWERSE
 #endif
-#if defined(VDSUSP) && !defined (CDSUSP)
-# define CDSUSP Control ('y')
+#if defined(VDSUSP) && !defined(CDSUSP)
+# define CDSUSP Control('y')
 #endif
 #if !defined(VREPRINT) && defined(VRPRNT)       /* Irix 4.0.5 */
@@ -113 +86 @@
 #endif
 #if defined(VREPRINT) && !defined(CRPRNT)
-# define CRPRNT Control ('r')
+# define CRPRNT Control('r')
 #endif
 #if defined(VWERASE) && !defined(CWERASE)
-# define CWERASE Control ('w')
+# define CWERASE Control('w')
 #endif
 #if defined(VLNEXT) && !defined(CLNEXT)
-# define CLNEXT Control ('v')
+# define CLNEXT Control('v')
 #endif
 #if defined(VDISCARD) && !defined(VFLUSHO)
@@ -137 +110 @@
 #endif
 #if defined(VFLUSHO) && !defined(CFLUSHO)
-# define CFLUSHO Control ('o')
+# define CFLUSHO Control('o')
 #endif
 #if defined(VSTATUS) && !defined(CSTATUS)
-# define CSTATUS Control ('t')
-#endif
-
-/* Which speeds to set.  */
+# define CSTATUS Control('t')
+#endif
+
+/* Which speeds to set */
 enum speed_setting {
     input_speed, output_speed, both_speeds
 };
 
-/* Which member(s) of `struct termios' a mode uses.  */
-enum mode_type {
+/* Which member(s) of 'struct termios' a mode uses */
+enum {
     /* Do NOT change the order or values, as mode_type_flag()
-     * depends on them. */
+     * depends on them */
     control, input, output, local, combination
 };
 
-
-static const char evenp     [] = "evenp";
-static const char raw       [] = "raw";
-static const char stty_min  [] = "min";
-static const char stty_time [] = "time";
-static const char stty_swtch[] = "swtch";
-static const char stty_eol  [] = "eol";
-static const char stty_eof  [] = "eof";
-static const char parity    [] = "parity";
-static const char stty_oddp [] = "oddp";
-static const char stty_nl   [] = "nl";
-static const char stty_ek   [] = "ek";
-static const char stty_sane [] = "sane";
-static const char cbreak    [] = "cbreak";
-static const char stty_pass8[] = "pass8";
-static const char litout    [] = "litout";
-static const char cooked    [] = "cooked";
-static const char decctlq   [] = "decctlq";
-static const char stty_tabs [] = "tabs";
-static const char stty_lcase[] = "lcase";
-static const char stty_LCASE[] = "LCASE";
-static const char stty_crt  [] = "crt";
-static const char stty_dec  [] = "dec";
-
-
-/* Flags for `struct mode_info'. */
-#define SANE_SET 1              /* Set in `sane' mode.                  */
-#define SANE_UNSET 2            /* Unset in `sane' mode.                */
-#define REV 4                   /* Can be turned off by prepending `-'. */
-#define OMIT 8                  /* Don't display value.                 */
-
-/* Each mode.  */
+static const char evenp     [] ALIGN1 = "evenp";
+static const char raw       [] ALIGN1 = "raw";
+static const char stty_min  [] ALIGN1 = "min";
+static const char stty_time [] ALIGN1 = "time";
+static const char stty_swtch[] ALIGN1 = "swtch";
+static const char stty_eol  [] ALIGN1 = "eol";
+static const char stty_eof  [] ALIGN1 = "eof";
+static const char parity    [] ALIGN1 = "parity";
+static const char stty_oddp [] ALIGN1 = "oddp";
+static const char stty_nl   [] ALIGN1 = "nl";
+static const char stty_ek   [] ALIGN1 = "ek";
+static const char stty_sane [] ALIGN1 = "sane";
+static const char cbreak    [] ALIGN1 = "cbreak";
+static const char stty_pass8[] ALIGN1 = "pass8";
+static const char litout    [] ALIGN1 = "litout";
+static const char cooked    [] ALIGN1 = "cooked";
+static const char decctlq   [] ALIGN1 = "decctlq";
+static const char stty_tabs [] ALIGN1 = "tabs";
+static const char stty_lcase[] ALIGN1 = "lcase";
+static const char stty_LCASE[] ALIGN1 = "LCASE";
+static const char stty_crt  [] ALIGN1 = "crt";
+static const char stty_dec  [] ALIGN1 = "dec";
+
+/* Flags for 'struct mode_info' */
+#define SANE_SET 1              /* Set in 'sane' mode                  */
+#define SANE_UNSET 2            /* Unset in 'sane' mode                */
+#define REV 4                   /* Can be turned off by prepending '-' */
+#define OMIT 8                  /* Don't display value                 */
+
+/* Each mode */
 struct mode_info {
-    const char *name;       /* Name given on command line.           */
-    /* enum mode_type type; */
-    char type;              /* Which structure element to change.    */
-    char flags;             /* Setting and display options.          */
-    unsigned short mask;     /* Other bits to turn off for this mode. */
-    unsigned long bits;     /* Bits to set for this mode.            */
+    const char *const name;      /* Name given on command line           */
+    const unsigned char type;     /* Which structure element to change    */
+    const unsigned char flags;    /* Setting and display options          */
+    /* were using short here, but ppc32 was unhappy: */
+    const tcflag_t mask;          /* Other bits to turn off for this mode */
+    const tcflag_t bits;          /* Bits to set for this mode            */
 };
 
+/* We can optimize it further by using name[8] instead of char *name */
+/* but beware of "if (info->name == evenp)" checks! */
+/* Need to replace them with "if (info == &mode_info[EVENP_INDX])" */
+
 #define MI_ENTRY(N,T,F,B,M) { N, T, F, M, B }
 
-static const struct  mode_info mode_info[] = {
+static const struct mode_info mode_info[] = {
     MI_ENTRY("parenb",   control,     REV,               PARENB,     0 ),
     MI_ENTRY("parodd",   control,     REV,               PARODD,     0 ),
@@ -333 +308 @@
     MI_ENTRY(decctlq,    combination, REV        | OMIT, 0,          0 ),
 #endif
-#if defined (TABDLY) || defined (OXTABS)
+#if defined(TABDLY) || defined(OXTABS)
     MI_ENTRY(stty_tabs,  combination, REV        | OMIT, 0,          0 ),
 #endif
@@ -345 +320 @@
 
 enum {
-    NUM_mode_info =
-    (sizeof(mode_info) / sizeof(struct mode_info))
+    NUM_mode_info = ARRAY_SIZE(mode_info)
 };
 
-/* Control character settings.  */
+/* Control character settings */
 struct control_info {
-    const char *name;                       /* Name given on command line.  */
-    unsigned char saneval;          /* Value to set for `stty sane'.  */
-    unsigned char offset;                           /* Offset in c_cc.  */
+    const char *const name;               /* Name given on command line */
+    const unsigned char saneval;          /* Value to set for 'stty sane' */
+    const unsigned char offset;           /* Offset in c_cc */
 };
 
-/* Control characters. */
-
-static const struct  control_info control_info[] = {
+/* Control characters */
+
+static const struct control_info control_info[] = {
     {"intr",     CINTR,   VINTR},
     {"quit",     CQUIT,   VQUIT},
@@ -392 +366 @@
     {"status",   CSTATUS, VSTATUS},
 #endif
-    /* These must be last because of the display routines. */
+    /* These must be last because of the display routines */
     {stty_min,   1,       VMIN},
     {stty_time,  0,       VTIME},
@@ -398 +372 @@
 
 enum {
-    NUM_control_info =
-    (sizeof(control_info) / sizeof(struct control_info))
+    NUM_control_info = ARRAY_SIZE(control_info)
 };
 
-#define EMT(t) ((enum mode_type)(t))
-
-static const char *  visible(unsigned int ch);
-static int           recover_mode(char *arg, struct termios *mode);
-static int           screen_columns(void);
-static int           set_mode(const struct mode_info *info,
-                    int reversed, struct termios *mode);
-static speed_t       string_to_baud(const char *arg);
-static tcflag_t*     mode_type_flag(enum mode_type type, struct termios *mode);
-static void          display_all(struct termios *mode);
-static void          display_changed(struct termios *mode);
-static void          display_recoverable(struct termios *mode);
-static void          display_speed(struct termios *mode, int fancy);
-static void          display_window_size(int fancy);
-static void          sane_mode(struct termios *mode);
-static void          set_control_char(const struct control_info *info,
-                    const char *arg, struct termios *mode);
-static void          set_speed(enum speed_setting type,
-                    const char *arg, struct termios *mode);
-static void          set_window_size(int rows, int cols);
-
-static const char *device_name;
-
-static ATTRIBUTE_NORETURN void perror_on_device(const char *fmt)
+/* The width of the screen, for output wrapping */
+unsigned max_col = 80; /* default */
+
+struct globals {
+    /* Current position, to know when to wrap */
+    unsigned current_col;
+    char buf[10];
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+
+static const char *device_name = bb_msg_standard_input;
+
+/* Return a string that is the printable representation of character CH */
+/* Adapted from 'cat' by Torbjorn Granlund */
+static const char *visible(unsigned ch)
+{
+    char *bpout = G.buf;
+
+    if (ch == _POSIX_VDISABLE)
+        return "<undef>";
+
+    if (ch >= 128) {
+        ch -= 128;
+        *bpout++ = 'M';
+        *bpout++ = '-';
+    }
+
+    if (ch < 32) {
+        *bpout++ = '^';
+        *bpout++ = ch + 64;
+    } else if (ch < 127) {
+        *bpout++ = ch;
+    } else {
+        *bpout++ = '^';
+        *bpout++ = '?';
+    }
+
+    *bpout = '\0';
+    return G.buf;
+}
+
+static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode)
+{
+    static const unsigned char tcflag_offsets[] ALIGN1 = {
+        offsetof(struct termios, c_cflag), /* control */
+        offsetof(struct termios, c_iflag), /* input */
+        offsetof(struct termios, c_oflag), /* output */
+        offsetof(struct termios, c_lflag)  /* local */
+    };
+
+    if (type <= local) {
+        return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]);
+    }
+    return NULL;
+}
+
+static void set_speed_or_die(enum speed_setting type, const char *const arg,
+                    struct termios * const mode)
+{
+    speed_t baud;
+
+    baud = tty_value_to_baud(xatou(arg));
+
+    if (type != output_speed) {     /* either input or both */
+        cfsetispeed(mode, baud);
+    }
+    if (type != input_speed) {      /* either output or both */
+        cfsetospeed(mode, baud);
+    }
+}
+
+static ATTRIBUTE_NORETURN void perror_on_device_and_die(const char *fmt)
 {
     bb_perror_msg_and_die(fmt, device_name);
 }
 
-
-/* The width of the screen, for output wrapping. */
-static int max_col;
-
-/* Current position, to know when to wrap. */
-static int current_col;
+static void perror_on_device(const char *fmt)
+{
+    bb_perror_msg(fmt, device_name);
+}
 
 /* Print format string MESSAGE and optional args.
    Wrap to next line first if it won't fit.
-   Print a space first unless MESSAGE will start a new line. */
-
+   Print a space first unless MESSAGE will start a new line */
 static void wrapf(const char *message, ...)
 {
+    char buf[128];
     va_list args;
-    char buf[1024];                 /* Plenty long for our needs. */
     int buflen;
 
     va_start(args, message);
-    vsprintf(buf, message, args);
+    buflen = vsnprintf(buf, sizeof(buf), message, args);
     va_end(args);
-    buflen = strlen(buf);
-    if (current_col + (current_col > 0) + buflen >= max_col) {
-        putchar('\n');
-        current_col = 0;
-    }
-    if (current_col > 0) {
-        putchar(' ');
-        current_col++;
+    /* We seem to be called only with suitable lengths, but check if
+       somebody failed to adhere to this assumption just to be sure.  */
+    if (!buflen || buflen >= sizeof(buf)) return;
+
+    if (G.current_col > 0) {
+        G.current_col++;
+        if (buf[0] != '\n') {
+            if (G.current_col + buflen >= max_col) {
+                putchar('\n');
+                G.current_col = 0;
+            } else
+                putchar(' ');
+        }
     }
     fputs(buf, stdout);
-    current_col += buflen;
-}
-
-static const struct suffix_mult stty_suffixes[] = {
-    {"b",  512 },
-    {"k",  1024},
-    {"B",  1024},
-    {NULL, 0   }
-};
-
-#ifndef TEST
-int stty_main(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
-{
-    struct termios mode;
-    void (*output_func)(struct termios *);
-    int    optc;
-    int    require_set_attr;
-    int    speed_was_set;
-    int    verbose_output;
-    int    recoverable_output;
-    int    k;
-    int    noargs = 1;
-    char * file_name = NULL;
-
-    output_func = display_changed;
-    verbose_output = 0;
-    recoverable_output = 0;
-
-    /* Don't print error messages for unrecognized options.  */
-    opterr = 0;
-
-    while ((optc = getopt(argc, argv, "agF:")) != -1) {
-        switch (optc) {
-        case 'a':
-            verbose_output = 1;
-            output_func = display_all;
-            break;
-
-        case 'g':
-            recoverable_output = 1;
-            output_func = display_recoverable;
-            break;
-
-        case 'F':
-            if (file_name)
-                bb_error_msg_and_die("only one device may be specified");
-            file_name = optarg;
-            break;
-
-        default:                /* unrecognized option */
-            noargs = 0;
-            break;
-        }
-
-        if (noargs == 0)
-            break;
-    }
-
-    if (optind < argc)
-        noargs = 0;
-
-    /* Specifying both -a and -g gets an error.  */
-    if (verbose_output & recoverable_output)
-        bb_error_msg_and_die ("verbose and stty-readable output styles are mutually exclusive");
-
-    /* Specifying any other arguments with -a or -g gets an error.  */
-    if (~noargs & (verbose_output | recoverable_output))
-        bb_error_msg_and_die ("modes may not be set when specifying an output style");
-
-    /* FIXME: it'd be better not to open the file until we've verified
-       that all arguments are valid.  Otherwise, we could end up doing
-       only some of the requested operations and then failing, probably
-       leaving things in an undesirable state.  */
-
-    if (file_name) {
-        int fdflags;
-
-        device_name = file_name;
-        fclose(stdin);
-        bb_xopen(device_name, O_RDONLY | O_NONBLOCK);
-        if ((fdflags = fcntl(STDIN_FILENO, F_GETFL)) == -1
-            || fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
-            perror_on_device("%s: couldn't reset non-blocking mode");
-    } else {
-        device_name = bb_msg_standard_input;
-    }
-
-    /* Initialize to all zeroes so there is no risk memcmp will report a
-       spurious difference in an uninitialized portion of the structure.  */
-    memset(&mode, 0, sizeof(mode));
-    if (tcgetattr(STDIN_FILENO, &mode))
-        perror_on_device("%s");
-
-    if (verbose_output | recoverable_output | noargs) {
-        max_col = screen_columns();
-        current_col = 0;
-        output_func(&mode);
-        return EXIT_SUCCESS;
-    }
-
-    speed_was_set = 0;
-    require_set_attr = 0;
-    k = 0;
-    while (++k < argc) {
-        int match_found = 0;
-        int reversed = 0;
-        int i;
-
-        if (argv[k][0] == '-') {
-            char *find_dev_opt;
-
-            ++argv[k];
-
-     /* Handle "-a", "-ag", "-aF/dev/foo", "-aF /dev/foo", etc.
-    Find the options that have been parsed.  This is really
-    gross, but it's needed because stty SETTINGS look like options to
-    getopt(), so we need to work around things in a really horrible
-    way.  If any new options are ever added to stty, the short option
-    MUST NOT be a letter which is the first letter of one of the
-    possible stty settings.
-     */
-            find_dev_opt = strchr(argv[k], 'F'); /* find -*F* */
-            if(find_dev_opt) {
-                if(find_dev_opt[1]==0)  /* -*F   /dev/foo */
-                    k++;            /* skip  /dev/foo */
-                continue;   /* else -*F/dev/foo - no skip */
-            }
-            if(argv[k][0]=='a' || argv[k][0]=='g')
-                continue;
-            /* Is not options - is reverse params */
-            reversed = 1;
-        }
-        for (i = 0; i < NUM_mode_info; ++i)
-            if (STREQ(argv[k], mode_info[i].name)) {
-                match_found = set_mode(&mode_info[i], reversed, &mode);
-                require_set_attr = 1;
-                break;
-            }
-
-        if (match_found == 0 && reversed)
-            bb_error_msg_and_die("invalid argument `%s'", --argv[k]);
-
-        if (match_found == 0)
-            for (i = 0; i < NUM_control_info; ++i)
-                if (STREQ(argv[k], control_info[i].name)) {
-                    if (k == argc - 1)
-                        bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
-                    match_found = 1;
-                    ++k;
-                    set_control_char(&control_info[i], argv[k], &mode);
-                    require_set_attr = 1;
-                    break;
-                }
-
-        if (match_found == 0) {
-            if (STREQ(argv[k], "ispeed")) {
-                if (k == argc - 1)
-                    bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
-                ++k;
-                set_speed(input_speed, argv[k], &mode);
-                speed_was_set = 1;
-                require_set_attr = 1;
-            } else if (STREQ(argv[k], "ospeed")) {
-                if (k == argc - 1)
-                    bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
-                ++k;
-                set_speed(output_speed, argv[k], &mode);
-                speed_was_set = 1;
-                require_set_attr = 1;
-            }
-#ifdef TIOCGWINSZ
-            else if (STREQ(argv[k], "rows")) {
-                if (k == argc - 1)
-                    bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
-                ++k;
-                set_window_size((int) bb_xparse_number(argv[k], stty_suffixes),
-                                -1);
-            } else if (STREQ(argv[k], "cols") || STREQ(argv[k], "columns")) {
-                if (k == argc - 1)
-                    bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
-                ++k;
-                set_window_size(-1,
-                        (int) bb_xparse_number(argv[k], stty_suffixes));
-            } else if (STREQ(argv[k], "size")) {
-                max_col = screen_columns();
-                current_col = 0;
-                display_window_size(0);
-            }
-#endif
-#ifdef HAVE_C_LINE
-            else if (STREQ(argv[k], "line")) {
-                if (k == argc - 1)
-                    bb_error_msg_and_die(bb_msg_requires_arg, argv[k]);
-                ++k;
-                mode.c_line = bb_xparse_number(argv[k], stty_suffixes);
-                require_set_attr = 1;
-            }
-#endif
-            else if (STREQ(argv[k], "speed")) {
-                max_col = screen_columns();
-                display_speed(&mode, 0);
-            } else if (recover_mode(argv[k], &mode) == 1)
-                require_set_attr = 1;
-            else if (string_to_baud(argv[k]) != (speed_t) - 1) {
-                set_speed(both_speeds, argv[k], &mode);
-                speed_was_set = 1;
-                require_set_attr = 1;
-            } else
-                bb_error_msg_and_die("invalid argument `%s'", argv[k]);
-        }
-    }
-
-    if (require_set_attr) {
-        struct termios new_mode;
-
-        if (tcsetattr(STDIN_FILENO, TCSADRAIN, &mode))
-            perror_on_device("%s");
-
-        /* POSIX (according to Zlotnick's book) tcsetattr returns zero if
-           it performs *any* of the requested operations.  This means it
-           can report `success' when it has actually failed to perform
-           some proper subset of the requested operations.  To detect
-           this partial failure, get the current terminal attributes and
-           compare them to the requested ones.  */
-
-        /* Initialize to all zeroes so there is no risk memcmp will report a
-           spurious difference in an uninitialized portion of the structure.  */
-        memset(&new_mode, 0, sizeof(new_mode));
-        if (tcgetattr(STDIN_FILENO, &new_mode))
-            perror_on_device("%s");
-
-        /* Normally, one shouldn't use memcmp to compare structures that
-           may have `holes' containing uninitialized data, but we have been
-           careful to initialize the storage of these two variables to all
-           zeroes.  One might think it more efficient simply to compare the
-           modified fields, but that would require enumerating those fields --
-           and not all systems have the same fields in this structure.  */
-
-        if (memcmp(&mode, &new_mode, sizeof(mode)) != 0) {
-#ifdef CIBAUD
-            /* SunOS 4.1.3 (at least) has the problem that after this sequence,
-               tcgetattr (&m1); tcsetattr (&m1); tcgetattr (&m2);
-               sometimes (m1 != m2).  The only difference is in the four bits
-               of the c_cflag field corresponding to the baud rate.  To save
-               Sun users a little confusion, don't report an error if this
-               happens.  But suppress the error only if we haven't tried to
-               set the baud rate explicitly -- otherwise we'd never give an
-               error for a true failure to set the baud rate.  */
-
-            new_mode.c_cflag &= (~CIBAUD);
-            if (speed_was_set || memcmp(&mode, &new_mode, sizeof(mode)) != 0)
-#endif
-                perror_on_device ("%s: unable to perform all requested operations");
-        }
-    }
-
-    return EXIT_SUCCESS;
-}
-
-/* Return 0 if not applied because not reversible; otherwise return 1.  */
-
-static int
-set_mode(const struct mode_info *info, int reversed, struct termios *mode)
-{
-    tcflag_t *bitsp;
-
-    if (reversed && (info->flags & REV) == 0)
-        return 0;
-
-    bitsp = mode_type_flag(EMT(info->type), mode);
-
-    if (bitsp == NULL) {
-        /* Combination mode. */
-        if (info->name == evenp || info->name == parity) {
-            if (reversed)
-                mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
-            else
-                mode->c_cflag =
-                    (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7;
-        } else if (info->name == stty_oddp) {
-            if (reversed)
-                mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
-            else
-                mode->c_cflag =
-                    (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB;
-        } else if (info->name == stty_nl) {
-            if (reversed) {
-                mode->c_iflag = (mode->c_iflag | ICRNL) & ~INLCR & ~IGNCR;
-                mode->c_oflag = (mode->c_oflag
-#ifdef ONLCR
-                                 | ONLCR
-#endif
-                    )
-#ifdef OCRNL
-                    & ~OCRNL
-#endif
-#ifdef ONLRET
-                    & ~ONLRET
-#endif
-                    ;
-            } else {
-                mode->c_iflag = mode->c_iflag & ~ICRNL;
-#ifdef ONLCR
-                mode->c_oflag = mode->c_oflag & ~ONLCR;
-#endif
-            }
-        } else if (info->name == stty_ek) {
-            mode->c_cc[VERASE] = CERASE;
-            mode->c_cc[VKILL] = CKILL;
-        } else if (info->name == stty_sane)
-            sane_mode(mode);
-        else if (info->name == cbreak) {
-            if (reversed)
-                mode->c_lflag |= ICANON;
-            else
-                mode->c_lflag &= ~ICANON;
-        } else if (info->name == stty_pass8) {
-            if (reversed) {
-                mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARENB;
-                mode->c_iflag |= ISTRIP;
-            } else {
-                mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
-                mode->c_iflag &= ~ISTRIP;
-            }
-        } else if (info->name == litout) {
-            if (reversed) {
-                mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARENB;
-                mode->c_iflag |= ISTRIP;
-                mode->c_oflag |= OPOST;
-            } else {
-                mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
-                mode->c_iflag &= ~ISTRIP;
-                mode->c_oflag &= ~OPOST;
-            }
-        } else if (info->name == raw || info->name == cooked) {
-            if ((info->name[0] == 'r' && reversed)
-                || (info->name[0] == 'c' && !reversed)) {
-                /* Cooked mode. */
-                mode->c_iflag |= BRKINT | IGNPAR | ISTRIP | ICRNL | IXON;
-                mode->c_oflag |= OPOST;
-                mode->c_lflag |= ISIG | ICANON;
-#if VMIN == VEOF
-                mode->c_cc[VEOF] = CEOF;
-#endif
-#if VTIME == VEOL
-                mode->c_cc[VEOL] = CEOL;
-#endif
-            } else {
-                /* Raw mode. */
-                mode->c_iflag = 0;
-                mode->c_oflag &= ~OPOST;
-                mode->c_lflag &= ~(ISIG | ICANON
-#ifdef XCASE
-                                   | XCASE
-#endif
-                    );
-                mode->c_cc[VMIN] = 1;
-                mode->c_cc[VTIME] = 0;
-            }
-        }
-#ifdef IXANY
-        else if (info->name == decctlq) {
-            if (reversed)
-                mode->c_iflag |= IXANY;
-            else
-                mode->c_iflag &= ~IXANY;
-        }
-#endif
-#ifdef TABDLY
-        else if (info->name == stty_tabs) {
-            if (reversed)
-                mode->c_oflag = (mode->c_oflag & ~TABDLY) | TAB3;
-            else
-                mode->c_oflag = (mode->c_oflag & ~TABDLY) | TAB0;
-        }
-#else
-# ifdef OXTABS
-        else if (info->name == stty_tabs) {
-            if (reversed)
-                mode->c_oflag = mode->c_oflag | OXTABS;
-            else
-                mode->c_oflag = mode->c_oflag & ~OXTABS;
-        }
-# endif
-#endif
-#if defined(XCASE) && defined(IUCLC) && defined(OLCUC)
-        else if (info->name == stty_lcase || info->name == stty_LCASE) {
-            if (reversed) {
-                mode->c_lflag &= ~XCASE;
-                mode->c_iflag &= ~IUCLC;
-                mode->c_oflag &= ~OLCUC;
-            } else {
-                mode->c_lflag |= XCASE;
-                mode->c_iflag |= IUCLC;
-                mode->c_oflag |= OLCUC;
-            }
-        }
-#endif
-        else if (info->name == stty_crt)
-            mode->c_lflag |= ECHOE
-#ifdef ECHOCTL
-                | ECHOCTL
-#endif
-#ifdef ECHOKE
-                | ECHOKE
-#endif
-                ;
-        else if (info->name == stty_dec) {
-            mode->c_cc[VINTR] = 3;  /* ^C */
-            mode->c_cc[VERASE] = 127;       /* DEL */
-            mode->c_cc[VKILL] = 21; /* ^U */
-            mode->c_lflag |= ECHOE
-#ifdef ECHOCTL
-                | ECHOCTL
-#endif
-#ifdef ECHOKE
-                | ECHOKE
-#endif
-                ;
-#ifdef IXANY
-            mode->c_iflag &= ~IXANY;
-#endif
-        }
-    } else if (reversed)
-        *bitsp = *bitsp & ~((unsigned long)info->mask) & ~info->bits;
-    else
-        *bitsp = (*bitsp & ~((unsigned long)info->mask)) | info->bits;
-
-    return 1;
-}
-
-static void
-set_control_char(const struct control_info *info, const char *arg,
-                 struct termios *mode)
-{
-    unsigned char value;
-
-    if (info->name == stty_min || info->name == stty_time)
-        value = bb_xparse_number(arg, stty_suffixes);
-    else if (arg[0] == '\0' || arg[1] == '\0')
-        value = arg[0];
-    else if (STREQ(arg, "^-") || STREQ(arg, "undef"))
-        value = _POSIX_VDISABLE;
-    else if (arg[0] == '^' && arg[1] != '\0') {     /* Ignore any trailing junk. */
-        if (arg[1] == '?')
-            value = 127;
-        else
-            value = arg[1] & ~0140; /* Non-letters get weird results. */
-    } else
-        value = bb_xparse_number(arg, stty_suffixes);
-    mode->c_cc[info->offset] = value;
-}
-
-static void
-set_speed(enum speed_setting type, const char *arg, struct termios *mode)
-{
-    speed_t baud;
-
-    baud = string_to_baud(arg);
-
-    if (type != output_speed) {     /* either input or both */
-        cfsetispeed(mode, baud);
-    }
-    if (type != input_speed) {      /* either output or both */
-        cfsetospeed(mode, baud);
-    }
-}
-
-#ifdef TIOCGWINSZ
-
-static int get_win_size(int fd, struct winsize *win)
-{
-    int err = ioctl(fd, TIOCGWINSZ, (char *) win);
-
-    return err;
-}
-
-static void
-set_window_size(int rows, int cols)
-{
-    struct winsize win;
-
-    if (get_win_size(STDIN_FILENO, &win)) {
-        if (errno != EINVAL)
-            perror_on_device("%s");
+    G.current_col += buflen;
+    if (buf[buflen-1] == '\n')
+        G.current_col = 0;
+}
+
+static void set_window_size(const int rows, const int cols)
+{
+    struct winsize win = { 0, 0, 0, 0};
+
+    if (ioctl(STDIN_FILENO, TIOCGWINSZ, &win)) {
+        if (errno != EINVAL) {
+            goto bail;
+        }
         memset(&win, 0, sizeof(win));
     }
@@ -956 +504 @@
         win.ws_col = cols;
 
-# ifdef TIOCSSIZE
-    /* Alexander Dupuy <dupuy@cs.columbia.edu> wrote:
-       The following code deals with a bug in the SunOS 4.x (and 3.x?) kernel.
-       This comment from sys/ttold.h describes Sun's twisted logic - a better
-       test would have been (ts_lines > 64k || ts_cols > 64k || ts_cols == 0).
-       At any rate, the problem is gone in Solaris 2.x. */
-
-    if (win.ws_row == 0 || win.ws_col == 0) {
-        struct ttysize ttysz;
-
-        ttysz.ts_lines = win.ws_row;
-        ttysz.ts_cols = win.ws_col;
-
-        win.ws_row = win.ws_col = 1;
-
-        if ((ioctl(STDIN_FILENO, TIOCSWINSZ, (char *) &win) != 0)
-            || (ioctl(STDIN_FILENO, TIOCSSIZE, (char *) &ttysz) != 0)) {
-            perror_on_device("%s");
-        }
-        return;
-    }
-# endif
-
     if (ioctl(STDIN_FILENO, TIOCSWINSZ, (char *) &win))
+bail:
         perror_on_device("%s");
 }
 
-static void display_window_size(int fancy)
-{
-    const char *fmt_str = "%s" "\0" "%s: no size information for this device";
-    struct winsize win;
-
-    if (get_win_size(STDIN_FILENO, &win)) {
+static void display_window_size(const int fancy)
+{
+    const char *fmt_str = "%s\0%s: no size information for this device";
+    unsigned width, height;
+
+    if (get_terminal_width_height(STDIN_FILENO, &width, &height)) {
         if ((errno != EINVAL) || ((fmt_str += 2), !fancy)) {
             perror_on_device(fmt_str);
@@ -994 +520 @@
     } else {
         wrapf(fancy ? "rows %d; columns %d;" : "%d %d\n",
-              win.ws_row, win.ws_col);
-        if (!fancy)
-            current_col = 0;
-    }
-}
-#endif
-
-static int screen_columns(void)
-{
-    int columns;
-    const char *s;
-
-#ifdef TIOCGWINSZ
-    struct winsize win;
-
-    /* With Solaris 2.[123], this ioctl fails and errno is set to
-       EINVAL for telnet (but not rlogin) sessions.
-       On ISC 3.0, it fails for the console and the serial port
-       (but it works for ptys).
-       It can also fail on any system when stdout isn't a tty.
-       In case of any failure, just use the default.  */
-    if (get_win_size(STDOUT_FILENO, &win) == 0 && win.ws_col > 0)
-        return win.ws_col;
-#endif
-
-    columns = 80;
-    if ((s = getenv("COLUMNS"))) {
-        columns = atoi(s);
-    }
-    return columns;
-}
-
-static tcflag_t *mode_type_flag(enum mode_type type, struct termios *mode)
-{
-    static const unsigned char tcflag_offsets[] = {
-        offsetof(struct termios, c_cflag), /* control */
-        offsetof(struct termios, c_iflag), /* input */
-        offsetof(struct termios, c_oflag), /* output */
-        offsetof(struct termios, c_lflag) /* local */
-    };
-
-    if (((unsigned int) type) <= local) {
-        return (tcflag_t *)(((char *) mode) + tcflag_offsets[(int)type]);
-    }
-    return NULL;
-}
-
-static void display_changed(struct termios *mode)
+                height, width);
+    }
+}
+
+static const struct suffix_mult stty_suffixes[] = {
+    { "b",  512 },
+    { "k", 1024 },
+    { "B", 1024 },
+    { }
+};
+
+static const struct mode_info *find_mode(const char *name)
 {
     int i;
-    int empty_line;
-    tcflag_t *bitsp;
-    unsigned long mask;
-    enum mode_type prev_type = control;
-
-    display_speed(mode, 1);
-#ifdef HAVE_C_LINE
-    wrapf("line = %d;", mode->c_line);
-#endif
-    putchar('\n');
-    current_col = 0;
-
-    empty_line = 1;
-    for (i = 0; control_info[i].name != stty_min; ++i) {
-        if (mode->c_cc[control_info[i].offset] == control_info[i].saneval)
-            continue;
-        /* If swtch is the same as susp, don't print both.  */
-#if VSWTCH == VSUSP
-        if (control_info[i].name == stty_swtch)
-            continue;
-#endif
-        /* If eof uses the same slot as min, only print whichever applies.  */
-#if VEOF == VMIN
-        if ((mode->c_lflag & ICANON) == 0
-            && (control_info[i].name == stty_eof
-                || control_info[i].name == stty_eol)) continue;
-#endif
-
-        empty_line = 0;
-        wrapf("%s = %s;", control_info[i].name,
-              visible(mode->c_cc[control_info[i].offset]));
-    }
-    if ((mode->c_lflag & ICANON) == 0) {
-        wrapf("min = %d; time = %d;\n", (int) mode->c_cc[VMIN],
-              (int) mode->c_cc[VTIME]);
-    } else if (empty_line == 0)
-        putchar('\n');
-    current_col = 0;
-
-    empty_line = 1;
-    for (i = 0; i < NUM_mode_info; ++i) {
-        if (mode_info[i].flags & OMIT)
-            continue;
-        if (EMT(mode_info[i].type) != prev_type) {
-            if (empty_line == 0) {
-                putchar('\n');
-                current_col = 0;
-                empty_line = 1;
-            }
-            prev_type = EMT(mode_info[i].type);
-        }
-
-        bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
-        mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
-        if ((*bitsp & mask) == mode_info[i].bits) {
-            if (mode_info[i].flags & SANE_UNSET) {
-                wrapf("%s", mode_info[i].name);
-                empty_line = 0;
-            }
-        }
-            else if ((mode_info[i].flags & (SANE_SET | REV)) ==
-                     (SANE_SET | REV)) {
-            wrapf("-%s", mode_info[i].name);
-            empty_line = 0;
-        }
-    }
-    if (empty_line == 0)
-        putchar('\n');
-    current_col = 0;
-}
-
-static void
-display_all(struct termios *mode)
+    for (i = 0; i < NUM_mode_info; ++i)
+        if (!strcmp(name, mode_info[i].name))
+            return &mode_info[i];
+    return 0;
+}
+
+static const struct control_info *find_control(const char *name)
 {
     int i;
-    tcflag_t *bitsp;
-    unsigned long mask;
-    enum mode_type prev_type = control;
-
-    display_speed(mode, 1);
-#ifdef TIOCGWINSZ
-    display_window_size(1);
-#endif
-#ifdef HAVE_C_LINE
-    wrapf("line = %d;", mode->c_line);
-#endif
-    putchar('\n');
-    current_col = 0;
-
-    for (i = 0; control_info[i].name != stty_min; ++i) {
-        /* If swtch is the same as susp, don't print both.  */
-#if VSWTCH == VSUSP
-        if (control_info[i].name == stty_swtch)
-            continue;
-#endif
-        /* If eof uses the same slot as min, only print whichever applies.  */
-#if VEOF == VMIN
-        if ((mode->c_lflag & ICANON) == 0
-            && (control_info[i].name == stty_eof
-                || control_info[i].name == stty_eol)) continue;
-#endif
-        wrapf("%s = %s;", control_info[i].name,
-              visible(mode->c_cc[control_info[i].offset]));
-    }
-#if VEOF == VMIN
-    if ((mode->c_lflag & ICANON) == 0)
-#endif
-        wrapf("min = %d; time = %d;", mode->c_cc[VMIN], mode->c_cc[VTIME]);
-    if (current_col != 0)
-        putchar('\n');
-    current_col = 0;
-
-    for (i = 0; i < NUM_mode_info; ++i) {
-        if (mode_info[i].flags & OMIT)
-            continue;
-        if (EMT(mode_info[i].type) != prev_type) {
-            putchar('\n');
-            current_col = 0;
-            prev_type = EMT(mode_info[i].type);
-        }
-
-        bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
-        mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
-        if ((*bitsp & mask) == mode_info[i].bits)
-            wrapf("%s", mode_info[i].name);
-        else if (mode_info[i].flags & REV)
-            wrapf("-%s", mode_info[i].name);
-    }
-    putchar('\n');
-    current_col = 0;
-}
-
-static void display_speed(struct termios *mode, int fancy)
-{
-    unsigned long ispeed, ospeed;
-    const char *fmt_str =
-        "%lu %lu\n\0"        "ispeed %lu baud; ospeed %lu baud;\0"
-        "%lu\n\0" "\0\0\0\0" "speed %lu baud;";
-
-    ospeed = ispeed = cfgetispeed(mode);
-    if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) {
-        ispeed = ospeed;                /* in case ispeed was 0 */
-        fmt_str += 43;
-    }
-    if (fancy) {
-        fmt_str += 9;
-    }
-    wrapf(fmt_str, tty_baud_to_value(ispeed), tty_baud_to_value(ospeed));
-    if (!fancy)
-        current_col = 0;
-}
-
-static void display_recoverable(struct termios *mode)
-{
-    int i;
-
-    printf("%lx:%lx:%lx:%lx",
-           (unsigned long) mode->c_iflag, (unsigned long) mode->c_oflag,
-           (unsigned long) mode->c_cflag, (unsigned long) mode->c_lflag);
-    for (i = 0; i < NCCS; ++i)
-        printf(":%x", (unsigned int) mode->c_cc[i]);
-    putchar('\n');
-}
-
-static int recover_mode(char *arg, struct termios *mode)
+    for (i = 0; i < NUM_control_info; ++i)
+        if (!strcmp(name, control_info[i].name))
+            return &control_info[i];
+    return 0;
+}
+
+enum {
+    param_need_arg = 0x80,
+    param_line    = 1 | 0x80,
+    param_rows    = 2 | 0x80,
+    param_cols    = 3 | 0x80,
+    param_columns = 4 | 0x80,
+    param_size    = 5,
+    param_speed   = 6,
+    param_ispeed  = 7 | 0x80,
+    param_ospeed  = 8 | 0x80,
+};
+
+static int find_param(const char *const name)
+{
+    static const char params[] ALIGN1 =
+        "line\0"    /* 1 */
+        "rows\0"    /* 2 */
+        "cols\0"    /* 3 */
+        "columns\0" /* 4 */
+        "size\0"    /* 5 */
+        "speed\0"   /* 6 */
+        "ispeed\0"
+        "ospeed\0";
+    int i = index_in_strings(params, name) + 1;
+    if (i == 0)
+        return 0;
+    if (i != 5 && i != 6)
+        i |= 0x80;
+    return i;
+}
+
+static int recover_mode(const char *arg, struct termios *mode)
 {
     int i, n;
-    unsigned int chr;
+    unsigned chr;
     unsigned long iflag, oflag, cflag, lflag;
 
     /* Scan into temporaries since it is too much trouble to figure out
-       the right format for `tcflag_t'.  */
+       the right format for 'tcflag_t' */
     if (sscanf(arg, "%lx:%lx:%lx:%lx%n",
                &iflag, &oflag, &cflag, &lflag, &n) != 4)
@@ -1231 +603 @@
     }
 
-    /* Fail if there are too many fields.  */
+    /* Fail if there are too many fields */
     if (*arg != '\0')
         return 0;
@@ -1238 +610 @@
 }
 
-static speed_t string_to_baud(const char *arg)
-{
-    return tty_value_to_baud(bb_xparse_number(arg, 0));
+static void display_recoverable(const struct termios *mode,
+                int ATTRIBUTE_UNUSED dummy)
+{
+    int i;
+    printf("%lx:%lx:%lx:%lx",
+           (unsigned long) mode->c_iflag, (unsigned long) mode->c_oflag,
+           (unsigned long) mode->c_cflag, (unsigned long) mode->c_lflag);
+    for (i = 0; i < NCCS; ++i)
+        printf(":%x", (unsigned int) mode->c_cc[i]);
+    putchar('\n');
+}
+
+static void display_speed(const struct termios *mode, int fancy)
+{
+                         //01234567 8 9
+    const char *fmt_str = "%lu %lu\n\0ispeed %lu baud; ospeed %lu baud;";
+    unsigned long ispeed, ospeed;
+
+    ospeed = ispeed = cfgetispeed(mode);
+    if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) {
+        ispeed = ospeed;                /* in case ispeed was 0 */
+                 //0123 4 5 6 7 8 9
+        fmt_str = "%lu\n\0\0\0\0\0speed %lu baud;";
+    }
+    if (fancy) fmt_str += 9;
+    wrapf(fmt_str, tty_baud_to_value(ispeed), tty_baud_to_value(ospeed));
+}
+
+static void do_display(const struct termios *mode, const int all)
+{
+    int i;
+    tcflag_t *bitsp;
+    unsigned long mask;
+    int prev_type = control;
+
+    display_speed(mode, 1);
+    if (all)
+        display_window_size(1);
+#ifdef HAVE_C_LINE
+    wrapf("line = %d;\n", mode->c_line);
+#else
+    wrapf("\n");
+#endif
+
+    for (i = 0; control_info[i].name != stty_min; ++i) {
+        /* If swtch is the same as susp, don't print both */
+#if VSWTCH == VSUSP
+        if (control_info[i].name == stty_swtch)
+            continue;
+#endif
+        /* If eof uses the same slot as min, only print whichever applies */
+#if VEOF == VMIN
+        if ((mode->c_lflag & ICANON) == 0
+            && (control_info[i].name == stty_eof
+                || control_info[i].name == stty_eol)) continue;
+#endif
+        wrapf("%s = %s;", control_info[i].name,
+              visible(mode->c_cc[control_info[i].offset]));
+    }
+#if VEOF == VMIN
+    if ((mode->c_lflag & ICANON) == 0)
+#endif
+        wrapf("min = %d; time = %d;", mode->c_cc[VMIN], mode->c_cc[VTIME]);
+    if (G.current_col) wrapf("\n");
+
+    for (i = 0; i < NUM_mode_info; ++i) {
+        if (mode_info[i].flags & OMIT)
+            continue;
+        if (mode_info[i].type != prev_type) {
+            /* wrapf("\n"); */
+            if (G.current_col) wrapf("\n");
+            prev_type = mode_info[i].type;
+        }
+
+        bitsp = mode_type_flag(mode_info[i].type, mode);
+        mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
+        if ((*bitsp & mask) == mode_info[i].bits) {
+            if (all || (mode_info[i].flags & SANE_UNSET))
+                wrapf("%s", mode_info[i].name);
+        } else {
+            if ((all && mode_info[i].flags & REV) ||
+                 (!all &&
+                  (mode_info[i].flags & (SANE_SET | REV)) == (SANE_SET | REV)))
+                wrapf("-%s", mode_info[i].name);
+        }
+    }
+    if (G.current_col) wrapf("\n");
 }
 
@@ -1258 +714 @@
     for (i = 0; i < NUM_mode_info; ++i) {
         if (mode_info[i].flags & SANE_SET) {
-            bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
+            bitsp = mode_type_flag(mode_info[i].type, mode);
             *bitsp = (*bitsp & ~((unsigned long)mode_info[i].mask))
                 | mode_info[i].bits;
         } else if (mode_info[i].flags & SANE_UNSET) {
-            bitsp = mode_type_flag(EMT(mode_info[i].type), mode);
+            bitsp = mode_type_flag(mode_info[i].type, mode);
             *bitsp = *bitsp & ~((unsigned long)mode_info[i].mask)
                 & ~mode_info[i].bits;
@@ -1269 +725 @@
 }
 
-/* Return a string that is the printable representation of character CH.  */
-/* Adapted from `cat' by Torbjorn Granlund.  */
-
-static const char *visible(unsigned int ch)
-{
-    static char buf[10];
-    char *bpout = buf;
-
-    if (ch == _POSIX_VDISABLE) {
-        return "<undef>";
-    }
-
-    if (ch >= 128) {
-        ch -= 128;
-        *bpout++ = 'M';
-        *bpout++ = '-';
-    }
-
-    if (ch < 32) {
-        *bpout++ = '^';
-        *bpout++ = ch + 64;
-    } else if (ch < 127) {
-        *bpout++ = ch;
-    } else {
-        *bpout++ = '^';
-        *bpout++ = '?';
-    }
-
-    *bpout = '\0';
-    return (const char *) buf;
-}
-
-#ifdef TEST
-
-const char *bb_applet_name = "stty";
-
-#endif
+/* Save set_mode from #ifdef forest plague */
+#ifndef ONLCR
+#define ONLCR 0
+#endif
+#ifndef OCRNL
+#define OCRNL 0
+#endif
+#ifndef ONLRET
+#define ONLRET 0
+#endif
+#ifndef XCASE
+#define XCASE 0
+#endif
+#ifndef IXANY
+#define IXANY 0
+#endif
+#ifndef TABDLY
+#define TABDLY 0
+#endif
+#ifndef OXTABS
+#define OXTABS 0
+#endif
+#ifndef IUCLC
+#define IUCLC 0
+#endif
+#ifndef OLCUC
+#define OLCUC 0
+#endif
+#ifndef ECHOCTL
+#define ECHOCTL 0
+#endif
+#ifndef ECHOKE
+#define ECHOKE 0
+#endif
+
+static void set_mode(const struct mode_info *info, int reversed,
+                    struct termios *mode)
+{
+    tcflag_t *bitsp;
+
+    bitsp = mode_type_flag(info->type, mode);
+
+    if (bitsp) {
+        if (reversed)
+            *bitsp = *bitsp & ~info->mask & ~info->bits;
+        else
+            *bitsp = (*bitsp & ~info->mask) | info->bits;
+        return;
+    }
+
+    /* Combination mode */
+    if (info->name == evenp || info->name == parity) {
+        if (reversed)
+            mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
+        else
+            mode->c_cflag = (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7;
+    } else if (info->name == stty_oddp) {
+        if (reversed)
+            mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
+        else
+            mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB;
+    } else if (info->name == stty_nl) {
+        if (reversed) {
+            mode->c_iflag = (mode->c_iflag | ICRNL) & ~INLCR & ~IGNCR;
+            mode->c_oflag = (mode->c_oflag | ONLCR) & ~OCRNL & ~ONLRET;
+        } else {
+            mode->c_iflag = mode->c_iflag & ~ICRNL;
+            if (ONLCR) mode->c_oflag = mode->c_oflag & ~ONLCR;
+        }
+    } else if (info->name == stty_ek) {
+        mode->c_cc[VERASE] = CERASE;
+        mode->c_cc[VKILL] = CKILL;
+    } else if (info->name == stty_sane) {
+        sane_mode(mode);
+    }
+    else if (info->name == cbreak) {
+        if (reversed)
+            mode->c_lflag |= ICANON;
+        else
+            mode->c_lflag &= ~ICANON;
+    } else if (info->name == stty_pass8) {
+        if (reversed) {
+            mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARENB;
+            mode->c_iflag |= ISTRIP;
+        } else {
+            mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
+            mode->c_iflag &= ~ISTRIP;
+        }
+    } else if (info->name == litout) {
+        if (reversed) {
+            mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARENB;
+            mode->c_iflag |= ISTRIP;
+            mode->c_oflag |= OPOST;
+        } else {
+            mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
+            mode->c_iflag &= ~ISTRIP;
+            mode->c_oflag &= ~OPOST;
+        }
+    } else if (info->name == raw || info->name == cooked) {
+        if ((info->name[0] == 'r' && reversed)
+            || (info->name[0] == 'c' && !reversed)) {
+            /* Cooked mode */
+            mode->c_iflag |= BRKINT | IGNPAR | ISTRIP | ICRNL | IXON;
+            mode->c_oflag |= OPOST;
+            mode->c_lflag |= ISIG | ICANON;
+#if VMIN == VEOF
+            mode->c_cc[VEOF] = CEOF;
+#endif
+#if VTIME == VEOL
+            mode->c_cc[VEOL] = CEOL;
+#endif
+        } else {
+            /* Raw mode */
+            mode->c_iflag = 0;
+            mode->c_oflag &= ~OPOST;
+            mode->c_lflag &= ~(ISIG | ICANON | XCASE);
+            mode->c_cc[VMIN] = 1;
+            mode->c_cc[VTIME] = 0;
+        }
+    }
+    else if (IXANY && info->name == decctlq) {
+        if (reversed)
+            mode->c_iflag |= IXANY;
+        else
+            mode->c_iflag &= ~IXANY;
+    }
+    else if (TABDLY && info->name == stty_tabs) {
+        if (reversed)
+            mode->c_oflag = (mode->c_oflag & ~TABDLY) | TAB3;
+        else
+            mode->c_oflag = (mode->c_oflag & ~TABDLY) | TAB0;
+    }
+    else if (OXTABS && info->name == stty_tabs) {
+        if (reversed)
+            mode->c_oflag |= OXTABS;
+        else
+            mode->c_oflag &= ~OXTABS;
+    }
+    else if (XCASE && IUCLC && OLCUC
+    && (info->name == stty_lcase || info->name == stty_LCASE)) {
+        if (reversed) {
+            mode->c_lflag &= ~XCASE;
+            mode->c_iflag &= ~IUCLC;
+            mode->c_oflag &= ~OLCUC;
+        } else {
+            mode->c_lflag |= XCASE;
+            mode->c_iflag |= IUCLC;
+            mode->c_oflag |= OLCUC;
+        }
+    }
+    else if (info->name == stty_crt) {
+        mode->c_lflag |= ECHOE | ECHOCTL | ECHOKE;
+    }
+    else if (info->name == stty_dec) {
+        mode->c_cc[VINTR] = 3; /* ^C */
+        mode->c_cc[VERASE] = 127; /* DEL */
+        mode->c_cc[VKILL] = 21; /* ^U */
+        mode->c_lflag |= ECHOE | ECHOCTL | ECHOKE;
+        if (IXANY) mode->c_iflag &= ~IXANY;
+    }
+}
+
+static void set_control_char_or_die(const struct control_info *info,
+            const char *arg, struct termios *mode)
+{
+    unsigned char value;
+
+    if (info->name == stty_min || info->name == stty_time)
+        value = xatoul_range_sfx(arg, 0, 0xff, stty_suffixes);
+    else if (arg[0] == '\0' || arg[1] == '\0')
+        value = arg[0];
+    else if (!strcmp(arg, "^-") || !strcmp(arg, "undef"))
+        value = _POSIX_VDISABLE;
+    else if (arg[0] == '^') { /* Ignore any trailing junk (^Cjunk) */
+        value = arg[1] & 0x1f; /* Non-letters get weird results */
+        if (arg[1] == '?')
+            value = 127;
+    } else
+        value = xatoul_range_sfx(arg, 0, 0xff, stty_suffixes);
+    mode->c_cc[info->offset] = value;
+}
+
+#define STTY_require_set_attr   (1<<0)
+#define STTY_speed_was_set      (1<<1)
+#define STTY_verbose_output     (1<<2)
+#define STTY_recoverable_output (1<<3)
+#define STTY_noargs             (1<<4)
+int stty_main(int argc, char **argv);
+int stty_main(int argc, char **argv)
+{
+    struct termios mode;
+    void (*output_func)(const struct termios *, const int);
+    const char *file_name = NULL;
+    int display_all = 0;
+    int stty_state;
+    int k;
+
+    stty_state = STTY_noargs;
+    output_func = do_display;
+
+    /* First pass: only parse/verify command line params */
+    k = 0;
+    while (argv[++k]) {
+        const struct mode_info *mp;
+        const struct control_info *cp;
+        const char *arg = argv[k];
+        const char *argnext = argv[k+1];
+        int param;
+
+        if (arg[0] == '-') {
+            int i;
+            mp = find_mode(arg+1);
+            if (mp) {
+                if (!(mp->flags & REV))
+                    goto invalid_argument;
+                stty_state &= ~STTY_noargs;
+                continue;
+            }
+            /* It is an option - parse it */
+            i = 0;
+            while (arg[++i]) {
+                switch (arg[i]) {
+                case 'a':
+                    stty_state |= STTY_verbose_output;
+                    output_func = do_display;
+                    display_all = 1;
+                    break;
+                case 'g':
+                    stty_state |= STTY_recoverable_output;
+                    output_func = display_recoverable;
+                    break;
+                case 'F':
+                    if (file_name)
+                        bb_error_msg_and_die("only one device may be specified");
+                    file_name = &arg[i+1]; /* "-Fdevice" ? */
+                    if (!file_name[0]) { /* nope, "-F device" */
+                        int p = k+1; /* argv[p] is argnext */
+                        file_name = argnext;
+                        if (!file_name)
+                            bb_error_msg_and_die(bb_msg_requires_arg, "-F");
+                        /* remove -F param from arg[vc] */
+                        --argc;
+                        while (argv[p]) { argv[p] = argv[p+1]; ++p; }
+                    }
+                    goto end_option;
+                default:
+                    goto invalid_argument;
+                }
+            }
+ end_option:
+            continue;
+        }
+
+        mp = find_mode(arg);
+        if (mp) {
+            stty_state &= ~STTY_noargs;
+            continue;
+        }
+
+        cp = find_control(arg);
+        if (cp) {
+            if (!argnext)
+                bb_error_msg_and_die(bb_msg_requires_arg, arg);
+            /* called for the side effect of xfunc death only */
+            set_control_char_or_die(cp, argnext, &mode);
+            stty_state &= ~STTY_noargs;
+            ++k;
+            continue;
+        }
+
+        param = find_param(arg);
+        if (param & param_need_arg) {
+            if (!argnext)
+                bb_error_msg_and_die(bb_msg_requires_arg, arg);
+            ++k;
+        }
+
+        switch (param) {
+#ifdef HAVE_C_LINE
+        case param_line:
+# ifndef TIOCGWINSZ
+            xatoul_range_sfx(argnext, 1, INT_MAX, stty_suffixes);
+            break;
+# endif /* else fall-through */
+#endif
+#ifdef TIOCGWINSZ
+        case param_rows:
+        case param_cols:
+        case param_columns:
+            xatoul_range_sfx(argnext, 1, INT_MAX, stty_suffixes);
+            break;
+        case param_size:
+#endif
+        case param_speed:
+            break;
+        case param_ispeed:
+            /* called for the side effect of xfunc death only */
+            set_speed_or_die(input_speed, argnext, &mode);
+            break;
+        case param_ospeed:
+            /* called for the side effect of xfunc death only */
+            set_speed_or_die(output_speed, argnext, &mode);
+            break;
+        default:
+            if (recover_mode(arg, &mode) == 1) break;
+            if (tty_value_to_baud(xatou(arg)) != (speed_t) -1) break;
+ invalid_argument:
+            bb_error_msg_and_die("invalid argument '%s'", arg);
+        }
+        stty_state &= ~STTY_noargs;
+    }
+
+    /* Specifying both -a and -g is an error */
+    if ((stty_state & (STTY_verbose_output | STTY_recoverable_output)) ==
+        (STTY_verbose_output | STTY_recoverable_output))
+        bb_error_msg_and_die("verbose and stty-readable output styles are mutually exclusive");
+    /* Specifying -a or -g with non-options is an error */
+    if (!(stty_state & STTY_noargs) &&
+        (stty_state & (STTY_verbose_output | STTY_recoverable_output)))
+        bb_error_msg_and_die("modes may not be set when specifying an output style");
+
+    /* Now it is safe to start doing things */
+    if (file_name) {
+        int fd, fdflags;
+        device_name = file_name;
+        fd = xopen(device_name, O_RDONLY | O_NONBLOCK);
+        if (fd != STDIN_FILENO) {
+            dup2(fd, STDIN_FILENO);
+            close(fd);
+        }
+        fdflags = fcntl(STDIN_FILENO, F_GETFL);
+        if (fdflags < 0 ||
+            fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
+            perror_on_device_and_die("%s: cannot reset non-blocking mode");
+    }
+
+    /* Initialize to all zeroes so there is no risk memcmp will report a
+       spurious difference in an uninitialized portion of the structure */
+    memset(&mode, 0, sizeof(mode));
+    if (tcgetattr(STDIN_FILENO, &mode))
+        perror_on_device_and_die("%s");
+
+    if (stty_state & (STTY_verbose_output | STTY_recoverable_output | STTY_noargs)) {
+        get_terminal_width_height(STDOUT_FILENO, &max_col, NULL);
+        output_func(&mode, display_all);
+        return EXIT_SUCCESS;
+    }
+
+    /* Second pass: perform actions */
+    k = 0;
+    while (argv[++k]) {
+        const struct mode_info *mp;
+        const struct control_info *cp;
+        const char *arg = argv[k];
+        const char *argnext = argv[k+1];
+        int param;
+
+        if (arg[0] == '-') {
+            mp = find_mode(arg+1);
+            if (mp) {
+                set_mode(mp, 1 /* reversed */, &mode);
+                stty_state |= STTY_require_set_attr;
+            }
+            /* It is an option - already parsed. Skip it */
+            continue;
+        }
+
+        mp = find_mode(arg);
+        if (mp) {
+            set_mode(mp, 0 /* non-reversed */, &mode);
+            stty_state |= STTY_require_set_attr;
+            continue;
+        }
+
+        cp = find_control(arg);
+        if (cp) {
+            ++k;
+            set_control_char_or_die(cp, argnext, &mode);
+            stty_state |= STTY_require_set_attr;
+            continue;
+        }
+
+        param = find_param(arg);
+        if (param & param_need_arg) {
+            ++k;
+        }
+
+        switch (param) {
+#ifdef HAVE_C_LINE
+        case param_line:
+            mode.c_line = xatoul_sfx(argnext, stty_suffixes);
+            stty_state |= STTY_require_set_attr;
+            break;
+#endif
+#ifdef TIOCGWINSZ
+        case param_cols:
+            set_window_size(-1, xatoul_sfx(argnext, stty_suffixes));
+            break;
+        case param_size:
+            display_window_size(0);
+            break;
+        case param_rows:
+            set_window_size(xatoul_sfx(argnext, stty_suffixes), -1);
+            break;
+#endif
+        case param_speed:
+            display_speed(&mode, 0);
+            break;
+        case param_ispeed:
+            set_speed_or_die(input_speed, argnext, &mode);
+            stty_state |= (STTY_require_set_attr | STTY_speed_was_set);
+            break;
+        case param_ospeed:
+            set_speed_or_die(output_speed, argnext, &mode);
+            stty_state |= (STTY_require_set_attr | STTY_speed_was_set);
+            break;
+        default:
+            if (recover_mode(arg, &mode) == 1)
+                stty_state |= STTY_require_set_attr;
+            else /* true: if (tty_value_to_baud(xatou(arg)) != (speed_t) -1) */{
+                set_speed_or_die(both_speeds, arg, &mode);
+                stty_state |= (STTY_require_set_attr | STTY_speed_was_set);
+            } /* else - impossible (caught in the first pass):
+                bb_error_msg_and_die("invalid argument '%s'", arg); */
+        }
+    }
+
+    if (stty_state & STTY_require_set_attr) {
+        struct termios new_mode;
+
+        if (tcsetattr(STDIN_FILENO, TCSADRAIN, &mode))
+            perror_on_device_and_die("%s");
+
+        /* POSIX (according to Zlotnick's book) tcsetattr returns zero if
+           it performs *any* of the requested operations.  This means it
+           can report 'success' when it has actually failed to perform
+           some proper subset of the requested operations.  To detect
+           this partial failure, get the current terminal attributes and
+           compare them to the requested ones */
+
+        /* Initialize to all zeroes so there is no risk memcmp will report a
+           spurious difference in an uninitialized portion of the structure */
+        memset(&new_mode, 0, sizeof(new_mode));
+        if (tcgetattr(STDIN_FILENO, &new_mode))
+            perror_on_device_and_die("%s");
+
+        if (memcmp(&mode, &new_mode, sizeof(mode)) != 0) {
+#ifdef CIBAUD
+            /* SunOS 4.1.3 (at least) has the problem that after this sequence,
+               tcgetattr (&m1); tcsetattr (&m1); tcgetattr (&m2);
+               sometimes (m1 != m2).  The only difference is in the four bits
+               of the c_cflag field corresponding to the baud rate.  To save
+               Sun users a little confusion, don't report an error if this
+               happens.  But suppress the error only if we haven't tried to
+               set the baud rate explicitly -- otherwise we'd never give an
+               error for a true failure to set the baud rate */
+
+            new_mode.c_cflag &= (~CIBAUD);
+            if ((stty_state & STTY_speed_was_set)
+             || memcmp(&mode, &new_mode, sizeof(mode)) != 0)
+#endif
+                perror_on_device_and_die("%s: cannot perform all requested operations");
+        }
+    }
+
+    return EXIT_SUCCESS;
+}

branches/stable/mindi-busybox/coreutils/sum.c

@@ -11 +11 @@
  * Taken from coreutils and turned into a busybox applet by Mike Frysinger
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include "libbb.h"
 
-#include "busybox.h"
+enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
 
-/* 1 if any of the files read were the standard input */
-static int have_read_stdin;
-
-/* make a little more readable and avoid using strcmp for just 2 bytes */
-#define IS_STDIN(s) (s[0] == '-' && s[1] == '\0')
-
-/* Calculate and print the rotated checksum and the size in 1K blocks
-   of file FILE, or of the standard input if FILE is "-".
-   If PRINT_NAME is >1, print FILE next to the checksum and size.
-   The checksum varies depending on sizeof (int).
-   Return 1 if successful.  */
-static int bsd_sum_file(const char *file, int print_name)
+/* BSD: calculate and print the rotated checksum and the size in 1K blocks
+   The checksum varies depending on sizeof (int). */
+/* SYSV: calculate and print the checksum and the size in 512-byte blocks */
+/* Return 1 if successful.  */
+static unsigned sum_file(const char *file, const unsigned type)
 {
-    FILE *fp;
-    int checksum = 0;          /* The checksum mod 2^16. */
-    uintmax_t total_bytes = 0; /* The number of bytes. */
-    int ch;                    /* Each character read. */
-
-    if (IS_STDIN(file)) {
-        fp = stdin;
-        have_read_stdin = 1;
-    } else {
-        fp = bb_wfopen(file, "r");
-        if (fp == NULL)
-            return 0;
-    }
-
-    while ((ch = getc(fp)) != EOF) {
-        ++total_bytes;
-        checksum = (checksum >> 1) + ((checksum & 1) << 15);
-        checksum += ch;
-        checksum &= 0xffff;             /* Keep it within bounds. */
-    }
-
-    if (ferror(fp)) {
-        bb_perror_msg(file);
-        bb_fclose_nonstdin(fp);
-        return 0;
-    }
-
-    if (bb_fclose_nonstdin(fp) == EOF) {
-        bb_perror_msg(file);
-        return 0;
-    }
-
-    printf("%05d %5ju ", checksum, (total_bytes+1023)/1024);
-    if (print_name > 1)
-        puts(file);
-    else
-        printf("\n");
-
-    return 1;
-}
-
-/* Calculate and print the checksum and the size in 512-byte blocks
-   of file FILE, or of the standard input if FILE is "-".
-   If PRINT_NAME is >0, print FILE next to the checksum and size.
-   Return 1 if successful.  */
-#define MY_BUF_SIZE 8192
-static int sysv_sum_file(const char *file, int print_name)
-{
-    RESERVE_CONFIG_BUFFER(buf, MY_BUF_SIZE);
-    int fd;
+#define buf bb_common_bufsiz1
     uintmax_t total_bytes = 0;
+    int fd = 0, r;
 
     /* The sum of all the input bytes, modulo (UINT_MAX + 1).  */
-    unsigned int s = 0;
+    unsigned s = 0;
 
-    if (IS_STDIN(file)) {
-        fd = 0;
-        have_read_stdin = 1;
-    } else {
+    if (NOT_LONE_DASH(file)) {
         fd = open(file, O_RDONLY);
         if (fd == -1)
-            goto release_and_ret;
+            goto ret_bad;
     }
 
     while (1) {
-        size_t bytes_read = safe_read(fd, buf, MY_BUF_SIZE);
+        size_t bytes_read = safe_read(fd, buf, BUFSIZ);
 
-        if (bytes_read == 0)
-            break;
-
-        if (bytes_read == -1) {
-release_and_ret:
+        if ((ssize_t)bytes_read <= 0) {
+            r = (fd && close(fd) != 0);
+            if (!bytes_read && !r)
+                /* no error */
+                break;
+ ret_bad:
             bb_perror_msg(file);
-            RELEASE_CONFIG_BUFFER(buf);
-            if (!IS_STDIN(file))
-                close(fd);
             return 0;
         }
 
         total_bytes += bytes_read;
-        while (bytes_read--)
-            s += buf[bytes_read];
+        if (type >= SUM_SYSV) {
+            do s += buf[--bytes_read]; while (bytes_read);
+        } else {
+            r = 0;
+            do {
+                s = (s >> 1) + ((s & 1) << 15);
+                s += buf[r++];
+                s &= 0xffff; /* Keep it within bounds. */
+            } while (--bytes_read);
+        }
     }
 
-    if (!IS_STDIN(file) && close(fd) == -1)
-        goto release_and_ret;
-    else
-        RELEASE_CONFIG_BUFFER(buf);
-
-    {
-        int r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
+    if (type < PRINT_NAME)
+        file = "";
+    if (type >= SUM_SYSV) {
+        r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
         s = (r & 0xffff) + (r >> 16);
-
-        printf("%d %ju ", s, (total_bytes+511)/512);
-    }
-    puts(print_name ? file : "");
-
+        printf("%d %ju %s\n", s, (total_bytes+511)/512, file);
+    } else
+        printf("%05d %5ju %s\n", s, (total_bytes+1023)/1024, file);
     return 1;
+#undef buf
 }
 
+int sum_main(int argc, char **argv);
 int sum_main(int argc, char **argv)
 {
-    int flags;
-    int ok;
-    int (*sum_func)(const char *, int) = bsd_sum_file;
+    unsigned n;
+    unsigned type = SUM_BSD;
 
-    /* give the bsd func priority over sysv func */
-    flags = bb_getopt_ulflags(argc, argv, "sr");
-    if (flags & 1)
-        sum_func = sysv_sum_file;
-    if (flags & 2)
-        sum_func = bsd_sum_file;
+    n = getopt32(argv, "sr");
+    if (n & 1) type = SUM_SYSV;
+    /* give the bsd priority over sysv func */
+    if (n & 2) type = SUM_BSD;
 
-    have_read_stdin = 0;
-    if ((argc - optind) == 0)
-        ok = sum_func("-", 0);
-    else
-        for (ok = 1; optind < argc; optind++)
-            ok &= sum_func(argv[optind], 1);
-
-    if (have_read_stdin && fclose(stdin) == EOF)
-        bb_perror_msg_and_die("-");
-
-    exit(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+    if (argc == optind) {
+        /* Do not print the name */
+        n = sum_file("-", type);
+    } else {
+        /* Need to print the name if either
+           - more than one file given
+           - doing sysv */
+        type += argc - 1 > optind || type == SUM_SYSV;
+        for (n = 1; optind < argc; optind++)
+            n &= sum_file(argv[optind], type);
+    }
+    return !n;
 }

branches/stable/mindi-busybox/coreutils/sync.c

@@ -5 +5 @@
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int sync_main(int argc, char **argv);
 int sync_main(int argc, char **argv)
 {
@@ -33 +21 @@
     sync();
 
-    return(EXIT_SUCCESS);
+    return EXIT_SUCCESS;
 }

branches/stable/mindi-busybox/coreutils/tail.c

@@ -25 +25 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "busybox.h"
+#include "libbb.h"
 
 static const struct suffix_mult tail_suffixes[] = {
     { "b", 512 },
     { "k", 1024 },
-    { "m", 1048576 },
-    { NULL, 0 }
+    { "m", 1024*1024 },
+    { }
 };
 
-static int status;
+struct globals {
+    bool status;
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
 
 static void tail_xprint_header(const char *fmt, const char *filename)
 {
-    /* If we get an output error, there is really no sense in continuing. */
-    if (dprintf(STDOUT_FILENO, fmt, filename) < 0) {
+    if (fdprintf(STDOUT_FILENO, fmt, filename) < 0)
         bb_perror_nomsg_and_die();
-    }
-}
-
-/* len should probably be size_t */
-static void tail_xbb_full_write(const char *buf, size_t len)
-{
-    /* If we get a write error, there is really no sense in continuing. */
-    if (bb_full_write(STDOUT_FILENO, buf, len) < 0) {
-        bb_perror_nomsg_and_die();
-    }
 }
 
@@ -63 +48 @@
 {
     ssize_t r;
-    off_t current,end;
+    off_t current, end;
     struct stat sbuf;
 
@@ -70 +55 @@
         end = sbuf.st_size;
     lseek(fd, end < current ? 0 : current, SEEK_SET);
-    if ((r = safe_read(fd, buf, count)) < 0) {
+    r = safe_read(fd, buf, count);
+    if (r < 0) {
         bb_perror_msg(bb_msg_read_error);
-        status = EXIT_FAILURE;
+        G.status = EXIT_FAILURE;
     }
 
@@ -78 +64 @@
 }
 
-static const char tail_opts[] =
-    "fn:c:"
-#if ENABLE_FEATURE_FANCY_TAIL
-    "qs:v"
-#endif
-    ;
-
-static const char header_fmt[] = "\n==> %s <==\n";
-
+static const char header_fmt[] ALIGN1 = "\n==> %s <==\n";
+
+static unsigned eat_num(const char *p)
+{
+    if (*p == '-') p++;
+    else if (*p == '+') { p++; G.status = EXIT_FAILURE; }
+    return xatou_sfx(p, tail_suffixes);
+}
+
+int tail_main(int argc, char **argv);
 int tail_main(int argc, char **argv)
 {
-    long count = 10;
-    unsigned int sleep_period = 1;
-    int from_top = 0;
-    int follow = 0;
+    unsigned count = 10;
+    unsigned sleep_period = 1;
+    bool from_top;
     int header_threshhold = 1;
-    int count_bytes = 0;
+    const char *str_c, *str_n;
+    USE_FEATURE_FANCY_TAIL(const char *str_s;)
 
     char *tailbuf;
@@ -100 +87 @@
     int taillen = 0;
     int newline = 0;
-
-    int *fds, nfiles, nread, nwrite, seen, i, opt;
+    int nfiles, nread, nwrite, seen, i, opt;
+
+    int *fds;
     char *s, *buf;
     const char *fmt;
 
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
     /* Allow legacy syntax of an initial numeric option without -n. */
-    if (argc >=2 && ((argv[1][0] == '+') || ((argv[1][0] == '-')
-            /* && (isdigit)(argv[1][1]) */
-            && (((unsigned int)(argv[1][1] - '0')) <= 9))))
-    {
-        optind = 2;
-        optarg = argv[1];
-        goto GET_COUNT;
-    }
+    if (argc >= 2 && (argv[1][0] == '+' || argv[1][0] == '-')
+     && isdigit(argv[1][1])
+    ) {
+        /* replacing arg[0] with "-n" can segfault, so... */
+        argv[1] = xasprintf("-n%s", argv[1]);
+#if 0 /* If we ever decide to make tail NOFORK */
+        char *s = alloca(strlen(argv[1]) + 3);
+        sprintf(s, "-n%s", argv[1]);
+        argv[1] = s;
 #endif
-
-    while ((opt = getopt(argc, argv, tail_opts)) > 0) {
-        switch (opt) {
-            case 'f':
-                follow = 1;
-                break;
-            case 'c':
-                count_bytes = 1;
-                /* FALLS THROUGH */
-            case 'n':
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
-            GET_COUNT:
+    }
 #endif
-                count = bb_xgetlarg10_sfx(optarg, tail_suffixes);
-                /* Note: Leading whitespace is an error trapped above. */
-                if (*optarg == '+') {
-                    from_top = 1;
-                } else {
-                    from_top = 0;
-                }
-                if (count < 0) {
-                    count = -count;
-                }
-                break;
+
+    opt = getopt32(argv, "fc:n:" USE_FEATURE_FANCY_TAIL("qs:v"),
+            &str_c, &str_n USE_FEATURE_FANCY_TAIL(,&str_s));
+#define FOLLOW (opt & 0x1)
+#define COUNT_BYTES (opt & 0x2)
+    //if (opt & 0x1) // -f
+    if (opt & 0x2) count = eat_num(str_c); // -c
+    if (opt & 0x4) count = eat_num(str_n); // -n
 #if ENABLE_FEATURE_FANCY_TAIL
-            case 'q':
-                header_threshhold = INT_MAX;
-                break;
-            case 's':
-                sleep_period =bb_xgetularg10_bnd(optarg, 0, UINT_MAX);
-                break;
-            case 'v':
-                header_threshhold = 0;
-                break;
+    if (opt & 0x8) header_threshhold = INT_MAX; // -q
+    if (opt & 0x10) sleep_period = xatou(str_s); // -s
+    if (opt & 0x20) header_threshhold = 0; // -v
 #endif
-            default:
-                bb_show_usage();
-        }
-    }
+    argc -= optind;
+    argv += optind;
+    from_top = G.status;
 
     /* open all the files */
-    fds = (int *)xmalloc(sizeof(int) * (argc - optind + 1));
-
-    argv += optind;
+    fds = xmalloc(sizeof(int) * (argc + 1));
     nfiles = i = 0;
-
-    if ((argc -= optind) == 0) {
+    G.status = EXIT_SUCCESS;
+    if (argc == 0) {
         struct stat statbuf;
 
         if (!fstat(STDIN_FILENO, &statbuf) && S_ISFIFO(statbuf.st_mode)) {
-            follow = 0;
-        }
-        /* --argv; */
+            opt &= ~1; /* clear FOLLOW */
+        }
         *argv = (char *) bb_msg_standard_input;
-        goto DO_STDIN;
-    }
-
+    }
     do {
-        if ((argv[i][0] == '-') && !argv[i][1]) {
-        DO_STDIN:
-            fds[nfiles] = STDIN_FILENO;
-        } else if ((fds[nfiles] = open(argv[i], O_RDONLY)) < 0) {
-            bb_perror_msg("%s", argv[i]);
-            status = EXIT_FAILURE;
+        FILE* fil = fopen_or_warn_stdin(argv[i]);
+        if (!fil) {
+            G.status = EXIT_FAILURE;
             continue;
         }
-        argv[nfiles] = argv[i];
-        ++nfiles;
+        fds[nfiles] = fileno(fil);
+        argv[nfiles++] = argv[i];
     } while (++i < argc);
 
-    if (!nfiles) {
+    if (!nfiles)
         bb_error_msg_and_die("no files");
-    }
 
     tailbufsize = BUFSIZ;
 
     /* tail the files */
-    if (from_top < count_bytes) {   /* Each is 0 or 1, so true iff 0 < 1. */
-        /* Hence, !from_top && count_bytes */
+    if (!from_top && COUNT_BYTES) {
         if (tailbufsize < count) {
             tailbufsize = count + BUFSIZ;
@@ -210 +168 @@
          * Beware of backing up too far.  See example in wc.c.
          */
-        if ((!(count|from_top)) && (lseek(fds[i], 0, SEEK_END) >= 0)) {
+        if (!(count | from_top) && lseek(fds[i], 0, SEEK_END) >= 0) {
             continue;
         }
@@ -228 +186 @@
                 nwrite = nread;
                 if (seen < count) {
-                    if (count_bytes) {
+                    if (COUNT_BYTES) {
                         nwrite -= (count - seen);
                         seen = count;
@@ -235 +193 @@
                         do {
                             --nwrite;
-                            if ((*s++ == '\n') && (++seen == count)) {
+                            if (*s++ == '\n' && ++seen == count) {
                                 break;
                             }
@@ -241 +199 @@
                     }
                 }
-                tail_xbb_full_write(buf + nread - nwrite, nwrite);
+                xwrite(STDOUT_FILENO, buf + nread - nwrite, nwrite);
             } else if (count) {
-                if (count_bytes) {
+                if (COUNT_BYTES) {
                     taillen += nread;
                     if (taillen > count) {
@@ -263 +221 @@
                         newline += nbuf;
                         taillen += nread;
-
                     } else {
                         int extra = 0;
-                        if (buf[nread-1] != '\n') {
+
+                        if (buf[nread-1] != '\n')
                             extra = 1;
-                        }
-
                         k = newline + nbuf + extra - count;
                         s = tailbuf;
@@ -278 +234 @@
                             ++s;
                         }
-
                         taillen += nread - (s - tailbuf);
                         memmove(tailbuf, s, taillen);
@@ -293 +248 @@
 
         if (!from_top) {
-            tail_xbb_full_write(tailbuf, taillen);
+            xwrite(STDOUT_FILENO, tailbuf, taillen);
         }
 
@@ -303 +258 @@
     fmt = NULL;
 
-    while (follow) {
+    if (FOLLOW) while (1) {
         sleep(sleep_period);
         i = 0;
@@ -315 +270 @@
                     fmt = NULL;
                 }
-                tail_xbb_full_write(buf, nread);
+                xwrite(STDOUT_FILENO, buf, nread);
             }
         } while (++i < nfiles);
     }
-
-    return status;
-}
+    if (ENABLE_FEATURE_CLEAN_UP) {
+        free(fds);
+    }
+    return G.status;
+}

branches/stable/mindi-busybox/coreutils/tee.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "libbb.h"
 #include <signal.h>
-#include <unistd.h>
-#include "busybox.h"
 
+int tee_main(int argc, char **argv);
 int tee_main(int argc, char **argv)
 {
     const char *mode = "w\0a";
     FILE **files;
-    FILE **p;
-    char **filenames;
-    int flags;
-    int retval = EXIT_SUCCESS;
-#ifdef CONFIG_FEATURE_TEE_USE_BLOCK_IO
+    FILE **fp;
+    char **names;
+    char **np;
+    char retval;
+#if ENABLE_FEATURE_TEE_USE_BLOCK_IO
     ssize_t c;
 # define buf bb_common_bufsiz1
@@ -44 +29 @@
     int c;
 #endif
+    retval = getopt32(argv, "ia");  /* 'a' must be 2nd */
+    argc -= optind;
+    argv += optind;
 
-    flags = bb_getopt_ulflags(argc, argv, "ia");    /* 'a' must be 2nd */
+    mode += (retval & 2);   /* Since 'a' is the 2nd option... */
 
-    mode += (flags & 2);    /* Since 'a' is the 2nd option... */
-
-    if (flags & 1) {
-        signal(SIGINT, SIG_IGN);    /* TODO - switch to sigaction.*/
+    if (retval & 1) {
+        signal(SIGINT, SIG_IGN); /* TODO - switch to sigaction. */
     }
-
+    retval = EXIT_SUCCESS;
     /* gnu tee ignores SIGPIPE in case one of the output files is a pipe
      * that doesn't consume all its input.  Good idea... */
-    signal(SIGPIPE, SIG_IGN);       /* TODO - switch to sigaction.*/
+    signal(SIGPIPE, SIG_IGN);   /* TODO - switch to sigaction. */
 
     /* Allocate an array of FILE *'s, with one extra for a sentinal. */
-    p = files = (FILE **)xmalloc(sizeof(FILE *) * (argc - optind + 2));
-    *p = stdout;
-    argv += optind - 1;
-    filenames = argv - 1;
-    *filenames = (char *) bb_msg_standard_input;    /* for later */
+    fp = files = xzalloc(sizeof(FILE *) * (argc + 2));
+    np = names = argv - 1;
+
+    files[0] = stdout;
     goto GOT_NEW_FILE;
-
     do {
-        if ((*p = bb_wfopen(*argv, mode)) == NULL) {
+        *fp = fopen_or_warn(*argv, mode);
+        if (*fp == NULL) {
             retval = EXIT_FAILURE;
             continue;
         }
-        filenames[(int)(p - files)] = *argv;
-    GOT_NEW_FILE:
-        setbuf(*p, NULL);   /* tee must not buffer output. */
-        ++p;
-    } while (*++argv);
+        *np = *argv++;
+ GOT_NEW_FILE:
+        setbuf(*fp++, NULL);    /* tee must not buffer output. */
+        np++;
+    } while (*argv);
+    /* names[0] will be filled later */
 
-    *p = NULL;              /* Store the sentinal value. */
-
-#ifdef CONFIG_FEATURE_TEE_USE_BLOCK_IO
+#if ENABLE_FEATURE_TEE_USE_BLOCK_IO
     while ((c = safe_read(STDIN_FILENO, buf, BUFSIZ)) > 0) {
-        for (p=files ; *p ; p++) {
-            fwrite(buf, 1, c, *p);
-        }
+        fp = files;
+        do
+            fwrite(buf, 1, c, *fp++);
+        while (*fp);
     }
-
-    if (c < 0) {            /* Make sure read errors are signaled. */
+    if (c < 0) {        /* Make sure read errors are signaled. */
         retval = EXIT_FAILURE;
     }
-
 #else
     setvbuf(stdout, NULL, _IONBF, 0);
     while ((c = getchar()) != EOF) {
-        for (p=files ; *p ; p++) {
-            putc(c, *p);
-        }
+        fp = files;
+        do
+            putc(c, *fp++);
+        while (*fp);
     }
 #endif
@@ -102 +86 @@
      * file table is stdout, we can save one "if ferror" test by
      * setting the first entry to stdin and checking stdout error
-     * status with bb_fflush_stdout_and_exit()... although fflush()ing
+     * status with fflush_stdout_and_exit()... although fflush()ing
      * is unnecessary here. */
-
-    p = files;
-    *p = stdin;
-    do {        /* Now check for (input and) output errors. */
+    np = names;
+    fp = files;
+    names[0] = (char *) bb_msg_standard_input;
+    files[0] = stdin;
+    do {    /* Now check for input and output errors. */
         /* Checking ferror should be sufficient, but we may want to fclose.
          * If we do, remember not to close stdin! */
-        bb_xferror(*p, filenames[(int)(p - files)]);
-    } while (*++p);
+        die_if_ferror(*fp++, *np++);
+    } while (*fp);
 
-    bb_fflush_stdout_and_exit(retval);
+    fflush_stdout_and_exit(retval);
 }

branches/stable/mindi-busybox/coreutils/test.c

@@ -13 +13 @@
  *     modified by Erik Andersen <andersen@codepoet.org> to be used
  *     in busybox.
+ *     modified by Bernhard Fischer to be useable (i.e. a bit less bloaty).
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
@@ -20 +21 @@
  */
 
-#include "busybox.h"
-#include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
+#include "libbb.h"
 #include <setjmp.h>
+
+/* This is a NOEXEC applet. Be very careful! */
+
 
 /* test(1) accepts the following grammar:
@@ -86 +86 @@
     OPERAND
 };
-
+#define is_int_op(a) (((unsigned char)((a) - INTEQ)) <= 5)
+#define is_str_op(a) (((unsigned char)((a) - STREZ)) <= 5)
+#define is_file_op(a) (((unsigned char)((a) - FILNT)) <= 2)
+#define is_file_access(a) (((unsigned char)((a) - FILRD)) <= 2)
+#define is_file_type(a) (((unsigned char)((a) - FILREG)) <= 5)
+#define is_file_bit(a) (((unsigned char)((a) - FILSUID)) <= 2)
 enum token_types {
     UNOP,
@@ -96 +101 @@
 
 static const struct t_op {
-    const char *op_text;
-    short op_num, op_type;
+    char op_text[4];
+    unsigned char op_num, op_type;
 } ops[] = {
-    {
-    "-r", FILRD, UNOP}, {
-    "-w", FILWR, UNOP}, {
-    "-x", FILEX, UNOP}, {
-    "-e", FILEXIST, UNOP}, {
-    "-f", FILREG, UNOP}, {
-    "-d", FILDIR, UNOP}, {
-    "-c", FILCDEV, UNOP}, {
-    "-b", FILBDEV, UNOP}, {
-    "-p", FILFIFO, UNOP}, {
-    "-u", FILSUID, UNOP}, {
-    "-g", FILSGID, UNOP}, {
-    "-k", FILSTCK, UNOP}, {
-    "-s", FILGZ, UNOP}, {
-    "-t", FILTT, UNOP}, {
-    "-z", STREZ, UNOP}, {
-    "-n", STRNZ, UNOP}, {
-    "-h", FILSYM, UNOP},    /* for backwards compat */
-    {
-    "-O", FILUID, UNOP}, {
-    "-G", FILGID, UNOP}, {
-    "-L", FILSYM, UNOP}, {
-    "-S", FILSOCK, UNOP}, {
-    "=", STREQ, BINOP}, {
-    "==", STREQ, BINOP}, {
-    "!=", STRNE, BINOP}, {
-    "<", STRLT, BINOP}, {
-    ">", STRGT, BINOP}, {
-    "-eq", INTEQ, BINOP}, {
-    "-ne", INTNE, BINOP}, {
-    "-ge", INTGE, BINOP}, {
-    "-gt", INTGT, BINOP}, {
-    "-le", INTLE, BINOP}, {
-    "-lt", INTLT, BINOP}, {
-    "-nt", FILNT, BINOP}, {
-    "-ot", FILOT, BINOP}, {
-    "-ef", FILEQ, BINOP}, {
-    "!", UNOT, BUNOP}, {
-    "-a", BAND, BBINOP}, {
-    "-o", BOR, BBINOP}, {
-    "(", LPAREN, PAREN}, {
-    ")", RPAREN, PAREN}, {
-    0, 0, 0}
+    { "-r", FILRD   , UNOP   },
+    { "-w", FILWR   , UNOP   },
+    { "-x", FILEX   , UNOP   },
+    { "-e", FILEXIST, UNOP   },
+    { "-f", FILREG  , UNOP   },
+    { "-d", FILDIR  , UNOP   },
+    { "-c", FILCDEV , UNOP   },
+    { "-b", FILBDEV , UNOP   },
+    { "-p", FILFIFO , UNOP   },
+    { "-u", FILSUID , UNOP   },
+    { "-g", FILSGID , UNOP   },
+    { "-k", FILSTCK , UNOP   },
+    { "-s", FILGZ   , UNOP   },
+    { "-t", FILTT   , UNOP   },
+    { "-z", STREZ   , UNOP   },
+    { "-n", STRNZ   , UNOP   },
+    { "-h", FILSYM  , UNOP   },    /* for backwards compat */
+
+    { "-O" , FILUID , UNOP   },
+    { "-G" , FILGID , UNOP   },
+    { "-L" , FILSYM , UNOP   },
+    { "-S" , FILSOCK, UNOP   },
+    { "="  , STREQ  , BINOP  },
+    { "==" , STREQ  , BINOP  },
+    { "!=" , STRNE  , BINOP  },
+    { "<"  , STRLT  , BINOP  },
+    { ">"  , STRGT  , BINOP  },
+    { "-eq", INTEQ  , BINOP  },
+    { "-ne", INTNE  , BINOP  },
+    { "-ge", INTGE  , BINOP  },
+    { "-gt", INTGT  , BINOP  },
+    { "-le", INTLE  , BINOP  },
+    { "-lt", INTLT  , BINOP  },
+    { "-nt", FILNT  , BINOP  },
+    { "-ot", FILOT  , BINOP  },
+    { "-ef", FILEQ  , BINOP  },
+    { "!"  , UNOT   , BUNOP  },
+    { "-a" , BAND   , BBINOP },
+    { "-o" , BOR    , BBINOP },
+    { "("  , LPAREN , PAREN  },
+    { ")"  , RPAREN , PAREN  },
 };
 
-#ifdef CONFIG_FEATURE_TEST_64
+
+#if ENABLE_FEATURE_TEST_64
 typedef int64_t arith_t;
 #else
@@ -150 +154 @@
 #endif
 
+/* Cannot eliminate these static data (do the G trick)
+ * because of test_main usage from other applets */
 static char **t_wp;
 static struct t_op const *t_wp_op;
 static gid_t *group_array;
 static int ngroups;
+static jmp_buf leaving;
 
 static enum token t_lex(char *s);
@@ -163 +170 @@
 static int filstat(char *nm, enum token mode);
 static arith_t getn(const char *s);
+/* UNUSED
 static int newerf(const char *f1, const char *f2);
 static int olderf(const char *f1, const char *f2);
 static int equalf(const char *f1, const char *f2);
+*/
 static int test_eaccess(char *path, int mode);
 static int is_a_group_member(gid_t gid);
 static void initialize_group_array(void);
 
-static jmp_buf leaving;
-
-int bb_test(int argc, char **argv)
+int test_main(int argc, char **argv)
 {
     int res;
-
-    if (strcmp(argv[0], "[") == 0) {
-        if (strcmp(argv[--argc], "]")) {
-            bb_error_msg("missing ]");
-            return 2;
-        }
-        argv[argc] = NULL;
-    } else if (strcmp(argv[0], "[[") == 0) {
-        if (strcmp(argv[--argc], "]]")) {
-            bb_error_msg("missing ]]");
-            return 2;
+    const char *arg0;
+    bool _off;
+
+    arg0 = bb_basename(argv[0]);
+    if (arg0[0] == '[') {
+        --argc;
+        if (!arg0[1]) { /* "[" ? */
+            if (NOT_LONE_CHAR(argv[argc], ']')) {
+                bb_error_msg("missing ]");
+                return 2;
+            }
+        } else { /* assuming "[[" */
+            if (strcmp(argv[argc], "]]") != 0) {
+                bb_error_msg("missing ]]");
+                return 2;
+            }
         }
         argv[argc] = NULL;
@@ -202 +214 @@
      * prevails...
      */
-     ngroups = 0;
+    ngroups = 0;
 
     /* Implement special cases from POSIX.2, section 4.62.4 */
-    switch (argc) {
-    case 1:
+    if (argc == 1)
         return 1;
-    case 2:
+    if (argc == 2)
         return *argv[1] == '\0';
-    case 3:
-        if (argv[1][0] == '!' && argv[1][1] == '\0') {
+//assert(argc);
+    /* remember if we saw argc==4 which wants *no* '!' test */
+    _off = argc - 4;
+    if (_off ?
+        (LONE_CHAR(argv[1], '!'))
+        : (argv[1][0] != '!' || argv[1][1] != '\0'))
+    {
+        if (argc == 3)
             return *argv[2] != '\0';
+
+        t_lex(argv[2 + _off]);
+        if (t_wp_op && t_wp_op->op_type == BINOP) {
+            t_wp = &argv[1 + _off];
+            return binop() == _off;
         }
-        break;
-    case 4:
-        if (argv[1][0] != '!' || argv[1][1] != '\0') {
-            if (t_lex(argv[2]), t_wp_op && t_wp_op->op_type == BINOP) {
-                t_wp = &argv[1];
-                return binop() == 0;
-            }
-        }
-        break;
-    case 5:
-        if (argv[1][0] == '!' && argv[1][1] == '\0') {
-            if (t_lex(argv[3]), t_wp_op && t_wp_op->op_type == BINOP) {
-                t_wp = &argv[2];
-                return binop() != 0;
-            }
-        }
-        break;
-    }
-
+    }
     t_wp = &argv[1];
     res = !oexpr(t_lex(*t_wp));
@@ -243 +247 @@
 }
 
+static void syntax(const char *op, const char *msg) ATTRIBUTE_NORETURN;
 static void syntax(const char *op, const char *msg)
 {
@@ -248 +253 @@
         bb_error_msg("%s: %s", op, msg);
     } else {
-        bb_error_msg("%s", msg);
+        bb_error_msg("%s: %s"+4, msg);
     }
     longjmp(leaving, 2);
@@ -300 +305 @@
         if (*++t_wp == NULL)
             syntax(t_wp_op->op_text, "argument expected");
-        switch (n) {
-        case STREZ:
-            return strlen(*t_wp) == 0;
-        case STRNZ:
-            return strlen(*t_wp) != 0;
-        case FILTT:
+        if (n == STREZ)
+            return t_wp[0][0] == '\0';
+        if (n == STRNZ)
+            return t_wp[0][0] != '\0';
+        if (n == FILTT)
             return isatty(getn(*t_wp));
-        default:
-            return filstat(*t_wp, n);
-        }
-    }
-
-    if (t_lex(t_wp[1]), t_wp_op && t_wp_op->op_type == BINOP) {
+        return filstat(*t_wp, n);
+    }
+
+    t_lex(t_wp[1]);
+    if (t_wp_op && t_wp_op->op_type == BINOP) {
         return binop();
     }
 
-    return strlen(*t_wp) > 0;
+    return t_wp[0][0] != '\0';
 }
 
@@ -323 +326 @@
     const char *opnd1, *opnd2;
     struct t_op const *op;
+    arith_t val1, val2;
 
     opnd1 = *t_wp;
@@ -328 +332 @@
     op = t_wp_op;
 
-    if ((opnd2 = *++t_wp) == (char *) 0)
+    opnd2 = *++t_wp;
+    if (opnd2 == NULL)
         syntax(op->op_text, "argument expected");
 
-    switch (op->op_num) {
-    case STREQ:
-        return strcmp(opnd1, opnd2) == 0;
-    case STRNE:
-        return strcmp(opnd1, opnd2) != 0;
-    case STRLT:
-        return strcmp(opnd1, opnd2) < 0;
-    case STRGT:
-        return strcmp(opnd1, opnd2) > 0;
-    case INTEQ:
-        return getn(opnd1) == getn(opnd2);
-    case INTNE:
-        return getn(opnd1) != getn(opnd2);
-    case INTGE:
-        return getn(opnd1) >= getn(opnd2);
-    case INTGT:
-        return getn(opnd1) > getn(opnd2);
-    case INTLE:
-        return getn(opnd1) <= getn(opnd2);
-    case INTLT:
-        return getn(opnd1) < getn(opnd2);
-    case FILNT:
-        return newerf(opnd1, opnd2);
-    case FILOT:
-        return olderf(opnd1, opnd2);
-    case FILEQ:
-        return equalf(opnd1, opnd2);
-    }
-    /* NOTREACHED */
-    return 1;
+    if (is_int_op(op->op_num)) {
+        val1 = getn(opnd1);
+        val2 = getn(opnd2);
+        if (op->op_num == INTEQ)
+            return val1 == val2;
+        if (op->op_num == INTNE)
+            return val1 != val2;
+        if (op->op_num == INTGE)
+            return val1 >= val2;
+        if (op->op_num == INTGT)
+            return val1 >  val2;
+        if (op->op_num == INTLE)
+            return val1 <= val2;
+        if (op->op_num == INTLT)
+            return val1 <  val2;
+    }
+    if (is_str_op(op->op_num)) {
+        val1 = strcmp(opnd1, opnd2);
+        if (op->op_num == STREQ)
+            return val1 == 0;
+        if (op->op_num == STRNE)
+            return val1 != 0;
+        if (op->op_num == STRLT)
+            return val1 < 0;
+        if (op->op_num == STRGT)
+            return val1 > 0;
+    }
+    /* We are sure that these three are by now the only binops we didn't check
+     * yet, so we do not check if the class is correct:
+     */
+/*  if (is_file_op(op->op_num)) */
+    {
+        struct stat b1, b2;
+
+        if (stat(opnd1, &b1) || stat(opnd2, &b2))
+            return 0; /* false, since at least one stat failed */
+        if (op->op_num == FILNT)
+            return b1.st_mtime > b2.st_mtime;
+        if (op->op_num == FILOT)
+            return b1.st_mtime < b2.st_mtime;
+        if (op->op_num == FILEQ)
+            return b1.st_dev == b2.st_dev && b1.st_ino == b2.st_ino;
+    }
+    return 1; /* NOTREACHED */
 }
 
@@ -366 +385 @@
 {
     struct stat s;
-    unsigned int i;
+    int i = i; /* gcc 3.x thinks it can be used uninitialized */
 
     if (mode == FILSYM) {
@@ -380 +399 @@
     if (stat(nm, &s) != 0)
         return 0;
-
-    switch (mode) {
-    case FILRD:
-        return test_eaccess(nm, R_OK) == 0;
-    case FILWR:
-        return test_eaccess(nm, W_OK) == 0;
-    case FILEX:
-        return test_eaccess(nm, X_OK) == 0;
-    case FILEXIST:
+    if (mode == FILEXIST)
         return 1;
-    case FILREG:
-        i = S_IFREG;
-        goto filetype;
-    case FILDIR:
-        i = S_IFDIR;
-        goto filetype;
-    case FILCDEV:
-        i = S_IFCHR;
-        goto filetype;
-    case FILBDEV:
-        i = S_IFBLK;
-        goto filetype;
-    case FILFIFO:
+    if (is_file_access(mode)) {
+        if (mode == FILRD)
+            i = R_OK;
+        if (mode == FILWR)
+            i = W_OK;
+        if (mode == FILEX)
+            i = X_OK;
+        return test_eaccess(nm, i) == 0;
+    }
+    if (is_file_type(mode)) {
+        if (mode == FILREG)
+            i = S_IFREG;
+        if (mode == FILDIR)
+            i = S_IFDIR;
+        if (mode == FILCDEV)
+            i = S_IFCHR;
+        if (mode == FILBDEV)
+            i = S_IFBLK;
+        if (mode == FILFIFO) {
 #ifdef S_IFIFO
-        i = S_IFIFO;
-        goto filetype;
+            i = S_IFIFO;
 #else
-        return 0;
+            return 0;
 #endif
-    case FILSOCK:
+        }
+        if (mode == FILSOCK) {
 #ifdef S_IFSOCK
-        i = S_IFSOCK;
-        goto filetype;
+            i = S_IFSOCK;
 #else
-        return 0;
+            return 0;
 #endif
-    case FILSUID:
-        i = S_ISUID;
-        goto filebit;
-    case FILSGID:
-        i = S_ISGID;
-        goto filebit;
-    case FILSTCK:
-        i = S_ISVTX;
-        goto filebit;
-    case FILGZ:
+        }
+ filetype:
+        return ((s.st_mode & S_IFMT) == i);
+    }
+    if (is_file_bit(mode)) {
+        if (mode == FILSUID)
+            i = S_ISUID;
+        if (mode == FILSGID)
+            i = S_ISGID;
+        if (mode == FILSTCK)
+            i = S_ISVTX;
+        return ((s.st_mode & i) != 0);
+    }
+    if (mode == FILGZ)
         return s.st_size > 0L;
-    case FILUID:
+    if (mode == FILUID)
         return s.st_uid == geteuid();
-    case FILGID:
+    if (mode == FILGID)
         return s.st_gid == getegid();
-    default:
-        return 1;
-    }
-
-  filetype:
-    return ((s.st_mode & S_IFMT) == i);
-
-  filebit:
-    return ((s.st_mode & i) != 0);
+    return 1; /* NOTREACHED */
 }
 
 static enum token t_lex(char *s)
 {
-    struct t_op const *op = ops;
-
-    if (s == 0) {
-        t_wp_op = (struct t_op *) 0;
+    const struct t_op *op;
+
+    t_wp_op = NULL;
+    if (s == NULL) {
         return EOI;
     }
-    while (op->op_text) {
+
+    op = ops;
+    do {
         if (strcmp(s, op->op_text) == 0) {
             t_wp_op = op;
@@ -456 +470 @@
         }
         op++;
-    }
-    t_wp_op = (struct t_op *) 0;
+    } while (op < ops + ARRAY_SIZE(ops));
+
     return OPERAND;
 }
 
 /* atoi with error detection */
+//XXX: FIXME: duplicate of existing libbb function?
 static arith_t getn(const char *s)
 {
     char *p;
-#ifdef CONFIG_FEATURE_TEST_64
+#if ENABLE_FEATURE_TEST_64
     long long r;
 #else
@@ -472 +487 @@
 
     errno = 0;
-#ifdef CONFIG_FEATURE_TEST_64
+#if ENABLE_FEATURE_TEST_64
     r = strtoll(s, &p, 10);
 #else
@@ -487 +502 @@
 }
 
+/* UNUSED
 static int newerf(const char *f1, const char *f2)
 {
@@ -511 +527 @@
             b1.st_dev == b2.st_dev && b1.st_ino == b2.st_ino);
 }
+*/
 
 /* Do the same thing access(2) does, but use the effective uid and gid,
@@ -521 +538 @@
 
     if (stat(path, &st) < 0)
-        return (-1);
+        return -1;
 
     if (euid == 0) {
         /* Root can read or write any file. */
         if (mode != X_OK)
-            return (0);
+            return 0;
 
         /* Root can execute any file that has any one of the execute
            bits set. */
         if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
-            return (0);
+            return 0;
     }
 
@@ -540 +557 @@
 
     if (st.st_mode & mode)
-        return (0);
-
-    return (-1);
+        return 0;
+
+    return -1;
 }
 
@@ -549 +566 @@
     ngroups = getgroups(0, NULL);
     if (ngroups > 0) {
-        group_array = xmalloc(ngroups * sizeof(gid_t));
+        /* FIXME: ash tries so hard to not die on OOM,
+         * and we spoil it with just one xrealloc here */
+        /* We realloc, because test_main can be entered repeatedly by shell.
+         * Testcase (ash): 'while true; do test -x some_file; done'
+         * and watch top. (some_file must have owner != you) */
+        group_array = xrealloc(group_array, ngroups * sizeof(gid_t));
         getgroups(ngroups, group_array);
     }
@@ -555 +577 @@
 
 /* Return non-zero if GID is one that we have in our groups list. */
+//XXX: FIXME: duplicate of existing libbb function?
+// see toplevel TODO file:
+// possible code duplication ingroup() and is_a_group_member()
 static int is_a_group_member(gid_t gid)
 {
-    register int i;
+    int i;
 
     /* Short-circuit if possible, maybe saving a call to getgroups(). */
     if (gid == getgid() || gid == getegid())
-        return (1);
+        return 1;
 
     if (ngroups == 0)
@@ -569 +594 @@
     for (i = 0; i < ngroups; i++)
         if (gid == group_array[i])
-            return (1);
-
-    return (0);
-}
-
-
-/* applet entry point */
-
-int test_main(int argc, char **argv)
-{
-    exit(bb_test(argc, argv));
-}
-
+            return 1;
+
+    return 0;
+}

branches/stable/mindi-busybox/coreutils/touch.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -31 +18 @@
  */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int touch_main(int argc, char **argv);
 int touch_main(int argc, char **argv)
 {
     int fd;
-    int flags;
     int status = EXIT_SUCCESS;
-
-    flags = bb_getopt_ulflags(argc, argv, "c");
+    int flags = getopt32(argv, "c");
 
     argv += optind;
@@ -56 +37 @@
     do {
         if (utime(*argv, NULL)) {
-            if (errno == ENOENT) {  /* no such file*/
-                if (flags & 1) {    /* Creation is disabled, so ignore. */
+            if (errno == ENOENT) {  /* no such file */
+                if (flags) {    /* Creation is disabled, so ignore. */
                     continue;
                 }

branches/stable/mindi-busybox/coreutils/tr.c

@@ -16 +16 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-
-#include "busybox.h"
-
-// Even with -funsigned-char, gcc still complains about char as an array index.
-
-#define GCC4_IS_STUPID int
+/* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html
+ * TODO: xdigit, graph, print
+ */
+#include "libbb.h"
 
 #define ASCII 0377
 
-/* some "globals" shared across this file */
-static char com_fl, del_fl, sq_fl;
-/* these last are pointers to static buffers declared in tr_main */
-static char *poutput, *pvector, *pinvec, *poutvec;
-
-static void convert(void)
-{
-    int read_chars = 0, in_index = 0, out_index = 0, c, coded, last = -1;
-
-    for (;;) {
-        // If we're out of input, flush output and read more input.
-
-        if (in_index == read_chars) {
-            if (out_index) {
-                if (write(1, (char *) poutput, out_index) != out_index)
-                    bb_error_msg_and_die(bb_msg_write_error);
-                out_index = 0;
-            }
-
-            if ((read_chars = read(0, bb_common_bufsiz1, BUFSIZ)) <= 0) {
-                if (write(1, (char *) poutput, out_index) != out_index)
-                    bb_error_msg(bb_msg_write_error);
-                exit(0);
-            }
-            in_index = 0;
-        }
-        c = bb_common_bufsiz1[in_index++];
-        coded = pvector[c];
-        if (del_fl && pinvec[c])
-            continue;
-        if (sq_fl && last == coded && (pinvec[c] || poutvec[coded]))
-            continue;
-        poutput[out_index++] = last = coded;
-    }
-
-    /* NOTREACHED */
-}
-
-static void map(char *string1, unsigned int string1_len,
-        char *string2, unsigned int string2_len)
+#define TR_OPT_complement   (1<<0)
+#define TR_OPT_delete       (1<<1)
+#define TR_OPT_squeeze_reps (1<<2)
+
+static void map(char *pvector,
+        unsigned char *string1, unsigned int string1_len,
+        unsigned char *string2, unsigned int string2_len)
 {
     char last = '0';
@@ -71 +36 @@
     for (j = 0, i = 0; i < string1_len; i++) {
         if (string2_len <= j)
-            pvector[(GCC4_IS_STUPID)string1[i]] = last;
+            pvector[string1[i]] = last;
         else
-            pvector[(GCC4_IS_STUPID)string1[i]] = last = string2[j++];
+            pvector[string1[i]] = last = string2[j++];
     }
 }
@@ -85 +50 @@
 {
     char *buffer_start = buffer;
-    int i, ac;
-
+    unsigned i; /* XXX: FIXME: use unsigned char? */
+    unsigned char ac;
+#define CLO ":]\0"
+    static const char classes[] ALIGN1 =
+        "alpha"CLO "alnum"CLO "digit"CLO "lower"CLO "upper"CLO "space"CLO
+        "blank"CLO "punct"CLO "cntrl"CLO;
+#define CLASS_invalid 0 /* we increment the retval */
+#define CLASS_alpha 1
+#define CLASS_alnum 2
+#define CLASS_digit 3
+#define CLASS_lower 4
+#define CLASS_upper 5
+#define CLASS_space 6
+#define CLASS_blank 7
+#define CLASS_punct 8
+#define CLASS_cntrl 9
+//#define CLASS_xdigit 10
+//#define CLASS_graph 11
+//#define CLASS_print 12
     while (*arg) {
         if (*arg == '\\') {
@@ -93 +75 @@
         } else if (*(arg+1) == '-') {
             ac = *(arg+2);
-            if(ac == 0) {
+            if (ac == 0) {
                 *buffer++ = *arg++;
                 continue;
@@ -105 +87 @@
             i = *arg++;
             if (ENABLE_FEATURE_TR_CLASSES && i == ':') {
-                if (strncmp(arg, "alpha", 5) == 0) {
+                smalluint j;
+                { /* not really pretty.. */
+                    char *tmp = xstrndup(arg, 7); // warning: xdigit needs 8, not 7
+                    j = index_in_strings(classes, tmp) + 1;
+                    free(tmp);
+                }
+                if (j == CLASS_alnum || j == CLASS_digit) {
+                    for (i = '0'; i <= '9'; i++)
+                        *buffer++ = i;
+                }
+                if (j == CLASS_alpha || j == CLASS_alnum || j == CLASS_upper) {
                     for (i = 'A'; i <= 'Z'; i++)
                         *buffer++ = i;
+                }
+                if (j == CLASS_alpha || j == CLASS_alnum || j == CLASS_lower) {
                     for (i = 'a'; i <= 'z'; i++)
                         *buffer++ = i;
                 }
-                else if (strncmp(arg, "alnum", 5) == 0) {
-                    for (i = '0'; i <= '9'; i++)
-                        *buffer++ = i;
-                    for (i = 'A'; i <= 'Z'; i++)
-                        *buffer++ = i;
-                    for (i = 'a'; i <= 'z'; i++)
-                        *buffer++ = i;
-                }
-                else if (strncmp(arg, "digit", 5) == 0)
-                    for (i = '0'; i <= '9'; i++)
-                        *buffer++ = i;
-                else if (strncmp(arg, "lower", 5) == 0)
-                    for (i = 'a'; i <= 'z'; i++)
-                        *buffer++ = i;
-                else if (strncmp(arg, "upper", 5) == 0)
-                    for (i = 'A'; i <= 'Z'; i++)
-                        *buffer++ = i;
-                else if (strncmp(arg, "space", 5) == 0) {
-                    const char s[] = "\t\n\v\f\r ";
-                    strcat((char*)buffer, s);
-                    buffer += sizeof(s) - 1;
-                }
-                else if (strncmp(arg, "blank", 5) == 0) {
+                if (j == CLASS_space || j == CLASS_blank) {
                     *buffer++ = '\t';
+                    if (j == CLASS_space) {
+                        *buffer++ = '\n';
+                        *buffer++ = '\v';
+                        *buffer++ = '\f';
+                        *buffer++ = '\r';
+                    }
                     *buffer++ = ' ';
                 }
-                /* gcc gives a warning if braces aren't used here */
-                else if (strncmp(arg, "punct", 5) == 0) {
+                if (j == CLASS_punct || j == CLASS_cntrl) {
                     for (i = 0; i <= ASCII; i++)
-                        if (isprint(i) && (!isalnum(i)) && (!isspace(i)))
+                        if ((j == CLASS_punct &&
+                             isprint(i) && (!isalnum(i)) && (!isspace(i))) ||
+                            (j == CLASS_cntrl && iscntrl(i)))
                             *buffer++ = i;
                 }
-                else if (strncmp(arg, "cntrl", 5) == 0) {
-                    for (i = 0; i <= ASCII; i++)
-                        if (iscntrl(i))
-                            *buffer++ = i;
-                }
-                else {
+                if (j == CLASS_invalid) {
                     *buffer++ = '[';
                     *buffer++ = ':';
@@ -157 +131 @@
             if (ENABLE_FEATURE_TR_EQUIV && i == '=') {
                 *buffer++ = *arg;
-                /* skip the closing =] */
-                arg += 3;
+                arg += 3;   /* Skip the closing =] */
                 continue;
             }
@@ -169 +142 @@
             while (i <= ac)
                 *buffer++ = i++;
-            arg++;              /* Skip the assumed ']' */
+            arg++;  /* Skip the assumed ']' */
         } else
             *buffer++ = *arg++;
     }
-
     return (buffer - buffer_start);
 }
@@ -179 +151 @@
 static int complement(char *buffer, int buffer_len)
 {
-    register short i, j, ix;
+    int i, j, ix;
     char conv[ASCII + 2];
 
@@ -194 +166 @@
 }
 
+int tr_main(int argc, char **argv);
 int tr_main(int argc, char **argv)
 {
-    register unsigned char *ptr;
-    int output_length=0, input_length;
+    unsigned char *ptr;
+    int output_length = 0, input_length;
     int idx = 1;
     int i;
-    RESERVE_CONFIG_BUFFER(output, BUFSIZ);
+    smalluint flags = 0;
+    size_t read_chars = 0, in_index = 0, out_index = 0, c, coded, last = -1;
+    RESERVE_CONFIG_UBUFFER(output, BUFSIZ);
     RESERVE_CONFIG_BUFFER(vector, ASCII+1);
     RESERVE_CONFIG_BUFFER(invec,  ASCII+1);
     RESERVE_CONFIG_BUFFER(outvec, ASCII+1);
 
-    /* ... but make them available globally */
-    poutput = output;
-    pvector = vector;
-    pinvec  = invec;
-    poutvec = outvec;
-
     if (argc > 1 && argv[idx][0] == '-') {
         for (ptr = (unsigned char *) &argv[idx][1]; *ptr; ptr++) {
-            switch (*ptr) {
-            case 'c':
-                com_fl = TRUE;
-                break;
-            case 'd':
-                del_fl = TRUE;
-                break;
-            case 's':
-                sq_fl = TRUE;
-                break;
-            default:
+            if (*ptr == 'c')
+                flags |= TR_OPT_complement;
+            else if (*ptr == 'd')
+                flags |= TR_OPT_delete;
+            else if (*ptr == 's')
+                flags |= TR_OPT_squeeze_reps;
+            else
                 bb_show_usage();
-            }
         }
         idx++;
@@ -234 +198 @@
     }
 
+#define tr_buf bb_common_bufsiz1
     if (argv[idx] != NULL) {
-        input_length = expand(argv[idx++], bb_common_bufsiz1);
-        if (com_fl)
-            input_length = complement(bb_common_bufsiz1, input_length);
+        input_length = expand(argv[idx++], tr_buf);
+        if (flags & TR_OPT_complement)
+            input_length = complement(tr_buf, input_length);
         if (argv[idx] != NULL) {
             if (*argv[idx] == '\0')
                 bb_error_msg_and_die("STRING2 cannot be empty");
             output_length = expand(argv[idx], output);
-            map(bb_common_bufsiz1, input_length, output, output_length);
+            map(vector, tr_buf, input_length, output, output_length);
         }
         for (i = 0; i < input_length; i++)
-            invec[(GCC4_IS_STUPID)bb_common_bufsiz1[i]] = TRUE;
+            invec[(unsigned char)tr_buf[i]] = TRUE;
         for (i = 0; i < output_length; i++)
-            outvec[(GCC4_IS_STUPID)output[i]] = TRUE;
-    }
-    convert();
-    return (0);
-}
+            outvec[output[i]] = TRUE;
+    }
+
+    for (;;) {
+        /* If we're out of input, flush output and read more input. */
+        if (in_index == read_chars) {
+            if (out_index) {
+                xwrite(STDOUT_FILENO, (char *)output, out_index);
+                out_index = 0;
+            }
+            read_chars = read(STDIN_FILENO, tr_buf, BUFSIZ);
+            if (read_chars <= 0) {
+                if (write(STDOUT_FILENO, (char *)output, out_index) != out_index)
+                    bb_perror_msg(bb_msg_write_error);
+                exit(EXIT_SUCCESS);
+            }
+            in_index = 0;
+        }
+        c = tr_buf[in_index++];
+        coded = vector[c];
+        if ((flags & TR_OPT_delete) && invec[c])
+            continue;
+        if ((flags & TR_OPT_squeeze_reps) && last == coded &&
+            (invec[c] || outvec[coded]))
+            continue;
+        output[out_index++] = last = coded;
+    }
+    /* NOTREACHED */
+    return EXIT_SUCCESS;
+}

branches/stable/mindi-busybox/coreutils/true.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/true.html */
 
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int true_main(int argc, char **argv);
 int true_main(int argc, char **argv)
 {

branches/stable/mindi-busybox/coreutils/tty.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+int tty_main(int argc, char **argv);
 int tty_main(int argc, char **argv)
 {
     const char *s;
-    int silent;     /* Note: No longer relevant in SUSv3. */
+    USE_INCLUDE_SUSv2(int silent;)  /* Note: No longer relevant in SUSv3. */
     int retval;
 
-    bb_default_error_retval = 2;    /* SUSv3 requires > 1 for error. */
+    xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */
 
-    silent = bb_getopt_ulflags(argc, argv, "s");
+    USE_INCLUDE_SUSv2(silent = getopt32(argv, "s");)
 
     /* gnu tty outputs a warning that it is ignoring all args. */
@@ -44 +29 @@
     retval = 0;
 
-    if ((s = ttyname(0)) == NULL) {
+    s = ttyname(0);
+    if (s == NULL) {
     /* According to SUSv3, ttyname can on fail with EBADF or ENOTTY.
      * We know the file descriptor is good, so failure means not a tty. */
@@ -50 +36 @@
         retval = 1;
     }
+    USE_INCLUDE_SUSv2(if (!silent) puts(s);)
+    SKIP_INCLUDE_SUSv2(puts(s);)
 
-    if (!silent) {
-        puts(s);
-    }
-
-    bb_fflush_stdout_and_exit(retval);
+    fflush_stdout_and_exit(retval);
 }

branches/stable/mindi-busybox/coreutils/uname.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /* uname -- print system information
-   Copyright (C) 1989-1999 Free Software Foundation, Inc.
-
-   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ * Copyright (C) 1989-1999 Free Software Foundation, Inc.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -42 +31 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
-#include "busybox.h"
+#include "libbb.h"
 
 typedef struct {
@@ -56 +39 @@
 } uname_info_t;
 
-static const char options[] = "snrvmpa";
-static const unsigned short int utsname_offset[] = {
+static const char options[] ALIGN1 = "snrvmpa";
+static const unsigned short utsname_offset[] ALIGN2 = {
     offsetof(uname_info_t,name.sysname),
     offsetof(uname_info_t,name.nodename),
@@ -66 +49 @@
 };
 
+int uname_main(int argc, char **argv);
 int uname_main(int argc, char **argv)
 {
@@ -75 +59 @@
     char toprint;
 
-    toprint = bb_getopt_ulflags(argc, argv, options);
+    toprint = getopt32(argv, options);
 
     if (argc != optind) {
@@ -103 +87 @@
     strcpy(uname_info.processor, "unknown");
 
-    delta=utsname_offset;
+    delta = utsname_offset;
     do {
         if (toprint & 1) {
-            bb_printf(((char *)(&uname_info)) + *delta);
+            printf(((char *)(&uname_info)) + *delta);
             if (toprint > 1) {
                 putchar(' ');
@@ -115 +99 @@
     putchar('\n');
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }

branches/stable/mindi-busybox/coreutils/uniq.c

@@ -11 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
-#include "busybox.h"
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
+#include "libbb.h"
 
-static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4";
+static const char uniq_opts[] ALIGN1 = "cdu" "f:s:" "cdu\0\1\2\4";
 
 static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
@@ -22 +19 @@
     const char *n;
 
-    if ((n = *argv) != NULL) {
+    n = *argv;
+    if (n != NULL) {
         if ((*n != '-') || n[1]) {
-            return bb_xfopen(n, "r\0w" + read0write2);
+            return xfopen(n, "r\0w" + read0write2);
         }
     }
@@ -30 +28 @@
 }
 
+int uniq_main(int argc, char **argv);
 int uniq_main(int argc, char **argv)
 {
     FILE *in, *out;
-    unsigned long dups, skip_fields, skip_chars, i, uniq_flags;
+    unsigned long dups, skip_fields, skip_chars, i;
     const char *s0, *e0, *s1, *e1, *input_filename;
-    int opt;
+    unsigned opt;
 
-    uniq_flags = skip_fields = skip_chars = 0;
+    enum {
+        OPT_c = 0x1,
+        OPT_d = 0x2,
+        OPT_u = 0x4,
+        OPT_f = 0x8,
+        OPT_s = 0x10,
+    };
 
-    while ((opt = getopt(argc, argv, uniq_opts)) > 0) {
-        if ((opt == 'f') || (opt == 's')) {
-            int t = bb_xgetularg10(optarg);
-            if (opt == 'f') {
-                skip_fields = t;
-            } else {
-                skip_chars = t;
-            }
-        } else if ((s0 = strchr(uniq_opts, opt)) != NULL) {
-            uniq_flags |= s0[4];
-        } else {
-            bb_show_usage();
-        }
-    }
+    skip_fields = skip_chars = 0;
 
-    input_filename = *(argv += optind);
+    opt = getopt32(argv, "cduf:s:", &s0, &s1);
+    if (opt & OPT_f)
+        skip_fields = xatoul(s0);
+    if (opt & OPT_s)
+        skip_chars = xatoul(s1);
+    argv += optind;
+
+    input_filename = *argv;
 
     in = xgetoptfile_uniq_s(argv, 0);
@@ -73 +72 @@
 
         /* gnu uniq ignores newlines */
-        while ((s1 = bb_get_chomped_line_from_file(in)) != NULL) {
+        while ((s1 = xmalloc_getline(in)) != NULL) {
             e1 = s1;
-            for (i=skip_fields ; i ; i--) {
+            for (i = skip_fields; i; i--) {
                 e1 = skip_whitespace(e1);
-                while (*e1 && !isspace(*e1)) {
-                    ++e1;
-                }
+                e1 = skip_non_whitespace(e1);
             }
-            for (i = skip_chars ; *e1 && i ; i--) {
+            for (i = skip_chars; *e1 && i; i--) {
                 ++e1;
             }
@@ -93 +90 @@
 
         if (s0) {
-            if (!(uniq_flags & (2 << !!dups))) {
-                bb_fprintf(out, "\0%d " + (uniq_flags & 1), dups + 1);
-                bb_fprintf(out, "%s\n", s0);
+            if (!(opt & (OPT_d << !!dups))) { /* (if dups, opt & OPT_e) */
+                fprintf(out, "\0%d " + (opt & 1), dups + 1);
+                fprintf(out, "%s\n", s0);
             }
             free((void *)s0);
@@ -101 +98 @@
     } while (s1);
 
-    bb_xferror(in, input_filename);
+    die_if_ferror(in, input_filename);
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }

branches/stable/mindi-busybox/coreutils/usleep.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */
 
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int usleep_main(int argc, char **argv);
 int usleep_main(int argc, char **argv)
 {
@@ -34 +21 @@
     }
 
-    if (usleep(bb_xgetularg10_bnd(argv[1], 0, UINT_MAX))) {
+    if (usleep(xatou(argv[1]))) {
         bb_perror_nomsg_and_die();
     }

branches/stable/mindi-busybox/coreutils/uudecode.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  *  Copyright 2003, Glenn McGrath <bug1@iinet.net.au>
@@ -12 +13 @@
 
 
-#include <stdio.h>
-#include <errno.h>
-#include <getopt.h> /* optind */
-#include <string.h>
-#include <stdlib.h>
-#include "busybox.h"
-
-static int read_stduu(FILE *src_stream, FILE *dst_stream)
+#include "libbb.h"
+
+static void read_stduu(FILE *src_stream, FILE *dst_stream)
 {
     char *line;
 
-    while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
+    while ((line = xmalloc_getline(src_stream)) != NULL) {
         int length;
         char *line_ptr = line;
 
         if (strcmp(line, "end") == 0) {
-            return(EXIT_SUCCESS);
+            return;
         }
         length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3;
@@ -37 +33 @@
         }
         if (length > 60) {
-            bb_error_msg_and_die("Line too long");
+            bb_error_msg_and_die("line too long");
         }
 
         line_ptr++;
-        /* Tolerate an overly long line to acomadate a possible exta '`' */
+        /* Tolerate an overly long line to accomodate a possible exta '`' */
         if (strlen(line_ptr) < (size_t)length) {
-            bb_error_msg_and_die("Short file");
+            bb_error_msg_and_die("short file");
         }
 
@@ -68 +64 @@
         free(line);
     }
-    bb_error_msg_and_die("Short file");
+    bb_error_msg_and_die("short file");
 }
 
-static int read_base64(FILE *src_stream, FILE *dst_stream)
+static void read_base64(FILE *src_stream, FILE *dst_stream)
 {
-    static const char base64_table[] =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n";
-    char term_count = 0;
+    int term_count = 1;
 
     while (1) {
@@ -85 +79 @@
             int ch;
 
-            /* Get next _valid_ character */
+            /* Get next _valid_ character.
+             * global vector bb_uuenc_tbl_base64[] contains this string:
+             * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
+             */
             do {
                 ch = fgetc(src_stream);
                 if (ch == EOF) {
-                    bb_error_msg_and_die("Short file");
+                    bb_error_msg_and_die("short file");
                 }
-            } while ((table_ptr = strchr(base64_table, ch)) == NULL);
-
-            /* Convert encoded charcter to decimal */
-            ch = table_ptr - base64_table;
+                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
+            } while (table_ptr == NULL);
+
+            /* Convert encoded character to decimal */
+            ch = table_ptr - bb_uuenc_tbl_base64;
 
             if (*table_ptr == '=') {
                 if (term_count == 0) {
-                    translated[count] = 0;
+                    translated[count] = '\0';
                     break;
                 }
                 term_count++;
-            }
-            else if (*table_ptr == '\n') {
+            } else if (*table_ptr == '\n') {
                 /* Check for terminating line */
                 if (term_count == 5) {
-                    return(EXIT_SUCCESS);
+                    return;
                 }
                 term_count = 1;
@@ -118 +115 @@
 
         /* Merge 6 bit chars to 8 bit */
-        fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
+        if (count > 1) {
+            fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
+        }
         if (count > 2) {
             fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
@@ -128 +127 @@
 }
 
+int uudecode_main(int argc, char **argv);
 int uudecode_main(int argc, char **argv)
 {
-    int (*decode_fn_ptr) (FILE * src, FILE * dst);
-    FILE *src_stream;
+    FILE *src_stream = stdin;
     char *outname = NULL;
     char *line;
-    int opt;
-
-    opt = bb_getopt_ulflags(argc, argv, "o:", &outname);
-
-    if (optind == argc) {
-        src_stream = stdin;
-    } else if (optind + 1 == argc) {
-        src_stream = bb_xfopen(argv[optind], "r");
-    } else {
-        bb_show_usage();
-    }
+
+    opt_complementary = "?1"; /* 1 argument max */
+    getopt32(argv, "o:", &outname);
+    argv += optind;
+
+    if (argv[0])
+        src_stream = xfopen(argv[0], "r");
 
     /* Search for the start of the encoding */
-    while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
-        char *line_ptr = NULL;
-
-        if (line == NULL) {
-            break;
-        } else if (strncmp(line, "begin-base64 ", 13) == 0) {
+    while ((line = xmalloc_getline(src_stream)) != NULL) {
+        void (*decode_fn_ptr)(FILE * src, FILE * dst);
+        char *line_ptr;
+        FILE *dst_stream;
+        int mode;
+
+        if (strncmp(line, "begin-base64 ", 13) == 0) {
             line_ptr = line + 13;
             decode_fn_ptr = read_base64;
@@ -158 +154 @@
             line_ptr = line + 6;
             decode_fn_ptr = read_stduu;
-        }
-
-        if (line_ptr) {
-            FILE *dst_stream;
-            int mode;
-            int ret;
-
-            mode = strtoul(line_ptr, NULL, 8);
-            if (outname == NULL) {
-                outname = strchr(line_ptr, ' ');
-                if ((outname == NULL) || (*outname == '\0')) {
-                    break;
-                }
-                outname++;
-            }
-            if (strcmp(outname, "-") == 0) {
-                dst_stream = stdout;
-            } else {
-                dst_stream = bb_xfopen(outname, "w");
-                chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO));
-            }
+        } else {
             free(line);
-            ret = decode_fn_ptr(src_stream, dst_stream);
-            bb_fclose_nonstdin(src_stream);
-            return(ret);
+            continue;
+        }
+
+        /* begin line found. decode and exit */
+        mode = strtoul(line_ptr, NULL, 8);
+        if (outname == NULL) {
+            outname = strchr(line_ptr, ' ');
+            if ((outname == NULL) || (*outname == '\0')) {
+                break;
+            }
+            outname++;
+        }
+        dst_stream = stdout;
+        if (NOT_LONE_DASH(outname)) {
+            dst_stream = xfopen(outname, "w");
+            chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO));
         }
         free(line);
+        decode_fn_ptr(src_stream, dst_stream);
+        /* fclose_if_not_stdin(src_stream); - redundant */
+        return EXIT_SUCCESS;
     }
-    bb_error_msg_and_die("No `begin' line");
+    bb_error_msg_and_die("no 'begin' line");
 }
+
+/* Test script.
+Put this into an empty dir with busybox binary, an run.
+
+#!/bin/sh
+test -x busybox || { echo "No ./busybox?"; exit; }
+ln -sf busybox uudecode
+ln -sf busybox uuencode
+>A_null
+echo -n A >A
+echo -n AB >AB
+echo -n ABC >ABC
+echo -n ABCD >ABCD
+echo -n ABCDE >ABCDE
+echo -n ABCDEF >ABCDEF
+cat busybox >A_bbox
+for f in A*; do
+    echo uuencode $f
+    ./uuencode    $f <$f >u_$f
+    ./uuencode -m $f <$f >m_$f
+done
+mkdir unpk_u unpk_m 2>/dev/null
+for f in u_*; do
+    ./uudecode <$f -o unpk_u/${f:2}
+    diff -a ${f:2} unpk_u/${f:2} >/dev/null 2>&1
+    echo uudecode $f: $?
+done
+for f in m_*; do
+    ./uudecode <$f -o unpk_m/${f:2}
+    diff -a ${f:2} unpk_m/${f:2} >/dev/null 2>&1
+    echo uudecode $f: $?
+done
+*/

branches/stable/mindi-busybox/coreutils/uuencode.c

@@ -6 +6 @@
  *  Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
  *
- *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include "busybox.h"
 
-/* Conversion table.  for base 64 */
-static const char tbl_base64[65] = {
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-    'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-    'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-    'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-    'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', '0', '1', '2', '3',
-    '4', '5', '6', '7', '8', '9', '+', '/',
-    '=' /* termination character */
+#include "libbb.h"
+
+enum {
+    SRC_BUF_SIZE = 45,  /* This *MUST* be a multiple of 3 */
+    DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
 };
 
-static const char tbl_std[65] = {
-    '`', '!', '"', '#', '$', '%', '&', '\'',
-    '(', ')', '*', '+', ',', '-', '.', '/',
-    '0', '1', '2', '3', '4', '5', '6', '7',
-    '8', '9', ':', ';', '<', '=', '>', '?',
-    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
-    'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-    'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-    'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
-    '`' /* termination character */
-};
-
-/*
- * Encode the string S of length LENGTH to base64 format and place it
- * to STORE.  STORE will be 0-terminated, and must point to a writable
- * buffer of at least 1+BASE64_LENGTH(length) bytes.
- * where BASE64_LENGTH(len) = (4 * ((LENGTH + 2) / 3))
- */
-static void uuencode (const unsigned char *s, char *store, const int length, const char *tbl)
-{
-    int i;
-    char *p = store;
-
-    /* Transform the 3x8 bits to 4x6 bits, as required by base64.  */
-    for (i = 0; i < length; i += 3) {
-        *p++ = tbl[s[0] >> 2];
-        *p++ = tbl[((s[0] & 3) << 4) + (s[1] >> 4)];
-        *p++ = tbl[((s[1] & 0xf) << 2) + (s[2] >> 6)];
-        *p++ = tbl[s[2] & 0x3f];
-        s += 3;
-    }
-    /* Pad the result if necessary...  */
-    if (i == length + 1) {
-        *(p - 1) = tbl[64];
-    }
-    else if (i == length + 2) {
-        *(p - 1) = *(p - 2) = tbl[64];
-    }
-    /* ...and zero-terminate it.  */
-    *p = '\0';
-}
-
-#define SRC_BUF_SIZE    45  // This *MUST* be a multiple of 3
-#define DST_BUF_SIZE    4 * ((SRC_BUF_SIZE + 2) / 3)
+int uuencode_main(int argc, char **argv);
 int uuencode_main(int argc, char **argv)
 {
-    const size_t src_buf_size = SRC_BUF_SIZE;
-    const size_t dst_buf_size = DST_BUF_SIZE;
-    size_t write_size = dst_buf_size;
     struct stat stat_buf;
-    FILE *src_stream = stdin;
+    int src_fd = STDIN_FILENO;
     const char *tbl;
-    size_t size;
     mode_t mode;
-    RESERVE_CONFIG_BUFFER(src_buf, SRC_BUF_SIZE + 1);
-    RESERVE_CONFIG_BUFFER(dst_buf, DST_BUF_SIZE + 1);
+    char src_buf[SRC_BUF_SIZE];
+    char dst_buf[DST_BUF_SIZE + 1];
 
-    tbl = tbl_std;
-    if (bb_getopt_ulflags(argc, argv, "m") & 1) {
-        tbl = tbl_base64;
+    tbl = bb_uuenc_tbl_std;
+    mode = 0666 & ~umask(0666);
+    opt_complementary = "-1:?2"; /* must have 1 or 2 args */
+    if (getopt32(argv, "m")) {
+        tbl = bb_uuenc_tbl_base64;
+    }
+    argv += optind;
+    if (argc == optind + 2) {
+        src_fd = xopen(*argv, O_RDONLY);
+        fstat(src_fd, &stat_buf);
+        mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+        argv++;
     }
 
-    switch (argc - optind) {
-        case 2:
-            src_stream = bb_xfopen(argv[optind], "r");
-            xstat(argv[optind], &stat_buf);
-            mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
-            if (src_stream == stdout) {
-                puts("NULL");
-            }
+    printf("begin%s %o %s", tbl == bb_uuenc_tbl_std ? "" : "-base64", mode, *argv);
+    while (1) {
+        size_t size = full_read(src_fd, src_buf, SRC_BUF_SIZE);
+        if (!size)
             break;
-        case 1:
-            mode = 0666 & ~umask(0666);
-            break;
-        default:
-            bb_show_usage();
-    }
-
-    bb_printf("begin%s %o %s", tbl == tbl_std ? "" : "-base64", mode, argv[argc - 1]);
-
-    while ((size = fread(src_buf, 1, src_buf_size, src_stream)) > 0) {
-        if (size != src_buf_size) {
-            /* write_size is always 60 until the last line */
-            write_size=(4 * ((size + 2) / 3));
-            /* pad with 0s so we can just encode extra bits */
-            memset(&src_buf[size], 0, src_buf_size - size);
-        }
+        if ((ssize_t)size < 0)
+            bb_perror_msg_and_die(bb_msg_read_error);
         /* Encode the buffer we just read in */
-        uuencode((unsigned char*)src_buf, dst_buf, size, tbl);
-
+        bb_uuencode(dst_buf, src_buf, size, tbl);
         putchar('\n');
-        if (tbl == tbl_std) {
+        if (tbl == bb_uuenc_tbl_std) {
             putchar(tbl[size]);
         }
-        if (fwrite(dst_buf, 1, write_size, stdout) != write_size) {
-            bb_perror_msg_and_die(bb_msg_write_error);
-        }
+        fflush(stdout);
+        xwrite(STDOUT_FILENO, dst_buf, 4 * ((size + 2) / 3));
     }
-    bb_printf(tbl == tbl_std ? "\n`\nend\n" : "\n====\n");
+    printf(tbl == bb_uuenc_tbl_std ? "\n`\nend\n" : "\n====\n");
 
-    bb_xferror(src_stream, "source");   /* TODO - Fix this! */
-
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }

branches/stable/mindi-busybox/coreutils/wc.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -50 +37 @@
  *
  *      echo hello > /tmp/testfile &&
- *      (dd ibs=1k skip=1 count=0 &> /dev/null ; wc -c) < /tmp/testfile
+ *      (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile
  *
  * for which 'wc -c' should output '0'.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "busybox.h"
-
-#ifdef CONFIG_LOCALE_SUPPORT
-#include <locale.h>
-#include <ctype.h>
+#include "libbb.h"
+
+#if ENABLE_LOCALE_SUPPORT
 #define isspace_given_isprint(c) isspace(c)
 #else
@@ -73 +54 @@
 #endif
 
+#if ENABLE_FEATURE_WC_LARGE
+#define COUNT_T unsigned long long
+#define COUNT_FMT "llu"
+#else
+#define COUNT_T unsigned
+#define COUNT_FMT "u"
+#endif
+
 enum {
     WC_LINES    = 0,
@@ -80 +69 @@
 };
 
-/* Note: If this changes, remember to change the initialization of
- *       'name' in wc_main.  It needs to point to the terminating nul. */
-static const char wc_opts[] = "lwcL";   /* READ THE WARNING ABOVE! */
-
-enum {
-    OP_INC_LINE = 1, /* OP_INC_LINE must be 1. */
-    OP_SPACE    = 2,
-    OP_NEWLINE  = 4,
-    OP_TAB      = 8,
-    OP_NUL      = 16,
-};
-
-/* Note: If fmt_str changes, the offsets to 's' in the OUTPUT section
- *       will need to be updated. */
-static const char fmt_str[] = " %7u\0 %s\n";
-static const char total_str[] = "total";
-
+int wc_main(int argc, char **argv);
 int wc_main(int argc, char **argv)
 {
     FILE *fp;
-    const char *s;
-    unsigned int *pcounts;
-    unsigned int counts[4];
-    unsigned int totals[4];
-    unsigned int linepos;
-    unsigned int u;
+    const char *s, *arg;
+    const char *start_fmt = "%9"COUNT_FMT;
+    const char *fname_fmt = " %s\n";
+    COUNT_T *pcounts;
+    COUNT_T counts[4];
+    COUNT_T totals[4];
+    unsigned linepos;
+    unsigned u;
     int num_files = 0;
     int c;
-    char status = EXIT_SUCCESS;
-    char in_word;
-    char print_type;
-
-    print_type = bb_getopt_ulflags(argc, argv, wc_opts);
+    smallint status = EXIT_SUCCESS;
+    smallint in_word;
+    unsigned print_type;
+
+    print_type = getopt32(argv, "lwcL");
 
     if (print_type == 0) {
@@ -119 +94 @@
 
     argv += optind;
-    if (!*argv) {
+    if (!argv[0]) {
         *--argv = (char *) bb_msg_standard_input;
+        fname_fmt = "\n";
+        if (!((print_type-1) & print_type)) /* exactly one option? */
+            start_fmt = "%"COUNT_FMT;
     }
 
@@ -127 +105 @@
     pcounts = counts;
 
-    do {
+    while ((arg = *argv++) != 0) {
         ++num_files;
-        if (!(fp = bb_wfopen_input(*argv))) {
+        fp = fopen_or_warn_stdin(arg);
+        if (!fp) {
             status = EXIT_FAILURE;
             continue;
@@ -139 +118 @@
 
         do {
+            /* Our -w doesn't match GNU wc exactly... oh well */
+
             ++counts[WC_CHARS];
             c = getc(fp);
@@ -170 +151 @@
             } else if (c == EOF) {
                 if (ferror(fp)) {
-                    bb_perror_msg("%s", *argv);
+                    bb_perror_msg("%s", arg);
                     status = EXIT_FAILURE;
                 }
@@ -191 +172 @@
         totals[WC_LENGTH] -= counts[WC_LENGTH];
 
-        bb_fclose_nonstdin(fp);
+        fclose_if_not_stdin(fp);
 
     OUTPUT:
-        s = fmt_str + 1;            /* Skip the leading space on 1st pass. */
+        /* coreutils wc tries hard to print pretty columns
+         * (saves results for all files, find max col len etc...)
+         * we won't try that hard, it will bloat us too much */
+        s = start_fmt;
         u = 0;
         do {
             if (print_type & (1 << u)) {
-                bb_printf(s, pcounts[u]);
-                s = fmt_str;        /* Ok... restore the leading space. */
+                printf(s, pcounts[u]);
+                s = " %9"COUNT_FMT; /* Ok... restore the leading space. */
             }
             totals[u] += pcounts[u];
         } while (++u < 4);
-
-        s += 8;                     /* Set the format to the empty string. */
-
-        if (*argv != bb_msg_standard_input) {
-            s -= 3;                 /* We have a name, so do %s conversion. */
-        }
-        bb_printf(s, *argv);
-
-    } while (*++argv);
+        printf(fname_fmt, arg);
+    }
 
     /* If more than one file was processed, we want the totals.  To save some
@@ -219 +196 @@
     if (num_files > 1) {
         num_files = 0;              /* Make sure we don't get here again. */
-        *--argv = (char *) total_str;
+        arg = "total";
         pcounts = totals;
+        --argv;
         goto OUTPUT;
     }
 
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }

branches/stable/mindi-busybox/coreutils/who.c

@@ -12 +12 @@
  *
  * Copyright (c) 2002 AYR Networks, Inc.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ *
  *----------------------------------------------------------------------
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <utmp.h>
 #include <time.h>
 
-static const char * idle_string (time_t t)
+static void idle_string(char *str6, time_t t)
 {
-    static char str[6];
-    
-    time_t s = time(NULL) - t;
+    t = time(NULL) - t;
 
-    if (s < 60)
-        return ".";
-    if (s < (24 * 60 * 60)) {
-        sprintf (str, "%02d:%02d",
-                (int) (s / (60 * 60)),
-                (int) ((s % (60 * 60)) / 60));
-        return str;
+    /*if (t < 60) {
+        str6[0] = '.';
+        str6[1] = '\0';
+        return;
+    }*/
+    if (t >= 0 && t < (24 * 60 * 60)) {
+        sprintf(str6, "%02d:%02d",
+                (int) (t / (60 * 60)),
+                (int) ((t % (60 * 60)) / 60));
+        return;
     }
-    return "old";
+    strcpy(str6, "old");
 }
 
+int who_main(int argc, char **argv);
 int who_main(int argc, char **argv)
 {
+    char str6[6];
     struct utmp *ut;
     struct stat st;
     char *name;
-    
+
     if (argc > 1) {
         bb_show_usage();
     }
-    
+
     setutent();
     printf("USER       TTY      IDLE      TIME           HOST\n");
@@ -54 +60 @@
             /* ut->ut_line is device name of tty - "/dev/" */
             name = concat_path_file("/dev", ut->ut_line);
-            printf("%-10s %-8s %-8s  %-12.12s   %s\n", ut->ut_user, ut->ut_line,
-                                    (stat(name, &st)) ?  "?" : idle_string(st.st_atime),
-                                    ctime(&thyme) + 4, ut->ut_host);
-            if (ENABLE_FEATURE_CLEAN_UP) free(name);
+            str6[0] = '?';
+            str6[1] = '\0';
+            if (stat(name, &st) == 0)
+                idle_string(str6, st.st_atime);
+            printf("%-10s %-8s %-9s %-14.14s %s\n",
+                    ut->ut_user, ut->ut_line, str6,
+                    ctime(&thyme) + 4, ut->ut_host);
+            if (ENABLE_FEATURE_CLEAN_UP)
+                free(name);
         }
     }
-    if (ENABLE_FEATURE_CLEAN_UP) endutent();
+    if (ENABLE_FEATURE_CLEAN_UP)
+        endutent();
     return 0;
 }

branches/stable/mindi-busybox/coreutils/whoami.c

@@ -5 +5 @@
  * Copyright (C) 2000  Edward Betts <edward@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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int whoami_main(int argc, char **argv);
 int whoami_main(int argc, char **argv)
 {
@@ -33 +20 @@
         bb_show_usage();
 
-    puts(bb_getpwuid(NULL, geteuid(), -1));
-    /* exits on error */
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    /* Will complain and die if username not found */
+    puts(bb_getpwuid(NULL, -1, geteuid()));
+
+    return fflush(stdout);
 }

branches/stable/mindi-busybox/coreutils/yes.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -28 +15 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int yes_main(int argc, char **argv);
 int yes_main(int argc, char **argv)
 {
-    static const char fmt_str[] = " %s";
-    const char *fmt;
     char **first_arg;
 
-    *argv = "y";
+    argv[0] = (char*)"y";
     if (argc != 1) {
         ++argv;
@@ -45 +31 @@
     first_arg = argv;
     do {
-        fmt = fmt_str + 1;
-        do {
-            bb_printf(fmt, *argv);
-            fmt = fmt_str;
-        } while (*++argv);
+        while (1) {
+            fputs(*argv, stdout);
+            if (!*++argv)
+                break;
+            putchar(' ');
+        }
         argv = first_arg;
     } while (putchar('\n') != EOF);