From e3b7168498304af27961f2600b57c95651ac154a Mon Sep 17 00:00:00 2001 From: Roland Illig Date: Tue, 5 Jul 2005 18:18:36 +0000 Subject: [PATCH] * achown.c: Changed all references to umode_t into mode_t. * file.c: Likewise. --- src/ChangeLog | 5 +++++ src/achown.c | 16 ++++++++-------- src/file.c | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d4260407b..8cc1ad6e0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-07-05 Roland Illig + + * achown.c: Changed all references to umode_t into mode_t. + * file.c: Likewise. + 2005-07-03 Roland Illig * textconf.c: mc --version prints the number of bits of off_t. diff --git a/src/achown.c b/src/achown.c index 4a1b4914b..9df415bf7 100644 --- a/src/achown.c +++ b/src/achown.c @@ -83,7 +83,7 @@ static int flag_pos; static int x_toggle; static char ch_flags[11]; static const char ch_perm[] = "rwx"; -static umode_t ch_cmode; +static mode_t ch_cmode; static struct stat *sf_stat; static int need_update; static int end_chown; @@ -143,26 +143,26 @@ static void update_permissions (void) set_perm_by_flags (b_att[2]->text, 6); } -static umode_t get_perm (char *s, int base) +static mode_t get_perm (char *s, int base) { - umode_t m; + mode_t m; m = 0; - m |= (s [0] == '-') ? 0 : + m |= (s[0] == '-') ? 0 : ((s[0] == '+') ? (1 << (base + 2)) : (1 << (base + 2)) & ch_cmode); - m |= (s [1] == '-') ? 0 : + m |= (s[1] == '-') ? 0 : ((s[1] == '+') ? (1 << (base + 1)) : (1 << (base + 1)) & ch_cmode); - m |= (s [2] == '-') ? 0 : + m |= (s[2] == '-') ? 0 : ((s[2] == '+') ? (1 << base) : (1 << base) & ch_cmode); return m; } -static umode_t get_mode (void) +static mode_t get_mode (void) { - umode_t m; + mode_t m; m = ch_cmode ^ (ch_cmode & 0777); m |= get_perm (ch_flags, 6); diff --git a/src/file.c b/src/file.c index c3f773dd9..c5516bc30 100644 --- a/src/file.c +++ b/src/file.c @@ -96,7 +96,7 @@ struct link { dev_t dev; ino_t ino; short linkcount; - umode_t st_mode; + mode_t st_mode; char name[1]; };