BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / find / misc.c

diff --git a/usr/src/usr.bin/find/misc.c b/usr/src/usr.bin/find/misc.c
index b9d8891..3ff4d5a 100644 (file)
--- a/usr/src/usr.bin/find/misc.c
+++ b/usr/src/usr.bin/find/misc.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Cimarron D. Taylor of the University of California, Berkeley.
  *
  * This code is derived from software contributed to Berkeley by
  * Cimarron D. Taylor of the University of California, Berkeley.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)misc.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)misc.c     5.8 (Berkeley) 5/24/91";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -36,11 +62,8 @@ brace_subst(orig, store, path, len)
        for (p = *store; ch = *orig; ++orig)
                if (ch == '{' && orig[1] == '}') {
                        while ((p - *store) + plen > len)
        for (p = *store; ch = *orig; ++orig)
                if (ch == '{' && orig[1] == '}') {
                        while ((p - *store) + plen > len)

-                               if (!(*store = realloc(*store, len *= 2))) {
-                                       (void)fprintf(stderr,
-                                           "find: %s.\n", strerror(errno));
-                                       exit(1);
-                               }
+                               if (!(*store = realloc(*store, len *= 2)))
+                                       err("%s", strerror(errno));

                        bcopy(path, p, plen);
                        p += plen;
                        ++orig;
                        bcopy(path, p, plen);
                        p += plen;
                        ++orig;


@@ -83,18 +106,6 @@ queryuser(argv)
         return(first == 'y');
 }
  
         return(first == 'y');
 }
  

-/*
- * bad_arg --
- *     print out a bad argument message.
- */
-void
-bad_arg(option, err)
-       char *option, *err;
-{
-       (void)fprintf(stderr, "find: %s: %s.\n", option, err);
-       exit(1);
-}
- 

 /*
  * emalloc --
  *     malloc with error checking.
 /*
  * emalloc --
  *     malloc with error checking.


@@ -105,19 +116,37 @@ emalloc(len)
 {
        void *p;
 
 {
        void *p;
 

-       if (!(p = malloc(len))) {
-               (void)fprintf(stderr, "find: %s.\n", strerror(errno));
-               exit(1);
-       }
-       return(p);
+       if (p = malloc(len))
+               return(p);
+       err("%s", strerror(errno));
+       /* NOTREACHED */

 }
 
 }
 

-usage()
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+void
+#if __STDC__
+err(const char *fmt, ...)
+#else
+err(fmt, va_alist)
+       char *fmt;
+        va_dcl
+#endif

 {
 {

-       if (isdeprecated)
-               (void)fprintf(stderr, "usage: find path-list expression\n");
-       else
-               (void)fprintf(stderr,
-                   "usage: find [-drsx] -f path ... expression\n");
+       va_list ap;
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       (void)fprintf(stderr, "find: ");
+       (void)vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       (void)fprintf(stderr, "\n");

        exit(1);
        exit(1);

+       /* NOTREACHED */

 }
 }