shell_cmds-198.tar.gz

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

diff --git a/find/main.c b/find/main.c
index b1f22332658ad7e7fe05551a58200071dc5b6fa3..e95e6482e853a1fb4318633b470195ba4b63ab9f 100644 (file)
--- a/find/main.c
+++ b/find/main.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.
  * 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.
  * 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.


@@ -35,7 +31,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
+static const char copyright[] =

 "@(#) Copyright (c) 1990, 1993, 1994\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 "@(#) Copyright (c) 1990, 1993, 1994\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */


@@ -47,7 +43,7 @@ static char sccsid[] = "@(#)main.c    8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
 #endif /* not lint */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/usr.bin/find/main.c,v 1.15 2003/06/14 13:00:21 markm Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/find/main.c,v 1.23 2011/12/10 18:11:06 ed Exp $");

 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -124,7 +120,7 @@ main(int argc, char *argv[])
                        break;
                case '?':
                default:
                        break;
                case '?':
                default:

-                       break;
+                       usage();

                }
 
        argc -= optind;
                }
 
        argc -= optind;


@@ -163,7 +159,8 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-       (void)fprintf(stderr,
-"usage: find [-H | -L | -P] [-EXdsx] [-f file] [file ...] [expression]\n");
+       (void)fprintf(stderr, "%s\n%s\n",
+"usage: find [-H | -L | -P] [-EXdsx] [-f path] path ... [expression]",
+"       find [-H | -L | -P] [-EXdsx] -f path [path ...] [expression]");

        exit(1);
 }
        exit(1);
 }