o Rename "namespace" argument to "attrnamespace" as namespace is a C++
reserved word. Submitted by: jkh Obtained from: TrustedBSD Project
This commit is contained in:
parent
6feb993d95
commit
db089ead81
|
@ -34,7 +34,7 @@
|
|||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl ls
|
||||
.Ar namespace
|
||||
.Ar attrnamespace
|
||||
.Ar attrname
|
||||
.Ar filename ...
|
||||
.Sh DESCRIPTION
|
||||
|
@ -42,7 +42,7 @@
|
|||
is a user tool to retrieve a named extended attribute on a file or
|
||||
directory.
|
||||
The
|
||||
.Ar namespace
|
||||
.Ar attrnamespace
|
||||
argument should be the namespace of the attribute to retrieve: legal
|
||||
values are "user" and "system".
|
||||
The
|
||||
|
|
|
@ -41,7 +41,7 @@ void
|
|||
usage(void)
|
||||
{
|
||||
|
||||
fprintf(stderr, "getextattr [-s] [namespace] [attrname] "
|
||||
fprintf(stderr, "getextattr [-s] [attrnamespace] [attrname] "
|
||||
"[filename ...]\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ main(int argc, char *argv[])
|
|||
char *attrname;
|
||||
char buf[BUFSIZE];
|
||||
char visbuf[BUFSIZE*4];
|
||||
int error, i, arg_counter, namespace;
|
||||
int error, i, arg_counter, attrnamespace;
|
||||
int ch;
|
||||
|
||||
int flag_as_string = 0;
|
||||
|
@ -83,7 +83,7 @@ main(int argc, char *argv[])
|
|||
if (argc < 3)
|
||||
usage();
|
||||
|
||||
error = extattr_string_to_namespace(argv[0], &namespace);
|
||||
error = extattr_string_to_namespace(argv[0], &attrnamespace);
|
||||
if (error) {
|
||||
perror(argv[0]);
|
||||
return (-1);
|
||||
|
@ -97,8 +97,8 @@ main(int argc, char *argv[])
|
|||
iov_buf.iov_len = BUFSIZE;
|
||||
|
||||
for (arg_counter = 1; arg_counter < argc; arg_counter++) {
|
||||
error = extattr_get_file(argv[arg_counter], namespace, attrname,
|
||||
&iov_buf, 1);
|
||||
error = extattr_get_file(argv[arg_counter], attrnamespace,
|
||||
attrname, &iov_buf, 1);
|
||||
|
||||
if (error == -1)
|
||||
perror(argv[arg_counter]);
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
.Nd set a named extended attribute
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Ar namespace
|
||||
.Ar attrnamespace
|
||||
.Ar attrname
|
||||
.Ar filename
|
||||
.Ar attrvalue
|
||||
|
@ -42,7 +42,7 @@
|
|||
is a user tool to set a named extended attribute on a file or directory to
|
||||
the provided string.
|
||||
The
|
||||
.Ar namespace
|
||||
.Ar attrnamespace
|
||||
argument should be the namespace of the attribute to retrieve: legal
|
||||
values are "user" and "system".
|
||||
The
|
||||
|
|
|
@ -40,7 +40,7 @@ void
|
|||
usage(void)
|
||||
{
|
||||
|
||||
fprintf(stderr, "setextattr [namespace] [attrname] [filename] "
|
||||
fprintf(stderr, "setextattr [attrnamespace] [attrname] [filename] "
|
||||
"[attrvalue]\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
@ -49,12 +49,12 @@ int
|
|||
main(int argc, char *argv[])
|
||||
{
|
||||
struct iovec iov_buf;
|
||||
int error, namespace;
|
||||
int error, attrnamespace;
|
||||
|
||||
if (argc != 5)
|
||||
usage();
|
||||
|
||||
error = extattr_string_to_namespace(argv[1], &namespace);
|
||||
error = extattr_string_to_namespace(argv[1], &attrnamespace);
|
||||
if (error) {
|
||||
perror(argv[1]);
|
||||
return (-1);
|
||||
|
@ -63,7 +63,7 @@ main(int argc, char *argv[])
|
|||
iov_buf.iov_base = argv[4];
|
||||
iov_buf.iov_len = strlen(argv[4]);
|
||||
|
||||
error = extattr_set_file(argv[3], namespace, argv[2], &iov_buf, 1);
|
||||
error = extattr_set_file(argv[3], attrnamespace, argv[2], &iov_buf, 1);
|
||||
if (error == -1) {
|
||||
perror(argv[3]);
|
||||
return (-1);
|
||||
|
|
Loading…
Reference in New Issue