Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmds] Improve fsck output formatting for -lvv and -lvvv options #1668

Merged
merged 2 commits into from
Aug 26, 2023
Merged

[cmds] Improve fsck output formatting for -lvv and -lvvv options #1668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da0cab6
[cmds] Improve fsck output formatting for -lvv and -lvvv options
ghaerr Aug 26, 2023
cb3a322
Add 'fsck' and 'more' back onto 360k distribution
ghaerr Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions elkscmd/Applications
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ file_utils/md5sum :fileutil
file_utils/mkdir :fileutil :360k
file_utils/mknod :fileutil :360k
#file_utils/mkfifo :fileutil :1200k :1440k
file_utils/more :fileutil :720k :128k
file_utils/more :fileutil :360k :128k
file_utils/mv :fileutil :360k
file_utils/ln :fileutil :720k
file_utils/ls :fileutil :360k :128k
Expand Down Expand Up @@ -157,7 +157,7 @@ minix3/cal :be-minix3 :1200k :1440k
minix3/diff :be-minix3 :720k
minix3/find :be-minix3 :720k
minix3/mail :minix3 :other
disk_utils/fsck :diskutil :1200k :1440k
disk_utils/fsck :diskutil :360k :1200k :1440k
disk_utils/mkfs :diskutil :360k
disk_utils/mkfat :diskutil :360k
disk_utils/partype :diskutil :1200k :1440k
Expand Down
48 changes: 27 additions & 21 deletions elkscmd/disk_utils/fsck.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
* program name and version number when program
* is executed.
*
* Tue Sep 1 2020 - Greg Haerr fixed fsck to work on ELKS
* Tue Sep 1 2020 - Greg Haerr fixed fsck to work on ELKS
* Fri Aug 25 2023 - Greg Haerr improved formatting for -lvv and -lvvv output
*
* I've had no time to add comments - hopefully the function names
* are comments enough. As with all file system checkers, this assumes
Expand Down Expand Up @@ -238,11 +239,13 @@ void inode_dump(struct minix_inode * ptr)
{
int i;

printf(" size %ld %06o %d/%d links %d Z",
ptr->i_size, ptr->i_mode, ptr->i_uid, ptr->i_gid, ptr->i_nlinks);
for (i = 0; i < 9; i++)
printf("%d ", ptr->i_zone[i]);
printf("\n");
printf(" %5ld %d/%d Z", ptr->i_size, ptr->i_uid, ptr->i_gid);
for (i = 0; i < 9; i++) {
if (ptr->i_zone[i] || verbose > 2)
printf(S_ISBLK(ptr->i_mode) || S_ISCHR(ptr->i_mode)? " 0x%04x": " %u",
ptr->i_zone[i]);
else break;
}
}


Expand Down Expand Up @@ -295,13 +298,13 @@ struct minix_inode * map_inode(unsigned int nr)
* current file.
*/

void print_current_name(void)
int print_current_name(void)
{
int i=0;
int i, count = 0;

while (i < name_depth)
printf("/%.*s",14,name_list[i++]);
/* FIXME 14 can be integrated */
for(i = 0; i < name_depth;)
count += printf("/%.14s",name_list[i++]);
return count;
}

int ask(const char * string, int def)
Expand Down Expand Up @@ -731,7 +734,7 @@ void check_file(struct minix_inode * dir, unsigned long offset)
{
static char blk[BLOCK_SIZE];
struct minix_inode * inode;
int ino;
int ino, width;
char * name;
unsigned int block;

Expand Down Expand Up @@ -777,14 +780,15 @@ void check_file(struct minix_inode * dir, unsigned long offset)
if (name_depth < MAX_DEPTH)
strncpy(name_list[name_depth],name,NAMELEN);
name_depth++;
if (verbose > 1) {
print_current_name();
inode_dump(inode);
} else if (list) {
if (list) {
if (verbose)
printf("%6d %06o %3d ",ino,inode->i_mode,inode->i_nlinks);
print_current_name();
if (S_ISDIR(inode->i_mode))
printf("%5d %06o %2d ", ino, inode->i_mode, inode->i_nlinks);
width = print_current_name();
if (verbose > 1) {
while (width++ < 24) printf(" ");
inode_dump(inode);
}
if (S_ISDIR(inode->i_mode) && verbose < 2)
printf(":\n");
else
printf("\n");
Expand Down Expand Up @@ -891,8 +895,10 @@ void check(void)
fmemset(zone_count,0,ZONES*sizeof(*zone_count));
check_zones(ROOT_INO);
if (verbose > 1) {
printf("/");
inode_dump(map_inode(ROOT_INO));
struct minix_inode *ptr = map_inode(ROOT_INO);
printf("%5d %06o %2d /%23s", ROOT_INO, ptr->i_mode, ptr->i_nlinks, " ");
inode_dump(ptr);
printf("\n");
}
recursive_check(ROOT_INO);
check_counts();
Expand Down
8 changes: 7 additions & 1 deletion elkscmd/man/man8/fsck.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ Prompt user for repairs if inconsistencies are found
List the superblock of the filesystem
.TP 5
.B \-v
Turn on verbose mode
Display filesystem summary. When used with -l, displays inode number, mode and link count.
.TP 5
.B \-vv
When used with -l, displays inode size, uid/gid and nonzero Z map blocks.
.TP 5
.B \-vvv
When used with -l, displays inode size, uid/gid and all Z map blocks.
.TP 5
.B \-w
Warn about inodes that can't be cleared
Expand Down