BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

getfattr: fix "getfattr NOTEXIST" - now prints error msg 

function                                             old     new   delta
getfattr_main                                        309     307      -2
.rodata                                           105395  105391      -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-6)               Total: -6 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
master
Denys Vlasenko 2023-07-17 09:36:17 +02:00
parent cf809e2f2d
commit a6a102ec4c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
miscutils/getfattr.c
View File

@ -31,6 +31,7 @@
enum {
OPT_h = (1 << 0),
OPT_d = (1 << 1),
OPT_n = (1 << 2),
};
static int print_attr(const char *file, const char *name, char **buf, size_t *bufsize)
@ -85,8 +86,9 @@ int getfattr_main(int argc UNUSED_PARAM, char **argv)
opt = getopt32(argv, "^"
"hdn:"
/* Min one arg; exactly one of -n or -d is required. */
"\0" "-1:d:n:n--d:d--n"
/* Min one arg; -d and -n are exclusive */
"\0" "-1:n--d:d--n"
//getfattr 2.5.1 does not enforce this: ":d:n" /* exactly one of -n or -d is required */
, &name
);
argv += optind;
@ -94,8 +96,11 @@ int getfattr_main(int argc UNUSED_PARAM, char **argv)
do {
int r;
if (opt & OPT_d) {
//getfattr 2.5.1 with no -n/-d defaults to -d
if (!(opt & OPT_n)) {
ssize_t len = list_attr(*argv, &list, &listsize);
if (len < 0)
goto err;
if (len > 0) {
char *key;
printf("# file: %s\n", *argv);
@ -118,7 +123,7 @@ int getfattr_main(int argc UNUSED_PARAM, char **argv)
err:
bb_simple_perror_msg(*argv);
status = EXIT_FAILURE;
// continue; maybe?
continue;
}
bb_putchar('\n');
}