BSD 4 release

[unix-history] / usr / src / cmd / icheck.c

diff --git a/usr/src/cmd/icheck.c b/usr/src/cmd/icheck.c
index b488390..ca478ac 100644 (file)
--- a/usr/src/cmd/icheck.c
+++ b/usr/src/cmd/icheck.c
@@ -1,5 +1,6 @@
+static char *sccsid = "@(#)icheck.c    4.1 (Berkeley) 10/1/80";

 #define        NI      16
 #define        NI      16

-#define        NB      10
+#define        NB      500

 #define        BITS    8
 #define        MAXFN   500
 
 #define        BITS    8
 #define        MAXFN   500
 


@@ -88,7 +89,7 @@ char *argv[];
        }
 #else
        {
        }
 #else
        {

-               static char fname[0];
+               static char fname[128];

 
                printf("File: ");
                gets(fname);
 
                printf("File: ");
                gets(fname);


@@ -128,12 +129,12 @@ char *file;
        sync();
 #endif
        bread((daddr_t)1, (char *)&sblock, sizeof(sblock));
        sync();
 #endif
        bread((daddr_t)1, (char *)&sblock, sizeof(sblock));

-       mino = (sblock.s_isize-2) * INOPB;
+       mino = ((int)sblock.s_isize-2) * INOPB;

        ino = 0;
        ino = 0;

-       n = (sblock.s_fsize - sblock.s_isize + BITS-1) / BITS;
+       n = (sblock.s_fsize - (int)sblock.s_isize + BITS-1) / BITS;

        if (n != (unsigned)n) {
                printf("Check fsize and isize: %ld, %u\n",
        if (n != (unsigned)n) {
                printf("Check fsize and isize: %ld, %u\n",

-                  sblock.s_fsize, sblock.s_isize);
+                  sblock.s_fsize, (int)sblock.s_isize);

        }
 #ifdef STANDALONE
        bmap = NULL;
        }
 #ifdef STANDALONE
        bmap = NULL;


@@ -193,7 +194,7 @@ char *file;
        printf("files %u (r=%u,d=%u,b=%u,c=%u)\n",
                i, nrfile, ndfile, nbfile, ncfile);
 #endif
        printf("files %u (r=%u,d=%u,b=%u,c=%u)\n",
                i, nrfile, ndfile, nbfile, ncfile);
 #endif

-       n = ndirect + nindir + niindir + niindir;
+       n = ndirect + nindir + niindir + niiindir;

 #ifdef STANDALONE
        printf("used %ld (i=%ld,ii=%ld,iii=%ld,d=%ld)\n",
                n, nindir, niindir, niiindir, ndirect);
 #ifdef STANDALONE
        printf("used %ld (i=%ld,ii=%ld,iii=%ld,d=%ld)\n",
                n, nindir, niindir, niiindir, ndirect);


@@ -205,7 +206,7 @@ char *file;
 #endif
        if(!dflg) {
                n = 0;
 #endif
        if(!dflg) {
                n = 0;

-               for(d=sblock.s_isize; d<sblock.s_fsize; d++)
+               for(d=(int)sblock.s_isize; d<sblock.s_fsize; d++)

                        if(!duped(d)) {
                                if(mflg)
                                        printf("%ld missing\n", d);
                        if(!duped(d)) {
                                if(mflg)
                                        printf("%ld missing\n", d);


@@ -298,7 +299,7 @@ char *s;
 {
        register n;
 
 {
        register n;
 

-       if (bno<sblock.s_isize || bno>=sblock.s_fsize) {
+       if (bno<(int)sblock.s_isize || bno>=sblock.s_fsize) {

                printf("%ld bad; inode=%u, class=%s\n", bno, ino, s);
                return(1);
        }
                printf("%ld bad; inode=%u, class=%s\n", bno, ino, s);
                return(1);
        }


@@ -320,7 +321,7 @@ daddr_t bno;
 
        if(dflg)
                return(0);
 
        if(dflg)
                return(0);

-       d = bno - sblock.s_isize;
+       d = bno - (int)sblock.s_isize;

        m = 1 << (d%BITS);
        n = (d/BITS);
        if(bmap[n] & m)
        m = 1 << (d%BITS);
        n = (d/BITS);
        if(bmap[n] & m)


@@ -463,7 +464,7 @@ makefree()
        for(; d > 0; d -= sblock.s_n)
        for(i=0; i<sblock.s_n; i++) {
                f = d - adr[i];
        for(; d > 0; d -= sblock.s_n)
        for(i=0; i<sblock.s_n; i++) {
                f = d - adr[i];

-               if(f < sblock.s_fsize && f >= sblock.s_isize)
+               if(f < sblock.s_fsize && f >= (int)sblock.s_isize)

                        if(!duped(f))
                                bfree(f);
        }
                        if(!duped(f))
                                bfree(f);
        }