diff --git a/src/browser.c b/src/browser.c index 0ce02b7280600be4ff1a8aea1362f8121061d73d..3cb354ac936376de64088f8a4b51260c729d3fd9 100644 --- a/src/browser.c +++ b/src/browser.c @@ -176,6 +176,7 @@ void browse_draw_item(struct dir *n, int row, off_t max, int ispar) { n->flags & FF_ERR ? '!' : n->flags & FF_SERR ? '.' : n->flags & FF_OTHFS ? '>' : + n->flags & FF_HLNK ? 'H' : !(n->flags & FF_FILE || n->flags & FF_DIR) ? '@' : n->flags & FF_DIR diff --git a/src/calc.c b/src/calc.c index 6fb02cce3a0e735e2aeebb7b96c676a41d56be8f..f9c6064299a237ab6006381006259c5c3777a9be 100644 --- a/src/calc.c +++ b/src/calc.c @@ -143,9 +143,9 @@ int calc_item(struct dir *par, char *name) { for(i=0; i<linkst; i++) if(links[i].dev == fs.st_dev && links[i].ino == fs.st_ino) break; - /* found in the list, set size = 0 */ + /* found in the list, set link flag (so the size won't get counted) */ if(i != linkst) - fs.st_blocks = fs.st_size = 0; + d->flags |= FF_HLNK; /* not found, add to the list */ else { if(++linkst > linksl) { @@ -162,7 +162,7 @@ int calc_item(struct dir *par, char *name) { } /* count the size */ - if(!(d->flags & FF_EXL || d->flags & FF_OTHFS)) { + if(!(d->flags & FF_EXL || d->flags & FF_OTHFS || d->flags & FF_HLNK)) { d->size = fs.st_blocks * S_BLKSIZE; d->asize = fs.st_size; for(t=d->parent; t!=NULL; t=t->parent) { diff --git a/src/global.h b/src/global.h index ebf7fd7135b41bd45316333783298e26054aee47..dfa7ff6a3f15b0451f3fdff8de97184d8102eeb3 100644 --- a/src/global.h +++ b/src/global.h @@ -37,7 +37,8 @@ #define FF_OTHFS 0x08 /* excluded because it was an other filesystem */ #define FF_EXL 0x10 /* excluded using exlude patterns */ #define FF_SERR 0x20 /* error in subdirectory */ -#define FF_BSEL 0x40 /* selected */ +#define FF_HLNK 0x40 /* hard link (same file already encountered before) */ +#define FF_BSEL 0x80 /* selected */ /* Program states */ #define ST_CALC 0 diff --git a/src/help.c b/src/help.c index e51586f9051498e93164208a36b54675762f01b4..fdfa6d7595a6c147a1c42b234b6c9af317d497c7 100644 --- a/src/help.c +++ b/src/help.c @@ -95,14 +95,16 @@ void help_draw() { ncaddch( 7, 4, '<'); ncaddch( 8, 4, '>'); ncaddch( 9, 4, '@'); - ncaddch(10, 4, 'e'); + ncaddch(10, 4, 'H'); + ncaddch(11, 4, 'e'); attroff(A_BOLD); ncaddstr( 5, 7, "An error occured while reading this directory"); ncaddstr( 6, 7, "An error occured while reading a subdirectory"); ncaddstr( 7, 7, "File or directory is excluded from the statistics"); ncaddstr( 8, 7, "Directory was on an other filesystem"); ncaddstr( 9, 7, "This is not a file nor a dir (symlink, socket, ...)"); - ncaddstr(10, 7, "Empty directory"); + ncaddstr(10, 7, "Same file was already counted (hard link)"); + ncaddstr(11, 7, "Empty directory"); break; case 3: /* Indeed, too much spare time */