From adadd51815540df758314c84645dad4fbfa9586e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 28 Jun 2019 10:12:28 -0700 Subject: [PATCH] scoutfs-utils: update for listxattr_hidden listxattr_raw was renamed to listxattr_hidden to more accurately describe the only reason that it exists. Signed-off-by: Zach Brown --- utils/src/ioctl.h | 6 +-- .../{listxattr_raw.c => listxattr_hidden.c} | 38 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) rename utils/src/{listxattr_raw.c => listxattr_hidden.c} (69%) diff --git a/utils/src/ioctl.h b/utils/src/ioctl.h index 4a62efe9..5aa057c0 100644 --- a/utils/src/ioctl.h +++ b/utils/src/ioctl.h @@ -306,15 +306,15 @@ struct scoutfs_ioctl_setattr_more { #define SCOUTFS_IOC_SETATTR_MORE _IOW(SCOUTFS_IOCTL_MAGIC, 8, \ struct scoutfs_ioctl_setattr_more) -struct scoutfs_ioctl_listxattr_raw { +struct scoutfs_ioctl_listxattr_hidden { __u64 id_pos; __u64 buf_ptr; __u32 buf_bytes; __u32 hash_pos; }; -#define SCOUTFS_IOC_LISTXATTR_RAW _IOR(SCOUTFS_IOCTL_MAGIC, 9, \ - struct scoutfs_ioctl_listxattr_raw) +#define SCOUTFS_IOC_LISTXATTR_HIDDEN _IOR(SCOUTFS_IOCTL_MAGIC, 9, \ + struct scoutfs_ioctl_listxattr_hidden) /* * Return the inode numbers of inodes which might contain the given diff --git a/utils/src/listxattr_raw.c b/utils/src/listxattr_hidden.c similarity index 69% rename from utils/src/listxattr_raw.c rename to utils/src/listxattr_hidden.c index f7b69c0d..a98426aa 100644 --- a/utils/src/listxattr_raw.c +++ b/utils/src/listxattr_hidden.c @@ -21,9 +21,9 @@ static struct option long_ops[] = { { NULL, 0, NULL, 0} }; -static int listxattr_raw_cmd(int argc, char **argv) +static int listxattr_hidden_cmd(int argc, char **argv) { - struct scoutfs_ioctl_listxattr_raw lxr; + struct scoutfs_ioctl_listxattr_hidden lxh; char *path = NULL; char *buf = NULL; char *name; @@ -57,17 +57,17 @@ static int listxattr_raw_cmd(int argc, char **argv) goto out; } - memset(&lxr, 0, sizeof(lxr)); - lxr.id_pos = 0; - lxr.hash_pos = 0; - lxr.buf_bytes = 256 * 1024; + memset(&lxh, 0, sizeof(lxh)); + lxh.id_pos = 0; + lxh.hash_pos = 0; + lxh.buf_bytes = 256 * 1024; - buf = malloc(lxr.buf_bytes); + buf = malloc(lxh.buf_bytes); if (!buf) { fprintf(stderr, "xattr name buf alloc failed\n"); return -ENOMEM; } - lxr.buf_ptr = (unsigned long)buf; + lxh.buf_ptr = (unsigned long)buf; fd = open(path, O_RDONLY); if (fd < 0) { @@ -79,25 +79,25 @@ static int listxattr_raw_cmd(int argc, char **argv) for (;;) { - ret = ioctl(fd, SCOUTFS_IOC_LISTXATTR_RAW, &lxr); + ret = ioctl(fd, SCOUTFS_IOC_LISTXATTR_HIDDEN, &lxh); if (ret == 0) break; if (ret < 0) { ret = -errno; - fprintf(stderr, "listxattr_raw ioctl failed: " + fprintf(stderr, "listxattr_hidden ioctl failed: " "%s (%d)\n", strerror(errno), errno); goto out; } bytes = ret; - if (bytes > lxr.buf_bytes) { - fprintf(stderr, "listxattr_raw overflowed\n"); + if (bytes > lxh.buf_bytes) { + fprintf(stderr, "listxattr_hidden overflowed\n"); ret = -EFAULT; goto out; } if (buf[bytes - 1] != '\0') { - fprintf(stderr, "listxattr_raw didn't term\n"); + fprintf(stderr, "listxattr_hidden didn't term\n"); ret = -EINVAL; goto out; } @@ -107,13 +107,13 @@ static int listxattr_raw_cmd(int argc, char **argv) do { len = strlen(name); if (len == 0) { - fprintf(stderr, "listxattr_raw empty name\n"); + fprintf(stderr, "listxattr_hidden empty name\n"); ret = -EINVAL; goto out; } if (len > SCOUTFS_XATTR_MAX_NAME_LEN) { - fprintf(stderr, "listxattr_raw long name\n"); + fprintf(stderr, "listxattr_hidden long name\n"); ret = -EINVAL; goto out; } @@ -139,9 +139,9 @@ out: return ret; }; -static void __attribute__((constructor)) listxattr_raw_ctor(void) +static void __attribute__((constructor)) listxattr_hidden_ctor(void) { - cmd_register("listxattr-raw", "-f ", - "print only the names of all xattrs on the file", - listxattr_raw_cmd); + cmd_register("listxattr-hidden", "-f ", + "print the names of hidden xattrs on the file", + listxattr_hidden_cmd); }