* added program_version variable and output of
* program name and version number when program
* is executed.
- *
+ *
+ * 30.10.94 - added support for v2 filesystem
+ * (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
+ *
* 10.12.94 - added test to prevent checking of mounted fs adapted
* from Theodore Ts'o's (tytso@athena.mit.edu) e2fsck
* program. (Daniel Quinlan, quinlan@yggdrasil.com)
*
+ * 01.07.96 - Fixed the v2 fs stuff to use the right #defines and such
+ * for modern libcs (janl@math.uio.no, Nicolai Langfeldt)
+ *
+ * 02.07.96 - Added C bit fiddling routines from rmk@ecs.soton.ac.uk
+ * (Russell King). He made them for ARM. It would seem
+ * that the ARM is powerfull enough to do this in C whereas
+ * i386 and m64k must use assembly to get it fast >:-)
+ * This should make minix fsck systemindependent.
+ * (janl@math.uio.no, Nicolai Langfeldt)
+ *
+ * 04.11.96 - Added minor fixes from Andreas Schwab to avoid compiler
+ * warnings. Added mc68k bitops from
+ * Joerg Dorchain <dorchain@mpi-sb.mpg.de>.
+ *
+ * 06.11.96 - Added v2 code submitted by Joerg Dorchain, but written by
+ * Andreas Schwab.
+ *
* I've had no time to add comments - hopefully the function names
* are comments enough. As with all file system checkers, this assumes
* the file system is quiescent - don't use it on a mounted device
*/
#include <stdio.h>
+#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <linux/fs.h>
#include <linux/minix_fs.h>
+#include "../version.h"
-#ifndef __GNUC__
-#error "needs gcc for the bitop-__asm__'s"
+#ifdef MINIX2_SUPER_MAGIC2
+#define HAVE_MINIX2 1
#endif
#ifndef __linux__
#define UPPER(size,n) ((size+((n)-1))/(n))
#define INODE_SIZE (sizeof(struct minix_inode))
-#define INODE_BLOCKS UPPER(INODES,MINIX_INODES_PER_BLOCK)
+#ifdef HAVE_MINIX2
+#define INODE_SIZE2 (sizeof(struct minix2_inode))
+#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
+ : MINIX_INODES_PER_BLOCK))
+#else
+#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
+#endif
#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
#define BITS_PER_BLOCK (BLOCK_SIZE<<3)
static char * program_name = "fsck.minix";
-static char * program_version = "1.0 - 12/30/93";
+static char * program_version = "1.2 - 11/11/96";
static char * device_name = NULL;
static int IN;
static int repair=0, automatic=0, verbose=0, list=0, show=0, warn_mode=0,
static int errors_uncorrected = 0; /* flag if some error was not corrected */
static int dirsize = 16;
static int namelen = 14;
+static int version2 = 0;
+static struct termios termios;
+static int termios_set = 0;
/* File-name data */
#define MAX_DEPTH 50
static char * inode_buffer = NULL;
#define Inode (((struct minix_inode *) inode_buffer)-1)
+#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
static char super_block_buffer[BLOCK_SIZE];
#define Super (*(struct minix_super_block *)super_block_buffer)
#define INODES ((unsigned long)Super.s_ninodes)
-#define ZONES ((unsigned long)Super.s_nzones)
+#ifdef HAVE_MINIX2
+#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
+#else
+#define ZONES ((unsigned long)(Super.s_nzones))
+#endif
#define IMAPS ((unsigned long)Super.s_imap_blocks)
#define ZMAPS ((unsigned long)Super.s_zmap_blocks)
#define FIRSTZONE ((unsigned long)Super.s_firstdatazone)
static unsigned char * zone_count = NULL;
void recursive_check(unsigned int ino);
+void recursive_check2(unsigned int ino);
-#define bitop(name,op) \
-static inline int name(char * addr,unsigned int nr) \
-{ \
-int __res; \
-__asm__ __volatile__("bt" op "l %1,%2; adcl $0,%0" \
-:"=g" (__res) \
-:"r" (nr),"m" (*(addr)),"0" (0)); \
-return __res; \
-}
-
-bitop(bit,"")
-bitop(setbit,"s")
-bitop(clrbit,"r")
+#include "bitops.h"
#define inode_in_use(x) (bit(inode_map,(x)))
#define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1))
#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1)
#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1)
-/*
- * Volatile to let gcc know that this doesn't return. When trying
- * to compile this under minix, volatile gives a warning, as
- * exit() isn't defined as volatile under minix.
- */
-volatile void fatal_error(const char * fmt_string, int status)
+void fatal_error(const char *, int) __attribute__ ((noreturn));
+void fatal_error(const char * fmt_string, int status)
{
fprintf(stderr,fmt_string,program_name,device_name);
+ if (termios_set)
+ tcsetattr(0, TCSANOW, &termios);
exit(status);
}
while (i<name_depth)
printf("/%.*s",namelen,name_list[i++]);
+ if (i == 0)
+ printf ("/");
}
int ask(const char * string,int def)
return 0;
}
+
+int check_zone_nr2 (unsigned int *nr, int *corrected)
+{
+ if (!*nr)
+ return 0;
+ if (*nr < FIRSTZONE)
+ printf ("Zone nr < FIRSTZONE in file `");
+ else if (*nr >= ZONES)
+ printf ("Zone nr >= ZONES in file `");
+ else
+ return *nr;
+ print_current_name ();
+ printf ("'.");
+ if (ask ("Remove block", 1)) {
+ *nr = 0;
+ *corrected = 1;
+ }
+ return 0;
+}
+
/*
* read-block reads block nr into the buffer at addr.
*/
return result;
}
+#ifdef HAVE_MINIX2
+int map_block2 (struct minix2_inode *inode, unsigned int blknr)
+{
+ unsigned int ind[BLOCK_SIZE >> 2];
+ unsigned int dind[BLOCK_SIZE >> 2];
+ unsigned int tind[BLOCK_SIZE >> 2];
+ int blk_chg, block, result;
+
+ if (blknr < 7)
+ return check_zone_nr2 (inode->i_zone + blknr, &changed);
+ blknr -= 7;
+ if (blknr < 256) {
+ block = check_zone_nr2 (inode->i_zone + 7, &changed);
+ read_block (block, (char *) ind);
+ blk_chg = 0;
+ result = check_zone_nr2 (blknr + ind, &blk_chg);
+ if (blk_chg)
+ write_block (block, (char *) ind);
+ return result;
+ }
+ blknr -= 256;
+ if (blknr >= 256 * 256) {
+ block = check_zone_nr2 (inode->i_zone + 8, &changed);
+ read_block (block, (char *) dind);
+ blk_chg = 0;
+ result = check_zone_nr2 (dind + blknr / 256, &blk_chg);
+ if (blk_chg)
+ write_block (block, (char *) dind);
+ block = result;
+ read_block (block, (char *) ind);
+ blk_chg = 0;
+ result = check_zone_nr2 (ind + blknr % 256, &blk_chg);
+ if (blk_chg)
+ write_block (block, (char *) ind);
+ return result;
+ }
+ blknr -= 256 * 256;
+ block = check_zone_nr2 (inode->i_zone + 9, &changed);
+ read_block (block, (char *) tind);
+ blk_chg = 0;
+ result = check_zone_nr2 (tind + blknr / (256 * 256), &blk_chg);
+ if (blk_chg)
+ write_block (block, (char *) tind);
+ block = result;
+ read_block (block, (char *) dind);
+ blk_chg = 0;
+ result = check_zone_nr2 (dind + (blknr / 256) % 256, &blk_chg);
+ if (blk_chg)
+ write_block (block, (char *) dind);
+ block = result;
+ read_block (block, (char *) ind);
+ blk_chg = 0;
+ result = check_zone_nr2 (ind + blknr % 256, &blk_chg);
+ if (blk_chg)
+ write_block (block, (char *) ind);
+ return result;
+}
+#endif
+
void write_super_block(void)
{
/*
die("Unable to write inodes");
}
-void read_tables(void)
+void get_dirsize (void)
+{
+ int block;
+ char blk[BLOCK_SIZE];
+ int size;
+
+#if HAVE_MINIX2
+ if (version2)
+ block = Inode2[ROOT_INO].i_zone[0];
+ else
+#endif
+ block = Inode[ROOT_INO].i_zone[0];
+ read_block (block, blk);
+ for (size = 16; size < BLOCK_SIZE; size <<= 1) {
+ if (strcmp (blk + size + 2, "..") == 0) {
+ dirsize = size;
+ namelen = size - 2;
+ return;
+ }
+ }
+ /* use defaults */
+}
+
+void read_superblock(void)
{
- memset(inode_map,0,sizeof(inode_map));
- memset(zone_map,0,sizeof(zone_map));
if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET))
die("seek failed");
if (BLOCK_SIZE != read(IN, super_block_buffer, BLOCK_SIZE))
if (MAGIC == MINIX_SUPER_MAGIC) {
namelen = 14;
dirsize = 16;
+ version2 = 0;
} else if (MAGIC == MINIX_SUPER_MAGIC2) {
namelen = 30;
dirsize = 32;
+ version2 = 0;
+#ifdef HAVE_MINIX2
+ } else if (MAGIC == MINIX2_SUPER_MAGIC) {
+ namelen = 14;
+ dirsize = 16;
+ version2 = 1;
+ } else if (MAGIC == MINIX2_SUPER_MAGIC2) {
+ namelen = 30;
+ dirsize = 32;
+ version2 = 1;
+#endif
} else
die("bad magic number in super-block");
if (ZONESIZE != 0 || BLOCK_SIZE != 1024)
die("bad s_imap_blocks field in super-block");
if (!ZMAPS || ZMAPS > MINIX_Z_MAP_SLOTS)
die("bad s_zmap_blocks field in super-block");
+}
+
+void read_tables(void)
+{
+ memset(inode_map,0,sizeof(inode_map));
+ memset(zone_map,0,sizeof(zone_map));
inode_buffer = malloc(INODE_BUFFER_SIZE);
if (!inode_buffer)
die("Unable to allocate buffer for inodes");
printf("Warning: Firstzone != Norm_firstzone\n");
errors_uncorrected = 1;
}
+ get_dirsize ();
if (show) {
- printf("%d inodes\n",INODES);
- printf("%d blocks\n",ZONES);
- printf("Firstdatazone=%d (%d)\n",FIRSTZONE,NORM_FIRSTZONE);
+ printf("%ld inodes\n",INODES);
+ printf("%ld blocks\n",ZONES);
+ printf("Firstdatazone=%ld (%ld)\n",FIRSTZONE,NORM_FIRSTZONE);
printf("Zonesize=%d\n",BLOCK_SIZE<<ZONESIZE);
- printf("Maxsize=%d\n",MAXSIZE);
+ printf("Maxsize=%ld\n",MAXSIZE);
printf("Filesystem state=%d\n", Super.s_state);
printf("namelen=%d\n\n",namelen);
}
return inode;
}
+#ifdef HAVE_MINIX2
+struct minix2_inode *
+get_inode2 (unsigned int nr)
+{
+ struct minix2_inode *inode;
+
+ if (!nr || nr >= INODES)
+ return NULL;
+ total++;
+ inode = Inode2 + nr;
+ if (!inode_count[nr]) {
+ if (!inode_in_use (nr)) {
+ printf ("Inode %d marked not used, but used for file '", nr);
+ print_current_name ();
+ printf ("'\n");
+ if (repair) {
+ if (ask ("Mark in use", 1))
+ mark_inode (nr);
+ else
+ errors_uncorrected = 1;
+ }
+ }
+ if (S_ISDIR (inode->i_mode))
+ directory++;
+ else if (S_ISREG (inode->i_mode))
+ regular++;
+ else if (S_ISCHR (inode->i_mode))
+ chardev++;
+ else if (S_ISBLK (inode->i_mode))
+ blockdev++;
+ else if (S_ISLNK (inode->i_mode))
+ symlinks++;
+ else if (S_ISSOCK (inode->i_mode));
+ else if (S_ISFIFO (inode->i_mode));
+ else {
+ print_current_name ();
+ printf (" has mode %05o\n", inode->i_mode);
+ }
+ } else
+ links++;
+ if (!++inode_count[nr]) {
+ printf ("Warning: inode count too big.\n");
+ inode_count[nr]--;
+ errors_uncorrected = 1;
+ }
+ return inode;
+}
+#endif
+
void check_root(void)
{
struct minix_inode * inode = Inode + ROOT_INO;
die("root inode isn't a directory");
}
+#ifdef HAVE_MINIX2
+void check_root2 (void)
+{
+ struct minix2_inode *inode = Inode2 + ROOT_INO;
+
+ if (!inode || !S_ISDIR (inode->i_mode))
+ die ("root inode isn't a directory");
+}
+#endif
+
static int add_zone(unsigned short * znr, int * corrected)
{
int result;
return block;
}
+
+static int add_zone2 (unsigned int *znr, int *corrected)
+{
+ int result;
+ int block;
+
+ result = 0;
+ block = check_zone_nr2 (znr, corrected);
+ if (!block)
+ return 0;
+ if (zone_count[block]) {
+ printf ("Block has been used before. Now in file `");
+ print_current_name ();
+ printf ("'.");
+ if (ask ("Clear", 1)) {
+ *znr = 0;
+ block = 0;
+ *corrected = 1;
+ }
+ }
+ if (!block)
+ return 0;
+ if (!zone_in_use (block)) {
+ printf ("Block %d in file `", block);
+ print_current_name ();
+ printf ("' is marked not in use.");
+ if (ask ("Correct", 1))
+ mark_zone (block);
+ }
+ if (!++zone_count[block])
+ zone_count[block]--;
+ return block;
+}
+
static void add_zone_ind(unsigned short * znr, int * corrected)
{
static char blk[BLOCK_SIZE];
write_block(block, blk);
}
+static void add_zone_ind2 (unsigned int *znr, int *corrected)
+{
+ static char blk[BLOCK_SIZE];
+ int i, chg_blk = 0;
+ int block;
+
+ block = add_zone2 (znr, corrected);
+ if (!block)
+ return;
+ read_block (block, blk);
+ for (i = 0; i < BLOCK_SIZE >> 2; i++)
+ add_zone2 (i + (unsigned int *) blk, &chg_blk);
+ if (chg_blk)
+ write_block (block, blk);
+}
+
static void add_zone_dind(unsigned short * znr, int * corrected)
{
static char blk[BLOCK_SIZE];
write_block(block, blk);
}
+static void
+add_zone_dind2 (unsigned int *znr, int *corrected)
+{
+ static char blk[BLOCK_SIZE];
+ int i, blk_chg = 0;
+ int block;
+
+ block = add_zone2 (znr, corrected);
+ if (!block)
+ return;
+ read_block (block, blk);
+ for (i = 0; i < BLOCK_SIZE >> 2; i++)
+ add_zone_ind2 (i + (unsigned int *) blk, &blk_chg);
+ if (blk_chg)
+ write_block (block, blk);
+}
+
+static void
+add_zone_tind2 (unsigned int *znr, int *corrected)
+{
+ static char blk[BLOCK_SIZE];
+ int i, blk_chg = 0;
+ int block;
+
+ block = add_zone2 (znr, corrected);
+ if (!block)
+ return;
+ read_block (block, blk);
+ for (i = 0; i < BLOCK_SIZE >> 2; i++)
+ add_zone_dind2 (i + (unsigned int *) blk, &blk_chg);
+ if (blk_chg)
+ write_block (block, blk);
+}
+
void check_zones(unsigned int i)
{
struct minix_inode * inode;
add_zone_dind(8 + inode->i_zone, &changed);
}
+#ifdef HAVE_MINIX2
+void
+check_zones2 (unsigned int i)
+{
+ struct minix2_inode *inode;
+
+ if (!i || i >= INODES)
+ return;
+ if (inode_count[i] > 1) /* have we counted this file already? */
+ return;
+ inode = Inode2 + i;
+ if (!S_ISDIR (inode->i_mode) && !S_ISREG (inode->i_mode)
+ && !S_ISLNK (inode->i_mode))
+ return;
+ for (i = 0; i < 7; i++)
+ add_zone2 (i + inode->i_zone, &changed);
+ add_zone_ind2 (7 + inode->i_zone, &changed);
+ add_zone_dind2 (8 + inode->i_zone, &changed);
+ add_zone_tind2 (9 + inode->i_zone, &changed);
+}
+#endif
+
void check_file(struct minix_inode * dir, unsigned int offset)
{
static char blk[BLOCK_SIZE];
}
ino = 0;
}
+ if (name_depth < MAX_DEPTH)
+ strncpy (name_list[name_depth], name, namelen);
+ name_depth++;
inode = get_inode(ino);
+ name_depth--;
if (!offset)
if (!inode || strcmp(".",name)) {
print_current_name();
return;
}
+#ifdef HAVE_MINIX2
+void
+check_file2 (struct minix2_inode *dir, unsigned int offset)
+{
+ static char blk[BLOCK_SIZE];
+ struct minix2_inode *inode;
+ int ino;
+ char *name;
+ int block;
+
+ block = map_block2 (dir, offset / BLOCK_SIZE);
+ read_block (block, blk);
+ name = blk + (offset % BLOCK_SIZE) + 2;
+ ino = *(unsigned short *) (name - 2);
+ if (ino >= INODES) {
+ print_current_name ();
+ printf (" contains a bad inode number for file '");
+ printf ("%.*s'.", namelen, name);
+ if (ask (" Remove", 1)) {
+ *(unsigned short *) (name - 2) = 0;
+ write_block (block, blk);
+ }
+ ino = 0;
+ }
+ if (name_depth < MAX_DEPTH)
+ strncpy (name_list[name_depth], name, namelen);
+ name_depth++;
+ inode = get_inode2 (ino);
+ name_depth--;
+ if (!offset) {
+ if (!inode || strcmp (".", name)) {
+ print_current_name ();
+ printf (": bad directory: '.' isn't first\n");
+ errors_uncorrected = 1;
+ } else
+ return;
+ }
+ if (offset == dirsize) {
+ if (!inode || strcmp ("..", name)) {
+ print_current_name ();
+ printf (": bad directory: '..' isn't second\n");
+ errors_uncorrected = 1;
+ } else
+ return;
+ }
+ if (!inode)
+ return;
+ name_depth++;
+ if (list) {
+ if (verbose)
+ printf ("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks);
+ print_current_name ();
+ if (S_ISDIR (inode->i_mode))
+ printf (":\n");
+ else
+ printf ("\n");
+ }
+ check_zones2 (ino);
+ if (inode && S_ISDIR (inode->i_mode))
+ recursive_check2 (ino);
+ name_depth--;
+ return;
+}
+#endif
+
void recursive_check(unsigned int ino)
{
struct minix_inode * dir;
dir = Inode + ino;
if (!S_ISDIR(dir->i_mode))
die("internal error");
- if (dir->i_size < 32) {
+ if (dir->i_size < 2 * dirsize) {
print_current_name();
printf(": bad directory: size<32");
errors_uncorrected = 1;
check_file(dir,offset);
}
+#ifdef HAVE_MINIX2
+void
+recursive_check2 (unsigned int ino)
+{
+ struct minix2_inode *dir;
+ unsigned int offset;
+
+ dir = Inode2 + ino;
+ if (!S_ISDIR (dir->i_mode))
+ die ("internal error");
+ if (dir->i_size < 2 * dirsize) {
+ print_current_name ();
+ printf (": bad directory: size < 32");
+ errors_uncorrected = 1;
+ }
+ for (offset = 0; offset < dir->i_size; offset += dirsize)
+ check_file2 (dir, offset);
+}
+#endif
+
int bad_zone(int i)
{
char buffer[1024];
}
}
+#ifdef HAVE_MINIX2
+void
+check_counts2 (void)
+{
+ int i;
+
+ for (i = 1; i < INODES; i++) {
+ if (!inode_in_use (i) && Inode2[i].i_mode && warn_mode) {
+ printf ("Inode %d mode not cleared.", i);
+ if (ask ("Clear", 1)) {
+ Inode2[i].i_mode = 0;
+ changed = 1;
+ }
+ }
+ if (!inode_count[i]) {
+ if (!inode_in_use (i))
+ continue;
+ printf ("Inode %d not used, marked used in the bitmap.", i);
+ if (ask ("Clear", 1))
+ unmark_inode (i);
+ continue;
+ }
+ if (!inode_in_use (i)) {
+ printf ("Inode %d used, marked unused in the bitmap.", i);
+ if (ask ("Set", 1))
+ mark_inode (i);
+ }
+ if (Inode2[i].i_nlinks != inode_count[i]) {
+ printf ("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.",
+ i, Inode2[i].i_mode, Inode2[i].i_nlinks, inode_count[i]);
+ if (ask ("Set i_nlinks to count", 1)) {
+ Inode2[i].i_nlinks = inode_count[i];
+ changed = 1;
+ }
+ }
+ }
+ for (i = FIRSTZONE; i < ZONES; i++) {
+ if (zone_in_use (i) == zone_count[i])
+ continue;
+ if (!zone_count[i]) {
+ if (bad_zone (i))
+ continue;
+ printf ("Zone %d: marked in use, no file uses it.", i);
+ if (ask ("Unmark", 1))
+ unmark_zone (i);
+ continue;
+ }
+ printf ("Zone %d: %sin use, counted=%d\n",
+ i, zone_in_use (i) ? "" : "not ", zone_count[i]);
+ }
+}
+#endif
+
void check(void)
{
memset(inode_count,0,INODES*sizeof(*inode_count));
check_counts();
}
+#ifdef HAVE_MINIX2
+void
+check2 (void)
+{
+ memset (inode_count, 0, INODES * sizeof (*inode_count));
+ memset (zone_count, 0, ZONES * sizeof (*zone_count));
+ check_zones2 (ROOT_INO);
+ recursive_check2 (ROOT_INO);
+ check_counts2 ();
+}
+#endif
+
int main(int argc, char ** argv)
{
- struct termios termios,tmp;
+ struct termios tmp;
int count;
int retcode = 0;
program_name = *argv;
if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
die("bad inode size");
+#ifdef HAVE_MINIX2
+ if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
+ die("bad v2 inode size");
+#endif
while (argc-- > 1) {
argv++;
if (argv[0][0] != '-')
if (repair && !automatic) {
if (!isatty(0) || !isatty(1))
die("need terminal for interactive repairs");
- tcgetattr(0,&termios);
- tmp = termios;
- tmp.c_lflag &= ~(ICANON|ECHO);
- tcsetattr(0,TCSANOW,&tmp);
}
IN = open(device_name,repair?O_RDWR:O_RDONLY);
if (IN < 0)
die("unable to open '%s'");
for (count=0 ; count<3 ; count++)
sync();
- read_tables();
+ read_superblock();
/*
* Determine whether or not we should continue with the checking.
* flags and whether or not the -f switch was specified on the
* command line.
*/
- printf("%s, %s\n", program_name, program_version);
+ printf("%s, %s / %s\n", program_name, program_version,
+ util_linux_version);
if ( !(Super.s_state & MINIX_ERROR_FS) &&
(Super.s_state & MINIX_VALID_FS) &&
!force ) {
if (repair)
printf("%s is clean, no check.\n", device_name);
- if (repair && !automatic)
- tcsetattr(0,TCSANOW,&termios);
return retcode;
}
else if (force)
printf("Filesystem on %s is dirty, needs checking.\n",\
device_name);
- check_root();
- check();
+ read_tables();
+
+ if (repair && !automatic) {
+ tcgetattr(0,&termios);
+ tmp = termios;
+ tmp.c_lflag &= ~(ICANON|ECHO);
+ tcsetattr(0,TCSANOW,&tmp);
+ termios_set = 1;
+ }
+
+#if HAVE_MINIX2
+ if (version2) {
+ check_root2 ();
+ check2 ();
+ } else
+#endif
+ {
+ check_root();
+ check();
+ }
if (verbose) {
int i, free;
for (i=1,free=0 ; i < INODES ; i++)
if (!inode_in_use(i))
free++;
- printf("\n%6d inodes used (%d%%)\n",(INODES-free-1),
+ printf("\n%6ld inodes used (%ld%%)\n",(INODES-free-1),
100*(INODES-free-1)/(INODES-1));
for (i=FIRSTZONE,free=0 ; i < ZONES ; i++)
if (!zone_in_use(i))
free++;
- printf("%6d zones used (%d%%)\n",(ZONES-free),
+ printf("%6ld zones used (%ld%%)\n",(ZONES-free),
100*(ZONES-free)/ZONES);
printf("\n%6d regular files\n"
"%6d directories\n"
projects / thirdparty / util-linux.git / blobdiff