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 15770db..99e08bb 100644 (file)
--- a/usr/src/bin/chmod/chmod.c
+++ b/usr/src/bin/chmod/chmod.c
@@ -2,17 +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.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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


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

-static char sccsid[] = "@(#)chmod.c    5.13 (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>


@@ -51,13 +67,12 @@ main(argc, argv)
        while ((ch = getopt(argc, argv, "Rfrwx")) != EOF)
                switch((char)ch) {
                case 'R':
        while ((ch = getopt(argc, argv, "Rfrwx")) != EOF)
                switch((char)ch) {
                case 'R':

-                       rflag++;
+                       rflag = 1;

                        break;
                        break;

-               case 'f':
-                       fflag++;
+               case 'f':               /* no longer documented */
+                       fflag = 1;

                        break;
                        break;

-               /* "-[rwx]" are valid file modes */
-               case 'r':
+               case 'r':               /* "-[rwx]" are valid file modes */

                case 'w':
                case 'x':
                        --optind;
                case 'w':
                case 'x':
                        --optind;


@@ -86,24 +101,28 @@ done:      argv += optind;
 
        retval = 0;
        if (rflag) {
 
        retval = 0;
        if (rflag) {

-               if (!(fts = ftsopen(++argv,
-                   (oct ? FTS_NOSTAT : 0)|FTS_MULTIPLE|FTS_PHYSICAL, 0))) {
+               if (!(fts = fts_open(++argv,
+                   oct ? FTS_NOSTAT|FTS_PHYSICAL : FTS_PHYSICAL, 0))) {

                        (void)fprintf(stderr, "chmod: %s.\n", strerror(errno));
                        exit(1);
                }
                        (void)fprintf(stderr, "chmod: %s.\n", strerror(errno));
                        exit(1);
                }

-               while (p = ftsread(fts)) {
-                       if (p->fts_info == FTS_D)
-                               continue;
-                       if (p->fts_info == FTS_ERR) {
-                               if (!fflag)
+               while (p = fts_read(fts))
+                       switch(p->fts_info) {
+                       case FTS_D:
+                               break;
+                       case FTS_DNR:
+                       case FTS_ERR:
+                       case FTS_NS:
+                               (void)fprintf(stderr, "chmod: %s: %s.\n",
+                                   p->fts_path, strerror(errno));
+                               exit(1);
+                       default:
+                               if (chmod(p->fts_accpath, oct ? omode :
+                                   getmode(set, p->fts_statb.st_mode)) &&
+                                   !fflag)

                                        error(p->fts_path);
                                        error(p->fts_path);

-                               continue;
+                               break;

                        }
                        }

-                       if (chmod(p->fts_accpath, oct ?
-                           omode : getmode(set, p->fts_statb.st_mode)) &&
-                           !fflag)
-                               error(p->fts_path);
-               }

                exit(retval);
        }
        if (oct) {
                exit(retval);
        }
        if (oct) {


@@ -127,6 +146,6 @@ error(name)
 
 usage()
 {
 
 usage()
 {

-       (void)fprintf(stderr, "chmod: chmod [-fR] mode file ...\n");
+       (void)fprintf(stderr, "chmod: chmod [-R] mode file ...\n");

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