BSD 4_3_Net_2 release

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

diff --git a/usr/src/bin/rmdir/rmdir.c b/usr/src/bin/rmdir/rmdir.c
index f248ef6..132af54 100644 (file)
--- a/usr/src/bin/rmdir/rmdir.c
+++ b/usr/src/bin/rmdir/rmdir.c
@@ -1,23 +1,66 @@
-static char *sccsid = "@(#)rmdir.c     4.6 (Berkeley) %G%";
+/*
+ * Copyright (c) 1983 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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
+char copyright[] =
+"@(#) Copyright (c) 1983 The Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)rmdir.c    5.3 (Berkeley) 5/31/90";
+#endif /* not lint */
+

 /*
  * Remove directory
  */
 #include <stdio.h>
 
 /*
  * Remove directory
  */
 #include <stdio.h>
 

-main(argc,argv)
+main(argc, argv)

        int argc;
        char **argv;
 {
        int argc;
        char **argv;
 {

-       int errors = 0;
+       int errors;

 
        if (argc < 2) {
 
        if (argc < 2) {

-               fprintf(stderr, "rmdir: arg count\n");
+               fprintf(stderr, "usage: rmdir directory ...\n");

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

-       while (--argc)
-               if (rmdir(*++argv) < 0) {
-                       perror(*argv);;
-                       errors++;
+       for (errors = 0; *++argv;)
+               if (rmdir(*argv) < 0) {
+                       fprintf(stderr, "rmdir: ");
+                       perror(*argv);
+                       errors = 1;

                }
                }

-       exit(errors != 0);
+       exit(errors);

 }
 }