X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debugfs%2Fxattrs.c;h=bd114503a4c326815b380c580dbb3958c40acff5;hb=59eed5421c2ccb262d31c08e6d07535d76fe5688;hp=1112da490475d072bced1dd61aa7cf558c933ff5;hpb=0ee1eaf70c257e08f87edc952e63bbfc95d5deba;p=tools%2Fe2fsprogs.git diff --git a/debugfs/xattrs.c b/debugfs/xattrs.c index 1112da4..bd11450 100644 --- a/debugfs/xattrs.c +++ b/debugfs/xattrs.c @@ -117,7 +117,8 @@ out: err = ext2fs_xattrs_close(&h); } -void do_list_xattr(int argc, char **argv) +void do_list_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)), + void *infop EXT2FS_ATTR((unused))) { ext2_ino_t ino; @@ -137,7 +138,8 @@ void do_list_xattr(int argc, char **argv) dump_inode_attributes(stdout, ino); } -void do_get_xattr(int argc, char **argv) +void do_get_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)), + void *infop EXT2FS_ATTR((unused))) { ext2_ino_t ino; struct ext2_xattr_handle *h; @@ -146,7 +148,7 @@ void do_get_xattr(int argc, char **argv) size_t buflen; int i; int print_flags = 0; - int handle_flags = 0; + unsigned int handle_flags = 0; errcode_t err; reset_getopt(); @@ -168,7 +170,8 @@ void do_get_xattr(int argc, char **argv) print_flags |= PRINT_XATTR_HEX; break; case 'V': - print_flags |= PRINT_XATTR_RAW; + print_flags |= PRINT_XATTR_RAW| + PRINT_XATTR_NOQUOTES; break; case 'C': print_flags |= PRINT_XATTR_C; @@ -213,7 +216,7 @@ void do_get_xattr(int argc, char **argv) fwrite(buf, buflen, 1, fp); } else { if (print_flags & PRINT_XATTR_RAW) { - if (print_flags & PRINT_XATTR_HEX|PRINT_XATTR_C) + if (print_flags & (PRINT_XATTR_HEX|PRINT_XATTR_C)) print_flags &= ~PRINT_XATTR_RAW; print_xattr_string(stdout, buf, buflen, print_flags); } else { @@ -233,15 +236,15 @@ out2: fclose(fp); } -void do_set_xattr(int argc, char **argv) +void do_set_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)), + void *infop EXT2FS_ATTR((unused))) { ext2_ino_t ino; struct ext2_xattr_handle *h; FILE *fp = NULL; char *buf = NULL; size_t buflen; - int print_flags = 0; - int handle_flags = 0; + unsigned int handle_flags = 0; int i; errcode_t err; @@ -267,7 +270,7 @@ void do_set_xattr(int argc, char **argv) if (!(fp && optind == argc - 2) && !(!fp && optind == argc - 3)) { print_usage: - printf("Usage:\t%s \n", argv[0]); + printf("Usage:\t%s [-r] \n", argv[0]); printf("\t%s -f [-r] \n", argv[0]); goto out2; } @@ -306,13 +309,6 @@ void do_set_xattr(int argc, char **argv) } err = ext2fs_xattr_set(h, argv[optind + 1], buf, buflen); - if (err) - goto out; - - err = ext2fs_xattrs_write(h); - if (err) - goto out; - out: ext2fs_xattrs_close(&h); if (err) @@ -324,7 +320,8 @@ out2: } } -void do_rm_xattr(int argc, char **argv) +void do_rm_xattr(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)), + void *infop EXT2FS_ATTR((unused))) { ext2_ino_t ino; struct ext2_xattr_handle *h; @@ -360,12 +357,147 @@ void do_rm_xattr(int argc, char **argv) if (err) goto out; } - - err = ext2fs_xattrs_write(h); - if (err) - goto out; out: ext2fs_xattrs_close(&h); if (err) com_err(argv[0], err, "while removing extended attribute"); } + +/* + * Return non-zero if the string has a minimal number of non-printable + * characters. + */ +static int is_mostly_printable(const char *cp, int len) +{ + int np = 0; + + if (len < 0) + len = strlen(cp); + + while (len--) { + if (!isprint(*cp++)) { + np++; + if (np > 3) + return 0; + } + } + return 1; +} + +static void safe_print(FILE *f, const char *cp, int len) +{ + unsigned char ch; + + if (len < 0) + len = strlen(cp); + + while (len--) { + ch = *cp++; + if (ch > 128) { + fputs("M-", f); + ch -= 128; + } + if ((ch < 32) || (ch == 0x7f)) { + fputc('^', f); + ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */ + } + fputc(ch, f); + } +} + +static void dump_xattr_raw_entries(FILE *f, unsigned char *buf, + unsigned int start, unsigned int len, + unsigned value_start) +{ + struct ext2_ext_attr_entry ent; + unsigned int off = start; + unsigned int vstart; + + while (off < len) { + if ((*(__u16 *) (buf + off)) == 0) { + fprintf(f, "last entry found at offset %u (%04o)\n", + off, off); + break; + } + if ((off + sizeof(struct ext2_ext_attr_entry)) >= len) { + fprintf(f, "xattr buffer overrun at %u (len = %u)\n", + off, len); + break; + } +#if WORDS_BIGENDIAN + ext2fs_swap_ext_attr_entry(&ent, + (struct ext2_ext_attr_entry *) (buf + off)); +#else + ent = *((struct ext2_ext_attr_entry *) (buf + off)); +#endif + fprintf(f, "offset = %d (%04o), name_len = %u, " + "name_index = %u\n", + off, off, ent.e_name_len, ent.e_name_index); + vstart = value_start + ent.e_value_offs; + fprintf(f, "value_offset = %d (%04o), value_inum = %u, " + "value_size = %u\n", ent.e_value_offs, + vstart, ent.e_value_inum, ent.e_value_size); + off += sizeof(struct ext2_ext_attr_entry); + fprintf(f, "name = "); + if ((off + ent.e_name_len) >= len) + fprintf(f, ""); + else + safe_print(f, (char *)(buf + off), ent.e_name_len); + fputc('\n', f); + if (ent.e_value_size == 0) + goto skip_value; + fprintf(f, "value = "); + if (ent.e_value_inum) + fprintf(f, "", ent.e_value_inum); + else if (ent.e_value_offs >= len || + (vstart + ent.e_value_size) > len) + fprintf(f, ""); + else if (is_mostly_printable((char *)(buf + vstart), + ent.e_value_size)) + safe_print(f, (char *)(buf + vstart), + ent.e_value_size); + else { + fprintf(f, "\n"); + do_byte_hexdump(f, (unsigned char *)(buf + vstart), + ent.e_value_size); + } + fputc('\n', f); + skip_value: + fputc('\n', f); + off += (ent.e_name_len + 3) & ~3; + } +} + +void raw_inode_xattr_dump(FILE *f, unsigned char *buf, unsigned int len) +{ + __u32 magic = ext2fs_le32_to_cpu(*((__le32 *) buf)); + + fprintf(f, "magic = %08x, length = %u, value_start =4 \n\n", + magic, len); + if (magic == EXT2_EXT_ATTR_MAGIC) + dump_xattr_raw_entries(f, buf, 4, len, 4); +} + +void block_xattr_dump(FILE *f, unsigned char *buf, unsigned int len) +{ + struct ext2_ext_attr_header header; + +#ifdef WORDS_BIGENDIAN + ext2fs_swap_ext_attr_header(&header, + (struct ext2_ext_attr_header *) buf); +#else + header = *((struct ext2_ext_attr_header *) buf); +#endif + fprintf(f, "magic = %08x, length = %u\n", header.h_magic, len); + if (header.h_magic != EXT2_EXT_ATTR_MAGIC) + return; + fprintf(f, "refcount = %u, blocks = %u\n", header.h_refcount, + header.h_blocks); + fprintf(f, "hash = %08x, checksum = %08x\n", header.h_hash, + header.h_checksum); + fprintf(f, "reserved: %08x %08x %08x\n\n", header.h_reserved[0], + header.h_reserved[1], header.h_reserved[2]); + + dump_xattr_raw_entries(f, buf, + sizeof(struct ext2_ext_attr_header), len, 0); +}