aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/lsattr.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-15 11:48:27 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-15 11:48:27 +0000
commite0b950babcbb1440b4f32f2085e7595b76f71e79 (patch)
tree419c8b72017d869f736cb5d6e1bf732b78d655cf /e2fsprogs/lsattr.c
parent97d11686fdca77729dc56fb2614e0c050e71ce50 (diff)
downloadbusybox-w32-e0b950babcbb1440b4f32f2085e7595b76f71e79.tar.gz
busybox-w32-e0b950babcbb1440b4f32f2085e7595b76f71e79.tar.bz2
busybox-w32-e0b950babcbb1440b4f32f2085e7595b76f71e79.zip
e2fsprogs: stop using statics in chattr. Minor code shrinkage (-130 bytes)
git-svn-id: svn://busybox.net/trunk/busybox@18451 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'e2fsprogs/lsattr.c')
-rw-r--r--e2fsprogs/lsattr.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index 8945b53e0..25d2e3e48 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -34,11 +34,11 @@ static void list_attributes(const char *name)
34 unsigned long fsflags; 34 unsigned long fsflags;
35 unsigned long generation; 35 unsigned long generation;
36 36
37 if (fgetflags(name, &fsflags) == -1) 37 if (fgetflags(name, &fsflags) != 0)
38 goto read_err; 38 goto read_err;
39 39
40 if (option_mask32 & OPT_GENERATION) { 40 if (option_mask32 & OPT_GENERATION) {
41 if (fgetversion(name, &generation) == -1) 41 if (fgetversion(name, &generation) != 0)
42 goto read_err; 42 goto read_err;
43 printf("%5lu ", generation); 43 printf("%5lu ", generation);
44 } 44 }
@@ -65,14 +65,12 @@ static int lsattr_dir_proc(const char *dir_name, struct dirent *de,
65 65
66 path = concat_path_file(dir_name, de->d_name); 66 path = concat_path_file(dir_name, de->d_name);
67 67
68 if (lstat(path, &st) == -1) 68 if (lstat(path, &st) != 0)
69 bb_perror_msg("stat %s", path); 69 bb_perror_msg("stat %s", path);
70
71 else if (de->d_name[0] != '.' || (option_mask32 & OPT_ALL)) { 70 else if (de->d_name[0] != '.' || (option_mask32 & OPT_ALL)) {
72 list_attributes(path); 71 list_attributes(path);
73 if (S_ISDIR(st.st_mode) && (option_mask32 & OPT_RECUR) 72 if (S_ISDIR(st.st_mode) && (option_mask32 & OPT_RECUR)
74 && (de->d_name[0] != '.' 73 && !DOT_OR_DOTDOT(de->d_name)
75 || (de->d_name[1] != '\0' && NOT_LONE_CHAR(de->d_name+1, '.')))
76 ) { 74 ) {
77 printf("\n%s:\n", path); 75 printf("\n%s:\n", path);
78 iterate_on_dir(path, lsattr_dir_proc, NULL); 76 iterate_on_dir(path, lsattr_dir_proc, NULL);
@@ -81,7 +79,6 @@ static int lsattr_dir_proc(const char *dir_name, struct dirent *de,
81 } 79 }
82 80
83 free(path); 81 free(path);
84
85 return 0; 82 return 0;
86} 83}
87 84