BSD 4_3_Net_2 release

[unix-history] / usr / src / bin / chmod / chmod.c

diff --git a/usr/src/bin/chmod/chmod.c b/usr/src/bin/chmod/chmod.c
index 20fcc53..99e08bb 100644 (file)
--- a/usr/src/bin/chmod/chmod.c
+++ b/usr/src/bin/chmod/chmod.c
@@ -2,7 +2,33 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * %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


@@ -12,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)chmod.c    5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)chmod.c    5.19 (Berkeley) 3/12/91";

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


@@ -82,28 +108,14 @@ done:      argv += optind;
                }
                while (p = fts_read(fts))
                        switch(p->fts_info) {
                }
                while (p = fts_read(fts))
                        switch(p->fts_info) {

-                       case FTS_DNR:
-                               (void)fprintf(stderr,
-                                   "chmod: %s: unable to read.\n",
-                                   p->fts_path);
-                               break;
-                       case FTS_DNX:
-                               (void)fprintf(stderr,
-                                   "chmod: %s: unable to search.\n",
-                                   p->fts_path);
-                               break;

                        case FTS_D:
                        case FTS_D:

-                       case FTS_DC:

                                break;
                                break;

+                       case FTS_DNR:

                        case FTS_ERR:
                        case FTS_ERR:

+                       case FTS_NS:

                                (void)fprintf(stderr, "chmod: %s: %s.\n",
                                    p->fts_path, strerror(errno));
                                exit(1);
                                (void)fprintf(stderr, "chmod: %s: %s.\n",
                                    p->fts_path, strerror(errno));
                                exit(1);

-                       case FTS_NS:
-                               (void)fprintf(stderr,
-                                   "chmod: %s: unable to stat.\n",
-                                   p->fts_path);
-                               break;

                        default:
                                if (chmod(p->fts_accpath, oct ? omode :
                                    getmode(set, p->fts_statb.st_mode)) &&
                        default:
                                if (chmod(p->fts_accpath, oct ? omode :
                                    getmode(set, p->fts_statb.st_mode)) &&