Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7056:db9b9e26e735
* modechange.c (mode_compile): Numeric modes now affect setuid and
setgid on directories only if they set these bits.
* modechange.h: Remove obsolete comment about masks.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 28 Jul 2006 07:39:27 +0000 |
parents | 5bea7b615db5 |
children | cb4ff5d170d3 |
files | lib/ChangeLog lib/modechange.c lib/modechange.h |
diffstat | 3 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2006-07-28 Paul Eggert <eggert@cs.ucla.edu> + + * modechange.c (mode_compile): Numeric modes now affect setuid and + setgid on directories only if they set these bits. + * modechange.h: Remove obsolete comment about masks. + 2006-07-27 Bruno Haible <bruno@clisp.org> * stdint_.h (INT*_C, UINT*_C) [C++]: Define these if
--- a/lib/modechange.c +++ b/lib/modechange.c @@ -143,12 +143,12 @@ if ('0' <= *mode_string && *mode_string < '8') { unsigned int octal_mode = 0; - unsigned int octal_mentioned = 0; + mode_t mode; + mode_t mentioned; do { octal_mode = 8 * octal_mode + *mode_string++ - '0'; - octal_mentioned = 8 * octal_mentioned + 7; if (ALLM < octal_mode) return NULL; } @@ -157,8 +157,9 @@ if (*mode_string) return NULL; - return make_node_op_equals (octal_to_mode (octal_mode), - octal_to_mode (octal_mentioned & ALLM)); + mode = octal_to_mode (octal_mode); + mentioned = (mode & (S_ISUID | S_ISGID)) | S_ISVTX | S_IRWXUGO; + return make_node_op_equals (mode, mentioned); } /* Allocate enough space to hold the result. */ @@ -299,7 +300,8 @@ directory if DIR), assuming the umask is UMASK_VALUE, adjusted as indicated by the list of change operations CHANGES. If DIR, the type 'X' change affects the returned value even if no execute bits - were set in OLDMODE. If PMODE_BITS is not null, store into + were set in OLDMODE, and set user and group ID bits are preserved + unless CHANGES mentioned them. If PMODE_BITS is not null, store into *PMODE_BITS a mask denoting file mode bits that are affected by CHANGES.
--- a/lib/modechange.h +++ b/lib/modechange.h @@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* Masks for the `flags' field in a `struct mode_change'. */ - #if ! defined MODECHANGE_H_ # define MODECHANGE_H_