projects
/
debian
/
cpmtools
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New upstream version 2.20
[debian/cpmtools]
/
fsck.cpm.c
diff --git
a/fsck.cpm.c
b/fsck.cpm.c
index c1458037fcb1b2660c621f68258e05861c48729e..585015b0cac3f91db0cc337b4bf42004dbd4d3e4 100644
(file)
--- a/
fsck.cpm.c
+++ b/
fsck.cpm.c
@@
-249,7
+249,7
@@
static int fsck(struct cpmInode *root, const char *image)
if (block>0)
{
++usedBlocks;
if (block>0)
{
++usedBlocks;
- if (block<min || block>max)
+ if (block<min || block>
=
max)
{
printf("Error: Bad block number (extent=%d, name=\"%s\", block=%d)\n",extent,prfile(sb,extent),block);
if (ask("Remove file"))
{
printf("Error: Bad block number (extent=%d, name=\"%s\", block=%d)\n",extent,prfile(sb,extent),block);
if (ask("Remove file"))
@@
-600,15
+600,19
@@
int main(int argc, char *argv[])
{
if ((err=Device_open(&sb.dev, image,O_RDONLY, devopts)))
{
{
if ((err=Device_open(&sb.dev, image,O_RDONLY, devopts)))
{
- fprintf(stderr,"%s: can
not open %s: %s\n",cmd,image,err);
+ fprintf(stderr,"%s: cannot open %s: %s\n",cmd,image,err);
exit(1);
}
else
{
exit(1);
}
else
{
- fprintf(stderr,"%s: can
not open %s for writing, no repair possible\n",cmd,image);
+ fprintf(stderr,"%s: cannot open %s for writing, no repair possible\n",cmd,image);
}
}
}
}
- cpmReadSuper(&sb,&root,format);
+ if (cpmReadSuper(&sb,&root,format)==-1)
+ {
+ fprintf(stderr,"%s: cannot read superblock (%s)\n",cmd,boo);
+ exit(1);
+ }
ret=fsck(&root,image);
if (ret&MODIFIED)
{
ret=fsck(&root,image);
if (ret&MODIFIED)
{