Index: head/sbin/fsdb/Makefile =================================================================== --- head/sbin/fsdb/Makefile (revision 332266) +++ head/sbin/fsdb/Makefile (revision 332267) @@ -1,16 +1,17 @@ # $NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ PACKAGE=runtime PROG= fsdb MAN= fsdb.8 SRCS= fsdb.c fsdbutil.c \ dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ - pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c + pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c prtblknos.c CFLAGS+= -I${.CURDIR:H}/fsck_ffs WARNS?= 2 LIBADD= edit ufs -.PATH: ${.CURDIR:H}/fsck_ffs ${SRCTOP}/sys/ufs/ffs +.PATH: ${.CURDIR:H}/fsck_ffs ${SRCTOP}/sys/ufs/ffs \ + ${SRCTOP}/tools/diag/prtblknos .include Index: head/sbin/fsdb/fsdbutil.c =================================================================== --- head/sbin/fsdb/fsdbutil.c (revision 332266) +++ head/sbin/fsdb/fsdbutil.c (revision 332267) @@ -1,376 +1,253 @@ /* $NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $ */ /*- * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1995 John T. Kohl * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ #include #include #include #include #include #include #include #include #include #include #include #include #include "fsdb.h" #include "fsck.h" -static int charsperline(void); -static void printindir(ufs2_daddr_t blk, int level, char *bufp); -static void printblocks(ino_t inum, union dinode *dp); +void prtblknos(struct uufsd *disk, union dinode *dp); char ** crack(char *line, int *argc) { static char *argv[8]; int i; char *p, *val; for (p = line, i = 0; p != NULL && i < 8; i++) { while ((val = strsep(&p, " \t\n")) != NULL && *val == '\0') /**/; if (val) argv[i] = val; else break; } *argc = i; return argv; } char ** recrack(char *line, int *argc, int argc_max) { static char *argv[8]; int i; char *p, *val; for (p = line, i = 0; p != NULL && i < 8 && i < argc_max - 1; i++) { while ((val = strsep(&p, " \t\n")) != NULL && *val == '\0') /**/; if (val) argv[i] = val; else break; } argv[i] = argv[i - 1] + strlen(argv[i - 1]) + 1; argv[i][strcspn(argv[i], "\n")] = '\0'; *argc = i + 1; return argv; } int argcount(struct cmdtable *cmdp, int argc, char *argv[]) { if (cmdp->minargc == cmdp->maxargc) warnx("command `%s' takes %u arguments, got %u", cmdp->cmd, cmdp->minargc-1, argc-1); else warnx("command `%s' takes from %u to %u arguments", cmdp->cmd, cmdp->minargc-1, cmdp->maxargc-1); warnx("usage: %s: %s", cmdp->cmd, cmdp->helptxt); return 1; } void printstat(const char *cp, ino_t inum, union dinode *dp) { struct group *grp; struct passwd *pw; ufs2_daddr_t blocks; int64_t gen; char *p; time_t t; printf("%s: ", cp); switch (DIP(dp, di_mode) & IFMT) { case IFDIR: puts("directory"); break; case IFREG: puts("regular file"); break; case IFBLK: printf("block special (%#jx)", (uintmax_t)DIP(dp, di_rdev)); break; case IFCHR: printf("character special (%#jx)", DIP(dp, di_rdev)); break; case IFLNK: fputs("symlink",stdout); if (DIP(dp, di_size) > 0 && DIP(dp, di_size) < sblock.fs_maxsymlinklen && DIP(dp, di_blocks) == 0) { if (sblock.fs_magic == FS_UFS1_MAGIC) p = (caddr_t)dp->dp1.di_db; else p = (caddr_t)dp->dp2.di_db; printf(" to `%.*s'\n", (int) DIP(dp, di_size), p); } else { putchar('\n'); } break; case IFSOCK: puts("socket"); break; case IFIFO: puts("fifo"); break; } printf("I=%ju MODE=%o SIZE=%ju", (uintmax_t)inum, DIP(dp, di_mode), (uintmax_t)DIP(dp, di_size)); if (sblock.fs_magic != FS_UFS1_MAGIC) { t = _time64_to_time(dp->dp2.di_birthtime); p = ctime(&t); printf("\n\tBTIME=%15.15s %4.4s [%d nsec]", &p[4], &p[20], dp->dp2.di_birthnsec); } if (sblock.fs_magic == FS_UFS1_MAGIC) t = _time32_to_time(dp->dp1.di_mtime); else t = _time64_to_time(dp->dp2.di_mtime); p = ctime(&t); printf("\n\tMTIME=%15.15s %4.4s [%d nsec]", &p[4], &p[20], DIP(dp, di_mtimensec)); if (sblock.fs_magic == FS_UFS1_MAGIC) t = _time32_to_time(dp->dp1.di_ctime); else t = _time64_to_time(dp->dp2.di_ctime); p = ctime(&t); printf("\n\tCTIME=%15.15s %4.4s [%d nsec]", &p[4], &p[20], DIP(dp, di_ctimensec)); if (sblock.fs_magic == FS_UFS1_MAGIC) t = _time32_to_time(dp->dp1.di_atime); else t = _time64_to_time(dp->dp2.di_atime); p = ctime(&t); printf("\n\tATIME=%15.15s %4.4s [%d nsec]\n", &p[4], &p[20], DIP(dp, di_atimensec)); if ((pw = getpwuid(DIP(dp, di_uid)))) printf("OWNER=%s ", pw->pw_name); else printf("OWNUID=%u ", DIP(dp, di_uid)); if ((grp = getgrgid(DIP(dp, di_gid)))) printf("GRP=%s ", grp->gr_name); else printf("GID=%u ", DIP(dp, di_gid)); blocks = DIP(dp, di_blocks); gen = DIP(dp, di_gen); printf("LINKCNT=%d FLAGS=%#x BLKCNT=%jx GEN=%jx\n", DIP(dp, di_nlink), DIP(dp, di_flags), (intmax_t)blocks, (intmax_t)gen); } -/* - * Determine the number of characters in a - * single line. - */ - -static int -charsperline(void) -{ - int columns; - char *cp; - struct winsize ws; - - columns = 0; - if (ioctl(0, TIOCGWINSZ, &ws) != -1) - columns = ws.ws_col; - if (columns == 0 && (cp = getenv("COLUMNS"))) - columns = atoi(cp); - if (columns == 0) - columns = 80; /* last resort */ - return (columns); -} - - -/* - * Recursively print a list of indirect blocks. - */ -static void -printindir(ufs2_daddr_t blk, int level, char *bufp) -{ - struct bufarea buf, *bp; - char tempbuf[32]; /* enough to print an ufs2_daddr_t */ - int i, j, cpl, charssofar; - ufs2_daddr_t blkno; - - if (blk == 0) - return; - printf("%jd (%d) =>\n", (intmax_t)blk, level); - if (level == 0) { - /* for the final indirect level, don't use the cache */ - bp = &buf; - bp->b_un.b_buf = bufp; - initbarea(bp, BT_UNKNOWN); - - getblk(bp, blk, sblock.fs_bsize); - } else - bp = getdatablk(blk, sblock.fs_bsize, BT_UNKNOWN); - - cpl = charsperline(); - for (i = charssofar = 0; i < NINDIR(&sblock); i++) { - if (sblock.fs_magic == FS_UFS1_MAGIC) - blkno = bp->b_un.b_indir1[i]; - else - blkno = bp->b_un.b_indir2[i]; - if (blkno == 0) - continue; - j = sprintf(tempbuf, "%jd", (intmax_t)blkno); - if (level == 0) { - charssofar += j; - if (charssofar >= cpl - 2) { - putchar('\n'); - charssofar = j; - } - } - fputs(tempbuf, stdout); - if (level == 0) { - printf(", "); - charssofar += 2; - } else { - printf(" =>\n"); - printindir(blkno, level - 1, bufp); - printf("\n"); - charssofar = 0; - } - } - if (level == 0) - putchar('\n'); - return; -} - - -/* - * Print the block pointers for one inode. - */ -static void -printblocks(ino_t inum, union dinode *dp) -{ - char *bufp; - int i, nfrags; - long ndb, offset; - ufs2_daddr_t blkno; - - printf("Blocks for inode %ju:\n", (uintmax_t)inum); - printf("Direct blocks:\n"); - ndb = howmany(DIP(dp, di_size), sblock.fs_bsize); - for (i = 0; i < UFS_NDADDR && i < ndb; i++) { - if (i > 0) - printf(", "); - blkno = DIP(dp, di_db[i]); - printf("%jd", (intmax_t)blkno); - } - if (ndb <= UFS_NDADDR) { - offset = blkoff(&sblock, DIP(dp, di_size)); - if (offset != 0) { - nfrags = numfrags(&sblock, fragroundup(&sblock, offset)); - printf(" (%d frag%s)", nfrags, nfrags > 1? "s": ""); - } - } - putchar('\n'); - if (ndb <= UFS_NDADDR) - return; - - bufp = malloc((unsigned int)sblock.fs_bsize); - if (bufp == NULL) - errx(EEXIT, "cannot allocate indirect block buffer"); - printf("Indirect blocks:\n"); - for (i = 0; i < UFS_NIADDR; i++) - printindir(DIP(dp, di_ib[i]), i, bufp); - free(bufp); -} - - int checkactive(void) { if (!curinode) { warnx("no current inode\n"); return 0; } return 1; } int checkactivedir(void) { if (!curinode) { warnx("no current inode\n"); return 0; } if ((DIP(curinode, di_mode) & IFMT) != IFDIR) { warnx("inode %ju not a directory", (uintmax_t)curinum); return 0; } return 1; } int printactive(int doblocks) { if (!checkactive()) return 1; switch (DIP(curinode, di_mode) & IFMT) { case IFDIR: case IFREG: case IFBLK: case IFCHR: case IFLNK: case IFSOCK: case IFIFO: if (doblocks) - printblocks(curinum, curinode); + prtblknos(&disk, curinode); else printstat("current inode", curinum, curinode); break; case 0: printf("current inode %ju: unallocated inode\n", (uintmax_t)curinum); break; default: printf("current inode %ju: screwy itype 0%o (mode 0%o)?\n", (uintmax_t)curinum, DIP(curinode, di_mode) & IFMT, DIP(curinode, di_mode)); break; } return 0; }