BSD 4_4_Lite1 release

[unix-history] / usr / src / sbin / clri / clri.c

diff --git a/usr/src/sbin/clri/clri.c b/usr/src/sbin/clri/clri.c
index 3412b98..c2bdccc 100644 (file)
--- a/usr/src/sbin/clri/clri.c
+++ b/usr/src/sbin/clri/clri.c
@@ -1,49 +1,76 @@
 /*
 /*

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Rich $alz of BBN Inc.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Rich $alz of BBN Inc.
  *

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

-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1990, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)clri.c     5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)clri.c     8.2 (Berkeley) 9/23/93";

 #endif /* not lint */
 
 #endif /* not lint */
 

-/*
- * clri(8)
- */
-

 #include <sys/param.h>
 #include <sys/param.h>

-#include <ufs/quota.h>
-#include <ufs/inode.h>
-#include <ufs/fs.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <sys/time.h>

 
 

-char *fs;
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 
 

+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+int

 main(argc, argv)
        int argc;
 main(argc, argv)
        int argc;

-       char **argv;
+       char *argv[];

 {
        register struct fs *sbp;
        register struct dinode *ip;
        register int fd;
        struct dinode ibuf[MAXBSIZE / sizeof (struct dinode)];
 {
        register struct fs *sbp;
        register struct dinode *ip;
        register int fd;
        struct dinode ibuf[MAXBSIZE / sizeof (struct dinode)];

-       long generation, offset, bsize;
+       long generation, bsize;
+       off_t offset;

        int inonum;
        int inonum;

-       char sblock[SBSIZE];
+       char *fs, sblock[SBSIZE];

 
        if (argc < 3) {
                (void)fprintf(stderr, "usage: clri filesystem inode ...\n");
 
        if (argc < 3) {
                (void)fprintf(stderr, "usage: clri filesystem inode ...\n");


@@ -54,9 +81,9 @@ main(argc, argv)
 
        /* get the superblock. */
        if ((fd = open(fs, O_RDWR, 0)) < 0)
 
        /* get the superblock. */
        if ((fd = open(fs, O_RDWR, 0)) < 0)

-               error();
-       if (lseek(fd, SBLOCK * DEV_BSIZE, SEEK_SET) < 0)
-               error();
+               err(1, "%s", fs);
+       if (lseek(fd, (off_t)(SBLOCK * DEV_BSIZE), SEEK_SET) < 0)
+               err(1, "%s", fs);

        if (read(fd, sblock, sizeof(sblock)) != sizeof(sblock)) {
                (void)fprintf(stderr,
                    "clri: %s: can't read the superblock.\n", fs);
        if (read(fd, sblock, sizeof(sblock)) != sizeof(sblock)) {
                (void)fprintf(stderr,
                    "clri: %s: can't read the superblock.\n", fs);


@@ -83,37 +110,31 @@ main(argc, argv)
                (void)printf("clearing %d\n", inonum);
 
                /* read in the appropriate block. */
                (void)printf("clearing %d\n", inonum);
 
                /* read in the appropriate block. */

-               offset = itod(sbp, inonum);     /* inode to fs block */
-               offset = fsbtodb(sbp, offset);  /* fs block to disk block */
-               offset *= DEV_BSIZE;            /* disk block to disk bytes */
+               offset = ino_to_fsba(sbp, inonum);      /* inode to fs blk */
+               offset = fsbtodb(sbp, offset);          /* fs blk disk blk */
+               offset *= DEV_BSIZE;                    /* disk blk to bytes */

 
                /* seek and read the block */
                if (lseek(fd, offset, SEEK_SET) < 0)
 
                /* seek and read the block */
                if (lseek(fd, offset, SEEK_SET) < 0)

-                       error();
-               if (read(fd, (char *)ibuf, bsize) != bsize)
-                       error();
+                       err(1, "%s", fs);
+               if (read(fd, ibuf, bsize) != bsize)
+                       err(1, "%s", fs);

 
                /* get the inode within the block. */
 
                /* get the inode within the block. */

-               ip = &ibuf[itoo(sbp, inonum)];
+               ip = &ibuf[ino_to_fsbo(sbp, inonum)];

 
                /* clear the inode, and bump the generation count. */
                generation = ip->di_gen + 1;
 
                /* clear the inode, and bump the generation count. */
                generation = ip->di_gen + 1;

-               bzero((char *)ip, sizeof *ip);
+               memset(ip, 0, sizeof(*ip));

                ip->di_gen = generation;
 
                /* backup and write the block */
                ip->di_gen = generation;
 
                /* backup and write the block */

-               if (lseek(fd, -bsize, SEEK_CUR) < 0)
-                       error();
-               if (write(fd, (char *)ibuf, bsize) != bsize)
-                       error();
+               if (lseek(fd, (off_t)-bsize, SEEK_CUR) < 0)
+                       err(1, "%s", fs);
+               if (write(fd, ibuf, bsize) != bsize)
+                       err(1, "%s", fs);

                (void)fsync(fd);
        }
        (void)close(fd);
        exit(0);
 }
                (void)fsync(fd);
        }
        (void)close(fd);
        exit(0);
 }

-
-error()
-{
-       (void)fprintf(stderr, "clri: %s: %s\n", fs, strerror(errno));
-       exit(1);
-}