dossrv: cleanup

diff --git a/sys/src/cmd/dossrv/dossubs.c b/sys/src/cmd/dossrv/dossubs.c
index 6347eabb99a382ef4bdbf7e7069a4e6cf0052d8c..82fd046a7333f9d049965962de402276e537b833 100644 (file)
--- a/sys/src/cmd/dossrv/dossubs.c
+++ b/sys/src/cmd/dossrv/dossubs.c
@@ -144,7 +144,8 @@ dosfs(Xfs *xf)
                                        bp->fatinfo = fisec;
                                        bp->freeptr = GLONG(fi->nextfree);
                                        bp->freeclusters = GLONG(fi->freeclust);
-                                       chat("fat info: %ld free clusters, next free %ld\n", bp->freeclusters, bp->freeptr);
+                                       chat("fat info: %ld free clusters, next free %ld\n",
+                                               bp->freeclusters, bp->freeptr);
                                }
                                putsect(p1);
                        }
@@ -154,12 +155,10 @@ dosfs(Xfs *xf)
                        bootdump(2, b);
                bp->rootaddr = bp->fataddr + bp->nfats*bp->fatsize;
                bp->rootstart = 0;
-               i = bp->rootsize*DOSDIRSIZE + bp->sectsize-1;
-               i /= bp->sectsize;
-               bp->dataaddr = bp->rootaddr + i;
+               bp->dataaddr = bp->rootaddr + (bp->rootsize*DOSDIRSIZE + bp->sectsize-1)/bp->sectsize;
                bp->freeptr = FATRESRV;
        }
-       bp->fatclusters = FATRESRV+(bp->volsize - bp->dataaddr)/bp->clustsize;
+       bp->fatclusters = FATRESRV + (bp->volsize - bp->dataaddr)/bp->clustsize;
 
        if(xf->isfat32)
                bp->fatbits = 32;
@@ -205,7 +204,7 @@ getfile(Xfile *f)
        Iosect *p;
 
        dp = f->ptr;
-       if(dp->p)
+       if(dp->p != nil)
                panic("getfile");
        p = getsect(f->xf, dp->addr);
        if(p == nil)
@@ -234,7 +233,7 @@ putfile(Xfile *f)
        Dosptr *dp;
 
        dp = f->ptr;
-       if(!dp->p)
+       if(dp->p == nil)
                panic("putfile");
        putsect(dp->p);
        dp->p = nil;
@@ -898,8 +897,7 @@ walkup(Xfile *f, Dosptr *ndp)
                                        goto error;
                                }
                        }
-                       k = clust2sect(bp, ppclust) + 
-                               so%bp->clustsize;
+                       k = clust2sect(bp, ppclust) + so%bp->clustsize;
                }else{
                        if(so*bp->sectsize >= bp->rootsize*DOSDIRSIZE)
                                goto error;
@@ -919,7 +917,7 @@ out:
        return 0;
 
 error:
-       if(p)
+       if(p != nil)
                putsect(p);
        return -1;
 }

diff --git a/sys/src/cmd/dossrv/iotrack.c b/sys/src/cmd/dossrv/iotrack.c
index a6d522e3caf1183c111be360d997d53262ef35c0..071ff173b303960896d29c10885dcd70208f9bcc 100644 (file)
--- a/sys/src/cmd/dossrv/iotrack.c
+++ b/sys/src/cmd/dossrv/iotrack.c
@@ -39,13 +39,15 @@ getiosect(Xfs *xf, vlong addr, int rflag)
        int toff;
        Iosect *p;
 
+       if(addr < 0)
+               return nil;
        toff = addr % Sect2trk;
        taddr = addr - toff;
        t = getiotrack(xf, taddr);
        if(rflag && (t->flags&BSTALE)){
                if(tread(t) < 0){
                        unmlock(&t->lock);
-                       return 0;
+                       return nil;
                }
                t->flags &= ~BSTALE;
        }