From e965843f9d559698140db1ff5644e65f653a59a1 Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Mon, 25 Jan 1993 20:27:07 -0800 Subject: [PATCH] zero length directories are not an error (just deleted) SCCS-vsn: sbin/fsck/pass2.c 5.22 --- usr/src/sbin/fsck/pass2.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr/src/sbin/fsck/pass2.c b/usr/src/sbin/fsck/pass2.c index b198cc1d51..1ee9ff3c29 100644 --- a/usr/src/sbin/fsck/pass2.c +++ b/usr/src/sbin/fsck/pass2.c @@ -6,7 +6,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)pass2.c 5.21 (Berkeley) %G%"; +static char sccsid[] = "@(#)pass2.c 5.22 (Berkeley) %G%"; #endif /* not lint */ #include @@ -330,10 +330,14 @@ again: case FCLEAR: if (idesc->id_entryno <= 2) break; - if (statemap[dirp->d_ino] == DCLEAR) - errmsg = "ZERO LENGTH DIRECTORY"; - else + if (statemap[dirp->d_ino] == FCLEAR) errmsg = "DUP/BAD"; + else if (!preen) + errmsg = "ZERO LENGTH DIRECTORY"; + else { + n = 1; + break; + } fileerror(idesc->id_number, dirp->d_ino, errmsg); if ((n = reply("REMOVE")) == 1) break; -- 2.20.1