shell_cmds-216.60.1.tar.gz

[apple/shell_cmds.git] / find / find.c

diff --git a/find/find.c b/find/find.c
index 48bcd2d874aeb665ad37efd207edd5613a0934f1..c59a75ab3789bdfb96492b6aacc493c34b15e960 100644 (file)
--- a/find/find.c
+++ b/find/find.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -42,7 +38,7 @@ static char sccsid[] = "@(#)find.c    8.5 (Berkeley) 8/5/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/find/find.c,v 1.20 2009/12/13 03:14:06 delphij Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/find/find.c,v 1.23 2010/12/11 08:32:16 joel Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -317,6 +313,9 @@ find_execute(PLAN *plan, char *paths[])
        }
        free (myPaths);
        finish_execplus();
+       if (execplus_error) {
+               exit(execplus_error);
+       }
        if (errno)
                err(1, "fts_read");
        fts_close(tree);