extern char *optarg;
#endif
#include <ctype.h>
+#include "support/cstring.h"
#include "debugfs.h"
+#define PRINT_XATTR_HEX 0x01
+#define PRINT_XATTR_RAW 0x02
+#define PRINT_XATTR_C 0x04
+#define PRINT_XATTR_STATFMT 0x08
+#define PRINT_XATTR_NOQUOTES 0x10
+
/* Dump extended attributes */
-static void dump_xattr_string(FILE *out, const char *str, int len)
+static void print_xattr_hex(FILE *f, const char *str, int len)
{
- int printable = 0;
int i;
- /* check: is string "printable enough?" */
for (i = 0; i < len; i++)
- if (isprint(str[i]))
- printable++;
+ fprintf(f, "%02x ", (unsigned char)str[i]);
+}
+
+/* Dump extended attributes */
+static void print_xattr_string(FILE *f, const char *str, int len, int flags)
+{
+ int printable = 0;
+ int i;
+
+ if (flags & PRINT_XATTR_RAW) {
+ fwrite(str, len, 1, f);
+ return;
+ }
- if (printable <= len*7/8)
- printable = 0;
+ if ((flags & PRINT_XATTR_C) == 0) {
+ /* check: is string "printable enough?" */
+ for (i = 0; i < len; i++)
+ if (isprint(str[i]))
+ printable++;
- for (i = 0; i < len; i++)
- if (printable)
- fprintf(out, isprint(str[i]) ? "%c" : "\\%03o",
- (unsigned char)str[i]);
- else
- fprintf(out, "%02x ", (unsigned char)str[i]);
+ if (printable <= len*7/8)
+ flags |= PRINT_XATTR_HEX;
+ }
+
+ if (flags & PRINT_XATTR_HEX) {
+ print_xattr_hex(f, str, len);
+ } else {
+ if ((flags & PRINT_XATTR_NOQUOTES) == 0)
+ fputc('\"', f);
+ print_c_string(f, str, len);
+ if ((flags & PRINT_XATTR_NOQUOTES) == 0)
+ fputc('\"', f);
+ }
+}
+
+static void print_xattr(FILE *f, char *name, char *value, size_t value_len,
+ int print_flags)
+{
+ print_xattr_string(f, name, strlen(name), PRINT_XATTR_NOQUOTES);
+ fprintf(f, " (%zu)", value_len);
+ if ((print_flags & PRINT_XATTR_STATFMT) &&
+ (strcmp(name, "system.data") == 0))
+ value_len = 0;
+ if (value_len != 0 &&
+ (!(print_flags & PRINT_XATTR_STATFMT) || (value_len < 40))) {
+ fprintf(f, " = ");
+ print_xattr_string(f, value, value_len, print_flags);
+ }
+ fputc('\n', f);
}
static int dump_attr(char *name, char *value, size_t value_len, void *data)
FILE *out = data;
fprintf(out, " ");
- dump_xattr_string(out, name, strlen(name));
- if (strcmp(name, "system.data") != 0) {
- fprintf(out, " = \"");
- dump_xattr_string(out, value, value_len);
- fprintf(out, "\"");
- }
- fprintf(out, " (%zu)\n", value_len);
-
+ print_xattr(out, name, value, value_len, PRINT_XATTR_STATFMT);
return 0;
}
char *buf = NULL;
size_t buflen;
int i;
+ int print_flags = 0;
+ unsigned int handle_flags = 0;
errcode_t err;
reset_getopt();
- while ((i = getopt(argc, argv, "f:")) != -1) {
+ while ((i = getopt(argc, argv, "Cf:rxV")) != -1) {
switch (i) {
case 'f':
if (fp)
return;
}
break;
+ case 'r':
+ handle_flags |= XATTR_HANDLE_FLAG_RAW;
+ break;
+ case 'x':
+ print_flags |= PRINT_XATTR_HEX;
+ break;
+ case 'V':
+ print_flags |= PRINT_XATTR_RAW|
+ PRINT_XATTR_NOQUOTES;
+ break;
+ case 'C':
+ print_flags |= PRINT_XATTR_C;
+ break;
default:
- printf("%s: Usage: %s <file> <attr> [-f outfile]\n",
- argv[0], argv[0]);
- goto out2;
+ goto usage;
}
}
if (optind != argc - 2) {
- printf("%s: Usage: %s <file> <attr> [-f outfile]\n", argv[0],
- argv[0]);
+ usage:
+ printf("%s: Usage: %s [-f outfile]|[-xVC] [-r] <file> <attr>\n",
+ argv[0], argv[0]);
+
goto out2;
}
if (err)
goto out2;
+ err = ext2fs_xattrs_flags(h, &handle_flags, NULL);
+ if (err)
+ goto out;
+
err = ext2fs_xattrs_read(h);
if (err)
goto out;
if (fp) {
fwrite(buf, buflen, 1, fp);
} else {
- dump_xattr_string(stdout, buf, buflen);
+ if (print_flags & PRINT_XATTR_RAW) {
+ if (print_flags & (PRINT_XATTR_HEX|PRINT_XATTR_C))
+ print_flags &= ~PRINT_XATTR_RAW;
+ print_xattr_string(stdout, buf, buflen, print_flags);
+ } else {
+ print_xattr(stdout, argv[optind + 1],
+ buf, buflen, print_flags);
+ }
printf("\n");
}
FILE *fp = NULL;
char *buf = NULL;
size_t buflen;
+ unsigned int handle_flags = 0;
int i;
errcode_t err;
reset_getopt();
- while ((i = getopt(argc, argv, "f:")) != -1) {
+ while ((i = getopt(argc, argv, "f:r")) != -1) {
switch (i) {
case 'f':
if (fp)
return;
}
break;
+ case 'r':
+ handle_flags |= XATTR_HANDLE_FLAG_RAW;
+ break;
default:
- printf("%s: Usage: %s <file> <attr> [-f infile | "
- "value]\n", argv[0], argv[0]);
- goto out2;
+ goto print_usage;
}
}
if (!(fp && optind == argc - 2) && !(!fp && optind == argc - 3)) {
- printf("%s: Usage: %s <file> <attr> [-f infile | value>]\n",
- argv[0], argv[0]);
+ print_usage:
+ printf("Usage:\t%s [-r] <file> <attr> <value>\n", argv[0]);
+ printf("\t%s -f <value_file> [-r] <file> <attr>\n", argv[0]);
goto out2;
}
if (err)
goto out2;
+ err = ext2fs_xattrs_flags(h, &handle_flags, NULL);
+ if (err)
+ goto out;
+
err = ext2fs_xattrs_read(h);
if (err)
goto out;
buflen = fread(buf, 1, current_fs->blocksize, fp);
} else {
buf = argv[optind + 2];
- buflen = strlen(argv[optind + 2]);
+ buflen = parse_c_string(buf);
}
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)
if (err)
goto out;
}
-
- err = ext2fs_xattrs_write(h);
- if (err)
- goto out;
out:
ext2fs_xattrs_close(&h);
if (err)
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff