emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chattr,lsattr: share stat error message

Browse Source 
function                                             old     new   delta
.rodata                                           103692  103684      -8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2021-06-23 15:33:22 +02:00
parent 96436fb36a
commit 85a5bc9148
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e2fsprogs/chattr.c
View File

@@ -154,7 +154,7 @@ static void change_attributes(const char *name, struct globals *gp)
struct stat st;
if (lstat(name, &st) != 0) {
bb_perror_msg("stat %s", name);
bb_perror_msg("can't stat '%s'", name);
return;
}
if (S_ISLNK(st.st_mode) && gp->recursive)
@@ -180,6 +180,7 @@ static void change_attributes(const char *name, struct globals *gp)
if (gp->flags & OPT_SET_PROJ) {
struct ext2_fsxattr fsxattr;
r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
/* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
if (r != 0)
bb_perror_msg("getting %s on %s", "project ID", name);
fsxattr.fsx_projid = gp->projid;

5
e2fsprogs/lsattr.c
View File

@@ -56,6 +56,7 @@ static void list_attributes(const char *name)
if (option_mask32 & OPT_PROJID) {
struct ext2_fsxattr fsxattr;
r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
/* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
if (r != 0)
goto read_err;
printf("%5u ", (unsigned)fsxattr.fsx_projid);
@@ -100,7 +101,7 @@ static int FAST_FUNC lsattr_dir_proc(const char *dir_name,
path = concat_path_file(dir_name, de->d_name);
if (lstat(path, &st) != 0)
bb_perror_msg("stat %s", path);
bb_perror_msg("can't stat '%s'", path);
else if (de->d_name[0] != '.' || (option_mask32 & OPT_ALL)) {
list_attributes(path);
if (S_ISDIR(st.st_mode) && (option_mask32 & OPT_RECUR)
@@ -121,7 +122,7 @@ static void lsattr_args(const char *name)
struct stat st;
if (lstat(name, &st) == -1) {
bb_perror_msg("stat %s", name);
bb_perror_msg("can't stat '%s'", name);
} else if (S_ISDIR(st.st_mode) && !(option_mask32 & OPT_DIRS_OPT)) {
iterate_on_dir(name, lsattr_dir_proc, NULL);
} else {