Merge branch 'busybox' into merge

Conflicts:
	include/platform.h
	scripts/basic/fixdep.c

21 files changed, 191 insertions, 75 deletions

diff --git a/Makefile.help b/Makefile.help
index 119dd6f89..6a23e2a80 100644
--- a/Makefile.help
+++ b/Makefile.help
@@ -21,10 +21,6 @@ help:
         @echo '  defconfig              - set .config to largest generic configuration'
         @echo '  menuconfig             - interactive curses-based configurator'
         @echo '  oldconfig              - resolve any unresolved symbols in .config'
-        @echo '  hosttools              - build sed for the host.'
-        @echo '                           You can use these commands if the commands on the host'
-        @echo '                           is unusable. Afterwards use it like:'
-        @echo '                           make SED="$(objtree)/sed"'
         @$(if $(boards), \
                 $(foreach b, $(boards), \
                 printf "  %-21s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 32f842095..54d910431 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -115,7 +115,9 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
                  */
                 p += len;
                 sz -= len;
-                if ((int)sz < 0
+                if (
+                /** (int)sz < 0 - not good enough for huge malicious VALUE of 2^32-1 */
+                    (int)(sz|len) < 0 /* this works */
                  || len == 0
                  || errno != EINVAL
                  || *end != ' '
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index c4e02f0f7..b11bf46af 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -184,27 +184,26 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected)
 
 int FAST_FUNC open_zipped(const char *fname)
 {
-        char *sfx;
         int fd;
 
         fd = open(fname, O_RDONLY);
         if (fd < 0)
                 return fd;
 
-        sfx = strrchr(fname, '.');
-        if (sfx) {
-                sfx++;
-                if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
-                        /* .lzma has no header/signature, just trust it */
+        if (ENABLE_FEATURE_SEAMLESS_LZMA) {
+                /* .lzma has no header/signature, can only detect it by extension */
+                char *sfx = strrchr(fname, '.');
+                if (sfx && strcmp(sfx+1, "lzma") == 0) {
                         open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma");
-                else
-                if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
-                 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
-                 || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
-                ) {
-                        setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
+                        return fd;
                 }
         }
+        if ((ENABLE_FEATURE_SEAMLESS_GZ)
+         || (ENABLE_FEATURE_SEAMLESS_BZ2)
+         || (ENABLE_FEATURE_SEAMLESS_XZ)
+        ) {
+                setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
+        }
 
         return fd;
 }
diff --git a/coreutils/Config.src b/coreutils/Config.src
index b5701217e..ef14be471 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -635,12 +635,13 @@ config FEATURE_FANCY_TAIL
         default y
         depends on TAIL
         help
-          The options (-q, -s, and -v) are provided by GNU tail, but
+          The options (-q, -s, -v and -F) are provided by GNU tail, but
           are not specific in the SUSv3 standard.
 
             -q      Never output headers giving file names
             -s SEC  Wait SEC seconds between reads with -f
             -v      Always output headers giving file names
+            -F      Same as -f, but keep retrying
 
 config TEE
         bool "tee"
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 1a9127622..cb07bbcbb 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -16,10 +16,10 @@
 //usage:       "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
 //usage:     "\n        -R      Recurse"
 //usage:     "\n        -h      Affect symlinks instead of symlink targets"
+//usage:        IF_DESKTOP(
 //usage:     "\n        -L      Traverse all symlinks to directories"
 //usage:     "\n        -H      Traverse symlinks on command line only"
 //usage:     "\n        -P      Don't traverse symlinks (default)"
-//usage:        IF_DESKTOP(
 //usage:     "\n        -c      List changed files"
 //usage:     "\n        -v      List all files"
 //usage:     "\n        -f      Hide errors"
diff --git a/coreutils/tail.c b/coreutils/tail.c
index eab502beb..e352ab627 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -32,15 +32,14 @@
 //usage:       "Print last 10 lines of each FILE (or stdin) to stdout.\n"
 //usage:       "With more than one FILE, precede each with a filename header.\n"
 //usage:     "\n        -f              Print data as file grows"
-//usage:        IF_FEATURE_FANCY_TAIL(
-//usage:     "\n        -s SECONDS      Wait SECONDS between reads with -f"
-//usage:        )
+//usage:     "\n        -c [+]N[kbm]    Print last N bytes"
 //usage:     "\n        -n N[kbm]       Print last N lines"
 //usage:     "\n        -n +N[kbm]      Start on Nth line and print the rest"
 //usage:        IF_FEATURE_FANCY_TAIL(
-//usage:     "\n        -c [+]N[kbm]    Print last N bytes"
 //usage:     "\n        -q              Never print headers"
+//usage:     "\n        -s SECONDS      Wait SECONDS between reads with -f"
 //usage:     "\n        -v              Always print headers"
+//usage:     "\n        -F              Same as -f, but keep retrying"
 //usage:     "\n"
 //usage:     "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)."
 //usage:        )
diff --git a/findutils/find.c b/findutils/find.c
index 53d8239c7..5d5e24bfb 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -1291,9 +1291,27 @@ int find_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int find_main(int argc UNUSED_PARAM, char **argv)
 {
         int i, firstopt, status = EXIT_SUCCESS;
+        char **past_HLP, *saved;
 
         INIT_G();
 
+        /* "find -type f" + getopt("+HLP") => disaster.
+         * Need to avoid getopt running into a non-HLP option.
+         * Do this by temporarily storing NULL there:
+         */
+        past_HLP = argv;
+        for (;;) {
+                saved = *++past_HLP;
+                if (!saved)
+                        break;
+                if (saved[0] != '-')
+                        break;
+                if (!saved[1])
+                        break; /* it is "-" */
+                if ((saved+1)[strspn(saved+1, "HLP")] != '\0')
+                        break;
+        }
+        *past_HLP = NULL;
         /* "+": stop on first non-option */
         i = getopt32(argv, "+HLP");
         if (i & (1<<0))
@@ -1301,7 +1319,8 @@ int find_main(int argc UNUSED_PARAM, char **argv)
         if (i & (1<<1))
                 G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
         /* -P is default and is ignored */
-        argv += optind;
+        argv = past_HLP; /* same result as "argv += optind;" */
+        *past_HLP = saved;
 
         for (firstopt = 0; argv[firstopt]; firstopt++) {
                 if (argv[firstopt][0] == '-')
diff --git a/findutils/grep.c b/findutils/grep.c
index 5bbe61100..f5f95cb95 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -381,6 +381,9 @@ static int grep_file(FILE *file)
  opt_f_not_found: ;
                                 }
                         } else {
+#if ENABLE_EXTRA_COMPAT
+                                unsigned start_pos;
+#endif
                                 char *match_at;
 
                                 if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
@@ -397,15 +400,18 @@ static int grep_file(FILE *file)
 #if !ENABLE_EXTRA_COMPAT
                                 gl->matched_range.rm_so = 0;
                                 gl->matched_range.rm_eo = 0;
+#else
+                                start_pos = 0;
 #endif
                                 match_at = line;
  opt_w_again:
+//bb_error_msg("'%s' start_pos:%d line_len:%d", match_at, start_pos, line_len);
                                 if (
 #if !ENABLE_EXTRA_COMPAT
                                         regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, 0) == 0
 #else
                                         re_search(&gl->compiled_regex, match_at, line_len,
-                                                        /*start:*/ 0, /*range:*/ line_len,
+                                                        start_pos, /*range:*/ line_len,
                                                         &gl->matched_range) >= 0
 #endif
                                 ) {
@@ -424,8 +430,24 @@ static int grep_file(FILE *file)
                                                         if (!c || (!isalnum(c) && c != '_')) {
                                                                 found = 1;
                                                         } else {
-                                                                match_at += gl->matched_range.rm_eo;
-                                                                goto opt_w_again;
+                        /*
+                         * Why check gl->matched_range.rm_eo?
+                         * Zero-length match makes -w skip the line:
+                         * "echo foo | grep ^" prints "foo",
+                         * "echo foo | grep -w ^" prints nothing.
+                         * Without such check, we can loop forever.
+                         */
+#if !ENABLE_EXTRA_COMPAT
+                                                                if (gl->matched_range.rm_eo != 0) {
+                                                                        match_at += gl->matched_range.rm_eo;
+                                                                        goto opt_w_again;
+                                                                }
+#else
+                                                                if (gl->matched_range.rm_eo > start_pos) {
+                                                                        start_pos = gl->matched_range.rm_eo;
+                                                                        goto opt_w_again;
+                                                                }
+#endif
                                                         }
                                                 }
                                         }
diff --git a/include/platform.h b/include/platform.h
index e52dd7ba5..515ef031f 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -402,10 +402,6 @@ typedef unsigned smalluint;
 # undef HAVE_STRVERSCMP
 #endif
 
-#if defined(__dietlibc__)
-# undef HAVE_STRCHRNUL
-#endif
-
 #if ENABLE_PLATFORM_MINGW32
 # undef HAVE_DPRINTF
 # undef HAVE_GETLINE
@@ -453,7 +449,7 @@ typedef unsigned smalluint;
 /* These BSD-derived OSes share many similarities */
 #if (defined __digital__ && defined __unix__) \
  || defined __APPLE__ \
- || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
+ || defined __OpenBSD__ || defined __NetBSD__
 # undef HAVE_CLEARENV
 # undef HAVE_FDATASYNC
 # undef HAVE_GETLINE
@@ -468,10 +464,30 @@ typedef unsigned smalluint;
 # undef HAVE_UNLOCKED_LINE_OPS
 #endif
 
-#if defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__dietlibc__)
+# undef HAVE_STRCHRNUL
+#endif
+
+#if defined(__APPLE__)
 # undef HAVE_STRCHRNUL
 #endif
 
+#if defined(__FreeBSD__)
+# undef HAVE_CLEARENV
+# undef HAVE_FDATASYNC
+# undef HAVE_MNTENT_H
+# undef HAVE_PTSNAME_R
+# undef HAVE_SYS_STATFS_H
+# undef HAVE_SIGHANDLER_T
+# undef HAVE_STRVERSCMP
+# undef HAVE_XTABS
+# undef HAVE_UNLOCKED_LINE_OPS
+# include <osreldate.h>
+# if __FreeBSD_version < 1000029
+#  undef HAVE_STRCHRNUL /* FreeBSD added strchrnul() between 1000028 and 1000029 */
+# endif
+#endif
+
 #if defined(__NetBSD__)
 # define HAVE_GETLINE 1  /* Recent NetBSD versions have getline() */
 #endif
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 38d4c598d..4bb1ab783 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1267,7 +1267,9 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 {
         line_input_t *n = xzalloc(sizeof(*n));
         n->flags = flags;
+#if MAX_HISTORY > 0
         n->max_history = MAX_HISTORY;
+#endif
         return n;
 }
 
diff --git a/libbb/speed_table.c b/libbb/speed_table.c
index 45159f1f3..174d531b2 100644
--- a/libbb/speed_table.c
+++ b/libbb/speed_table.c
@@ -10,7 +10,12 @@
 #include "libbb.h"
 
 struct speed_map {
+#if defined __FreeBSD__
+        /* On FreeBSD, B<num> constants don't fit into a short */
+        unsigned speed;
+#else
         unsigned short speed;
+#endif
         unsigned short value;
 };
 
diff --git a/networking/isrv.h b/networking/isrv.h
index 4c7e01dd1..7b12e0edd 100644
--- a/networking/isrv.h
+++ b/networking/isrv.h
@@ -23,7 +23,31 @@ int isrv_register_fd(isrv_state_t *state, int peer, int fd);
 void isrv_close_fd(isrv_state_t *state, int fd);
 int isrv_register_peer(isrv_state_t *state, void *param);
 
-/* driver */
+/* Driver:
+ *
+ * Select on listen_fd for <linger_timeout> (or forever if 0).
+ *
+ * If we time out and we have no peers, exit.
+ * If we have peers, call do_timeout(peer_param),
+ * if it returns !0, peer is removed.
+ *
+ * If listen_fd is active, accept new connection ("peer"),
+ * call new_peer() on it, and if it returns 0,
+ * add it to fds to select on.
+ * Now, select will wait for <timeout>, not <linger_timeout>
+ * (as long as we have more than zero peers).
+ *
+ * If a peer's fd is active, we call do_rd() on it if read
+ * bit was set, and then do_wr() if write bit was also set.
+ * If either returns !0, peer is removed.
+ * Reaching this place also resets timeout counter for this peer.
+ *
+ * Note that peer must indicate that he wants to be selected
+ * for read and/or write using isrv_want_rd()/isrv_want_wr()
+ * [can be called in new_peer() or in do_rd()/do_wr()].
+ * If it never wants to be selected for write, do_wr()
+ * will never be called (can be NULL).
+ */
 void isrv_run(
         int listen_fd,
         int (*new_peer)(isrv_state_t *state, int fd),
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index a41405c33..252c8aba9 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -25,8 +25,7 @@ enum { TIMEOUT = 20 };
 
 typedef struct identd_buf_t {
         int pos;
-        int fd_flag;
-        char buf[64 - 2*sizeof(int)];
+        char buf[64 - sizeof(int)];
 } identd_buf_t;
 
 #define bogouser bb_common_bufsiz1
@@ -42,7 +41,7 @@ static int new_peer(isrv_state_t *state, int fd)
         if (isrv_register_fd(state, peer, fd) < 0)
                 return peer; /* failure, unregister peer */
 
-        buf->fd_flag = fcntl(fd, F_GETFL) | O_NONBLOCK;
+        ndelay_on(fd);
         isrv_want_rd(state, fd);
         return 0;
 }
@@ -51,19 +50,16 @@ static int do_rd(int fd, void **paramp)
 {
         identd_buf_t *buf = *paramp;
         char *cur, *p;
-        int retval = 0; /* session is ok (so far) */
         int sz;
 
         cur = buf->buf + buf->pos;
 
-        if (buf->fd_flag & O_NONBLOCK)
-                fcntl(fd, F_SETFL, buf->fd_flag);
-        sz = safe_read(fd, cur, sizeof(buf->buf) - buf->pos);
+        sz = safe_read(fd, cur, sizeof(buf->buf) - 1 - buf->pos);
 
         if (sz < 0) {
                 if (errno != EAGAIN)
-                        goto term; /* terminate this session if !EAGAIN */
-                goto ok;
+                        goto term;
+                return 0; /* "session is ok" */
         }
 
         buf->pos += sz;
@@ -71,19 +67,22 @@ static int do_rd(int fd, void **paramp)
         p = strpbrk(cur, "\r\n");
         if (p)
                 *p = '\0';
-        if (!p && sz && buf->pos <= (int)sizeof(buf->buf))
-                goto ok;
+        if (!p && sz)
+                return 0;  /* "session is ok" */
+
         /* Terminate session. If we are in server mode, then
          * fd is still in nonblocking mode - we never block here */
-        if (fd == 0) fd++; /* inetd mode? then write to fd 1 */
+        if (fd == 0)
+                fd++; /* inetd mode? then write to fd 1 */
         fdprintf(fd, "%s : USERID : UNIX : %s\r\n", buf->buf, bogouser);
+        /*
+         * Why bother if we are going to close fd now anyway?
+         * if (server)
+         *      ndelay_off(fd);
+         */
  term:
         free(buf);
-        retval = 1; /* terminate */
- ok:
-        if (buf->fd_flag & O_NONBLOCK)
-                fcntl(fd, F_SETFL, buf->fd_flag & ~O_NONBLOCK);
-        return retval;
+        return 1; /* "terminate" */
 }
 
 static int do_timeout(void **paramp UNUSED_PARAM)
@@ -95,10 +94,9 @@ static void inetd_mode(void)
 {
         identd_buf_t *buf = xzalloc(sizeof(*buf));
         /* buf->pos = 0; - xzalloc did it */
-        /* We do NOT want nonblocking I/O here! */
-        /* buf->fd_flag = 0; - xzalloc did it */
         do
                 alarm(TIMEOUT);
+                /* Note: we do NOT want nonblocking I/O here! */
         while (do_rd(0, (void*)&buf) == 0);
 }
 
@@ -120,7 +118,7 @@ int fakeidentd_main(int argc UNUSED_PARAM, char **argv)
         opt = getopt32(argv, "fiwb:", &bind_address);
         strcpy(bogouser, "nobody");
         if (argv[optind])
-                strncpy(bogouser, argv[optind], sizeof(bogouser));
+                strncpy(bogouser, argv[optind], sizeof(bogouser) - 1);
 
         /* Daemonize if no -f and no -i and no -w */
         if (!(opt & OPT_fiw))
diff --git a/networking/ntpd.c b/networking/ntpd.c
index ed83415b4..c4b018778 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1445,6 +1445,8 @@ update_local_clock(peer_t *p)
 
                 run_script("step", offset);
 
+                recv_time += offset;
+
 #if USING_INITIAL_FREQ_ESTIMATION
                 if (G.discipline_state == STATE_NSET) {
                         set_new_values(STATE_FREQ, /*offset:*/ 0, recv_time);
diff --git a/networking/ping.c b/networking/ping.c
index 5d71fe8cc..5e4771f5a 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -168,22 +168,9 @@ create_icmp_socket(void)
 #endif
                 sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
         if (sock < 0) {
-                if (errno != EPERM)
-                        bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-#if defined(__linux__) || defined(__APPLE__)
-                /* We don't have root privileges.  Try SOCK_DGRAM instead.
-                 * Linux needs net.ipv4.ping_group_range for this to work.
-                 * MacOSX allows ICMP_ECHO, ICMP_TSTAMP or ICMP_MASKREQ
-                 */
-#if ENABLE_PING6
-                if (lsa->u.sa.sa_family == AF_INET6)
-                        sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6);
-                else
-#endif
-                        sock = socket(AF_INET, SOCK_DGRAM, 1); /* 1 == ICMP */
-                if (sock < 0)
-#endif
-                bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+                if (errno == EPERM)
+                        bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
         }
 
         xmove_fd(sock, pingsock);
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index b12569832..7f21443c1 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -39,7 +39,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <alloca.h>
+//bbox disabled: #include <alloca.h>
 
 /* exitstatus is used to keep track of any failing calls to kernel-doc,
  * but execution continues. */
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index b7f9e0c2f..f012551af 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -117,7 +117,7 @@
 #ifndef __MINGW32__
 #include <arpa/inet.h>
 #endif
-#include <alloca.h>
+//bbox disabled: #include <alloca.h>
 
 /* bbox: not needed
 #define INT_CONF ntohl(0x434f4e46)
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index 0989b2fe5..e8fa831be 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -31,7 +31,12 @@ generate()
                 # copy stdin to stdout
                 cat
                 # print everything after INSERT line
-                sed -n '/^INSERT$/ { :l; n; p; bl }' "${src}"
+                sed -n '/^INSERT$/ {
+                :l
+                    n
+                    p
+                    bl
+                }' "${src}"
         } >"${dst}.tmp"
         if ! cmp -s "${dst}" "${dst}.tmp"; then
                 gen "${dst}"
@@ -52,7 +57,12 @@ sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
 # We add line continuation backslash after each line,
 # and insert empty line before each line which doesn't start
 # with space or tab
-sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' \
+TAB="$(printf '\tX')"
+TAB="${TAB%X}"
+LF="$(printf '\nX')"
+LF="${LF%X}"
+sed -n -e 's@^//usage:\([ '"$TAB"'].*\)$@\1 \\@p' \
+       -e 's@^//usage:\([^ '"$TAB"'].*\)$@\'"$LF"'\1 \\@p' \
         "$srctree"/*/*.c "$srctree"/*/*/*.c \
 | generate \
         "$srctree/include/usage.src.h" \
diff --git a/shell/ash.c b/shell/ash.c
index d104aea1d..a916f2772 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13616,7 +13616,7 @@ init(void)
                         setvar2("PPID", utoa(getppid()));
 #if ENABLE_ASH_BASH_COMPAT
                 p = lookupvar("SHLVL");
-                setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1));
+                setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT);
 #endif
                 p = lookupvar("PWD");
                 if (p) {
diff --git a/testsuite/find.tests b/testsuite/find.tests
new file mode 100755
index 000000000..345d1e82e
--- /dev/null
+++ b/testsuite/find.tests
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Copyright 2014 by Denys Vlasenko <vda.linux@googlemail.com>
+# Licensed under GPLv2, see file LICENSE in this source tree.
+
+. ./testing.sh
+
+# testing "description" "command" "result" "infile" "stdin"
+
+mkdir -p find.tempdir
+touch find.tempdir/testfile
+
+testing "find -type f" \
+        "cd find.tempdir && find -type f 2>&1" \
+        "./testfile\n" \
+        "" ""
+
+# testing "description" "command" "result" "infile" "stdin"
+
+rm -rf find.tempdir
+
+exit $FAILCOUNT
diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index 64d99a905..412efffbb 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -147,6 +147,18 @@ testing "grep -w doesn't stop on 1st mismatch" \
         "foop foo\n" \
         ""
 
+testing "grep -w ^str doesn't match str not at the beginning" \
+        "grep -w ^str input" \
+        "" \
+        "strstr\n" \
+        ""
+
+testing "grep -w ^ doesn't hang" \
+        "grep -w ^ input" \
+        "" \
+        "anything\n" \
+        ""
+
 # testing "test name" "commands" "expected result" "file input" "stdin"
 #   file input will be file called "input"
 #   test can create a file "actual" instead of writing to stdout