mknod’s now demoted and only used as special-case builtin, in MirBSD only
built for the installer, to save time, as the original OpenBSD hack wanted
This commit is contained in:
tg
parent
c37518d509
commit
29de79c7bf
20
Build.sh
20
Build.sh
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.462 2010/10/01 19:04:35 tg Exp $'
|
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.463 2010/10/08 17:56:55 tg Exp $'
|
||||||
#-
|
#-
|
||||||
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
||||||
# Thorsten Glaser <tg@mirbsd.org>
|
# Thorsten Glaser <tg@mirbsd.org>
|
||||||
@ -510,6 +510,8 @@ UWIN*)
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
: ${HAVE_MKNOD=0}
|
||||||
|
|
||||||
: ${CC=cc} ${NROFF=nroff}
|
: ${CC=cc} ${NROFF=nroff}
|
||||||
test 0 = $r && echo | $NROFF -v 2>&1 | grep GNU >/dev/null 2>&1 && \
|
test 0 = $r && echo | $NROFF -v 2>&1 | grep GNU >/dev/null 2>&1 && \
|
||||||
NROFF="$NROFF -c"
|
NROFF="$NROFF -c"
|
||||||
@ -1044,7 +1046,6 @@ if ac_ifcpp 'ifdef MKSH_SMALL' isset_MKSH_SMALL '' \
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
: ${HAVE_MKNOD=0}
|
|
||||||
: ${HAVE_NICE=0}
|
: ${HAVE_NICE=0}
|
||||||
: ${HAVE_REVOKE=0}
|
: ${HAVE_REVOKE=0}
|
||||||
: ${HAVE_PERSISTENT_HISTORY=0}
|
: ${HAVE_PERSISTENT_HISTORY=0}
|
||||||
@ -1265,20 +1266,6 @@ ac_test langinfo_codeset setlocale_ctype 0 'nl_langinfo(CODESET)' <<-'EOF'
|
|||||||
int main(void) { return ((int)(ptrdiff_t)(void *)nl_langinfo(CODESET)); }
|
int main(void) { return ((int)(ptrdiff_t)(void *)nl_langinfo(CODESET)); }
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
ac_test setmode mknod 1 <<-'EOF'
|
|
||||||
/* XXX imake style */
|
|
||||||
/* XXX conditions correct? */
|
|
||||||
#if defined(__MSVCRT__) || defined(__CYGWIN__)
|
|
||||||
/* force a failure: Win32 setmode() is not what we want... */
|
|
||||||
int main(void) { return (thiswillneverbedefinedIhope()); }
|
|
||||||
#else
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
int main(int ac, char *av[]) { return (getmode(setmode(av[0]),
|
|
||||||
(mode_t)ac)); }
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
|
|
||||||
ac_test setresugid <<-'EOF'
|
ac_test setresugid <<-'EOF'
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -1423,7 +1410,6 @@ mksh_cfg: NSIG' >conftest.c
|
|||||||
$e done.
|
$e done.
|
||||||
fi
|
fi
|
||||||
|
|
||||||
addsrcs '!' HAVE_SETMODE setmode.c
|
|
||||||
addsrcs '!' HAVE_STRLCPY strlcpy.c
|
addsrcs '!' HAVE_STRLCPY strlcpy.c
|
||||||
addsrcs USE_PRINTF_BUILTIN printf.c
|
addsrcs USE_PRINTF_BUILTIN printf.c
|
||||||
test 1 = "$USE_PRINTF_BUILTIN" && CPPFLAGS="$CPPFLAGS -DMKSH_PRINTF_BUILTIN"
|
test 1 = "$USE_PRINTF_BUILTIN" && CPPFLAGS="$CPPFLAGS -DMKSH_PRINTF_BUILTIN"
|
||||||
|
|||||||
11
Makefile
11
Makefile
@ -1,4 +1,4 @@
|
|||||||
# $MirOS: src/bin/mksh/Makefile,v 1.82 2010/09/14 21:26:05 tg Exp $
|
# $MirOS: src/bin/mksh/Makefile,v 1.83 2010/10/08 17:56:56 tg Exp $
|
||||||
#-
|
#-
|
||||||
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
||||||
# Thorsten Glaser <tg@mirbsd.org>
|
# Thorsten Glaser <tg@mirbsd.org>
|
||||||
@ -38,12 +38,11 @@ CPPFLAGS+= -DMKSH_ASSUME_UTF8 \
|
|||||||
-DHAVE_CAN_INT8TYPE=1 -DHAVE_CAN_UCBINT8=1 -DHAVE_RLIM_T=1 \
|
-DHAVE_CAN_INT8TYPE=1 -DHAVE_CAN_UCBINT8=1 -DHAVE_RLIM_T=1 \
|
||||||
-DHAVE_SIG_T=1 -DHAVE_SYS_SIGNAME=1 -DHAVE_SYS_SIGLIST=1 \
|
-DHAVE_SIG_T=1 -DHAVE_SYS_SIGNAME=1 -DHAVE_SYS_SIGLIST=1 \
|
||||||
-DHAVE_STRSIGNAL=0 -DHAVE_GETRUSAGE=1 -DHAVE_KILLPG=1 \
|
-DHAVE_STRSIGNAL=0 -DHAVE_GETRUSAGE=1 -DHAVE_KILLPG=1 \
|
||||||
-DHAVE_MKNOD=1 -DHAVE_MKSTEMP=1 -DHAVE_NICE=1 -DHAVE_REVOKE=1 \
|
-DHAVE_MKNOD=0 -DHAVE_MKSTEMP=1 -DHAVE_NICE=1 -DHAVE_REVOKE=1 \
|
||||||
-DHAVE_SETLOCALE_CTYPE=0 -DHAVE_LANGINFO_CODESET=0 \
|
-DHAVE_SETLOCALE_CTYPE=0 -DHAVE_LANGINFO_CODESET=0 \
|
||||||
-DHAVE_SETMODE=1 -DHAVE_SETRESUGID=1 -DHAVE_SETGROUPS=1 \
|
-DHAVE_SETRESUGID=1 -DHAVE_SETGROUPS=1 -DHAVE_STRCASESTR=1 \
|
||||||
-DHAVE_STRCASESTR=1 -DHAVE_STRLCPY=1 -DHAVE_FLOCK_DECL=1 \
|
-DHAVE_STRLCPY=1 -DHAVE_FLOCK_DECL=1 -DHAVE_REVOKE_DECL=1 \
|
||||||
-DHAVE_REVOKE_DECL=1 -DHAVE_SYS_SIGLIST_DECL=1 \
|
-DHAVE_SYS_SIGLIST_DECL=1 -DHAVE_PERSISTENT_HISTORY=1 -DIN_MKSH
|
||||||
-DHAVE_PERSISTENT_HISTORY=1 -DIN_MKSH
|
|
||||||
COPTS+= -std=gnu99 -Wall
|
COPTS+= -std=gnu99 -Wall
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|||||||
489
setmode.c
489
setmode.c
@ -1,489 +0,0 @@
|
|||||||
/* $OpenBSD: setmode.c,v 1.17 2005/08/08 08:05:34 espie Exp $ */
|
|
||||||
/* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (c) 1989, 1993, 1994
|
|
||||||
* The Regents of the University of California. All rights reserved.
|
|
||||||
*
|
|
||||||
* This code is derived from software contributed to Berkeley by
|
|
||||||
* Dave Borman at Cray Research, Inc.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. Neither the name of the University nor the names of its contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef IN_MKSH
|
|
||||||
#include "sh.h"
|
|
||||||
#undef SETMODE_DEBUG
|
|
||||||
#else
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#ifdef SETMODE_DEBUG
|
|
||||||
#include <stdio.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
__SCCSID("@(#)setmode.c 8.2 (Berkeley) 3/25/94");
|
|
||||||
__RCSID("$MirOS: src/bin/mksh/setmode.c,v 1.15 2010/09/14 21:26:16 tg Exp $");
|
|
||||||
__RCSID("$miros: src/lib/libc/gen/setmode.c,v 1.14 2010/09/14 21:26:04 tg Exp $");
|
|
||||||
|
|
||||||
#ifdef IN_MKSH
|
|
||||||
|
|
||||||
#ifdef ksh_isdigit
|
|
||||||
#undef isdigit
|
|
||||||
#define isdigit ksh_isdigit
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#ifndef S_ISTXT
|
|
||||||
#define S_ISTXT 0001000
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SIZE_MAX
|
|
||||||
#ifdef SIZE_T_MAX
|
|
||||||
#define SIZE_MAX SIZE_T_MAX
|
|
||||||
#else
|
|
||||||
#define SIZE_MAX ((size_t)-1)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#define SET_LEN 6 /* initial # of bitcmd struct to malloc */
|
|
||||||
#define SET_LEN_INCR 4 /* # of bitcmd structs to add as needed */
|
|
||||||
|
|
||||||
typedef struct bitcmd {
|
|
||||||
mode_t bits;
|
|
||||||
char cmd;
|
|
||||||
char cmd2;
|
|
||||||
} BITCMD;
|
|
||||||
|
|
||||||
#define CMD2_CLR 0x01
|
|
||||||
#define CMD2_SET 0x02
|
|
||||||
#define CMD2_GBITS 0x04
|
|
||||||
#define CMD2_OBITS 0x08
|
|
||||||
#define CMD2_UBITS 0x10
|
|
||||||
|
|
||||||
static BITCMD *addcmd(BITCMD *, int, int, int, unsigned int);
|
|
||||||
static void compress_mode(BITCMD *);
|
|
||||||
#ifdef SETMODE_DEBUG
|
|
||||||
static void dumpmode(BITCMD *);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Given the old mode and an array of bitcmd structures, apply the operations
|
|
||||||
* described in the bitcmd structures to the old mode, and return the new mode.
|
|
||||||
* Note that there is no '=' command; a strict assignment is just a '-' (clear
|
|
||||||
* bits) followed by a '+' (set bits).
|
|
||||||
*/
|
|
||||||
mode_t
|
|
||||||
getmode(const void *bbox, mode_t omode)
|
|
||||||
{
|
|
||||||
const BITCMD *set;
|
|
||||||
mode_t clrval, newmode, value;
|
|
||||||
|
|
||||||
set = (const BITCMD *)bbox;
|
|
||||||
newmode = omode;
|
|
||||||
for (value = 0;; set++)
|
|
||||||
switch(set->cmd) {
|
|
||||||
/*
|
|
||||||
* When copying the user, group or other bits around, we "know"
|
|
||||||
* where the bits are in the mode so that we can do shifts to
|
|
||||||
* copy them around. If we don't use shifts, it gets real
|
|
||||||
* grundgy with lots of single bit checks and bit sets.
|
|
||||||
*/
|
|
||||||
case 'u':
|
|
||||||
value = (newmode & S_IRWXU) >> 6;
|
|
||||||
goto common;
|
|
||||||
|
|
||||||
case 'g':
|
|
||||||
value = (newmode & S_IRWXG) >> 3;
|
|
||||||
goto common;
|
|
||||||
|
|
||||||
case 'o':
|
|
||||||
value = newmode & S_IRWXO;
|
|
||||||
common:
|
|
||||||
if (set->cmd2 & CMD2_CLR) {
|
|
||||||
clrval =
|
|
||||||
(set->cmd2 & CMD2_SET) ? S_IRWXO : value;
|
|
||||||
if (set->cmd2 & CMD2_UBITS)
|
|
||||||
newmode &= ~((clrval<<6) & set->bits);
|
|
||||||
if (set->cmd2 & CMD2_GBITS)
|
|
||||||
newmode &= ~((clrval<<3) & set->bits);
|
|
||||||
if (set->cmd2 & CMD2_OBITS)
|
|
||||||
newmode &= ~(clrval & set->bits);
|
|
||||||
}
|
|
||||||
if (set->cmd2 & CMD2_SET) {
|
|
||||||
if (set->cmd2 & CMD2_UBITS)
|
|
||||||
newmode |= (value<<6) & set->bits;
|
|
||||||
if (set->cmd2 & CMD2_GBITS)
|
|
||||||
newmode |= (value<<3) & set->bits;
|
|
||||||
if (set->cmd2 & CMD2_OBITS)
|
|
||||||
newmode |= value & set->bits;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '+':
|
|
||||||
newmode |= set->bits;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '-':
|
|
||||||
newmode &= ~set->bits;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'X':
|
|
||||||
if (omode & (S_IFDIR|S_IXUSR|S_IXGRP|S_IXOTH))
|
|
||||||
newmode |= set->bits;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '\0':
|
|
||||||
default:
|
|
||||||
#ifdef SETMODE_DEBUG
|
|
||||||
(void)printf("getmode:%04o -> %04o\n", omode, newmode);
|
|
||||||
#endif
|
|
||||||
return (newmode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#define notoktomul(a, b) ((a) && (b) && (SIZE_MAX / (a) < (b)))
|
|
||||||
|
|
||||||
#define ADDCMD(a, b, c, d) \
|
|
||||||
if (set >= endset) { \
|
|
||||||
BITCMD *newset; \
|
|
||||||
setlen += SET_LEN_INCR; \
|
|
||||||
if (notoktomul(setlen, sizeof(BITCMD)) || \
|
|
||||||
(newset = realloc(saveset, setlen * \
|
|
||||||
sizeof(BITCMD))) == NULL) { \
|
|
||||||
free(saveset); \
|
|
||||||
return (NULL); \
|
|
||||||
} \
|
|
||||||
set = newset + (set - saveset); \
|
|
||||||
saveset = newset; \
|
|
||||||
endset = newset + (setlen - 2); \
|
|
||||||
} \
|
|
||||||
set = addcmd(set, (a), (b), (c), (d))
|
|
||||||
|
|
||||||
#define STANDARD_BITS (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
|
|
||||||
|
|
||||||
void *
|
|
||||||
setmode(const char *p)
|
|
||||||
{
|
|
||||||
int perm, who;
|
|
||||||
char op, *ep;
|
|
||||||
BITCMD *set, *saveset, *endset;
|
|
||||||
sigset_t signset, sigoset;
|
|
||||||
mode_t mask;
|
|
||||||
int equalopdone = 0, permXbits, setlen;
|
|
||||||
unsigned long perml;
|
|
||||||
|
|
||||||
if (!*p)
|
|
||||||
return (NULL);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Get a copy of the mask for the permissions that are mask relative.
|
|
||||||
* Flip the bits, we want what's not set. Since it's possible that
|
|
||||||
* the caller is opening files inside a signal handler, protect them
|
|
||||||
* as best we can.
|
|
||||||
*/
|
|
||||||
sigfillset(&signset);
|
|
||||||
(void)sigprocmask(SIG_BLOCK, &signset, &sigoset);
|
|
||||||
(void)umask(mask = umask(0));
|
|
||||||
mask = ~mask;
|
|
||||||
(void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
|
|
||||||
|
|
||||||
setlen = SET_LEN + 2;
|
|
||||||
|
|
||||||
if (notoktomul(setlen, sizeof(BITCMD)) ||
|
|
||||||
(set = malloc(setlen * sizeof(BITCMD))) == NULL)
|
|
||||||
return (NULL);
|
|
||||||
saveset = set;
|
|
||||||
endset = set + (setlen - 2);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If an absolute number, get it and return; disallow non-octal digits
|
|
||||||
* or illegal bits.
|
|
||||||
*/
|
|
||||||
if (isdigit((unsigned char)*p)) {
|
|
||||||
perml = strtoul(p, &ep, 8);
|
|
||||||
/* The test on perml will also catch overflow. */
|
|
||||||
if (*ep != '\0' || (perml & ~(STANDARD_BITS|S_ISTXT))) {
|
|
||||||
free(saveset);
|
|
||||||
errno = ERANGE;
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
perm = (mode_t)perml;
|
|
||||||
ADDCMD('=', (STANDARD_BITS|S_ISTXT), perm, mask);
|
|
||||||
set->cmd = 0;
|
|
||||||
return (saveset);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Build list of structures to set/clear/copy bits as described by
|
|
||||||
* each clause of the symbolic mode.
|
|
||||||
*/
|
|
||||||
for (;;) {
|
|
||||||
/* First, find out which bits might be modified. */
|
|
||||||
for (who = 0;; ++p) {
|
|
||||||
switch (*p) {
|
|
||||||
case 'a':
|
|
||||||
who |= STANDARD_BITS;
|
|
||||||
break;
|
|
||||||
case 'u':
|
|
||||||
who |= S_ISUID|S_IRWXU;
|
|
||||||
break;
|
|
||||||
case 'g':
|
|
||||||
who |= S_ISGID|S_IRWXG;
|
|
||||||
break;
|
|
||||||
case 'o':
|
|
||||||
who |= S_IRWXO;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
goto getop;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getop:
|
|
||||||
if ((op = *p++) != '+' && op != '-' && op != '=') {
|
|
||||||
free(saveset);
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
if (op == '=')
|
|
||||||
equalopdone = 0;
|
|
||||||
|
|
||||||
who &= ~S_ISTXT;
|
|
||||||
for (perm = 0, permXbits = 0;; ++p) {
|
|
||||||
switch (*p) {
|
|
||||||
case 'r':
|
|
||||||
perm |= S_IRUSR|S_IRGRP|S_IROTH;
|
|
||||||
break;
|
|
||||||
case 's':
|
|
||||||
/*
|
|
||||||
* If specific bits where requested and
|
|
||||||
* only "other" bits ignore set-id.
|
|
||||||
*/
|
|
||||||
if (who == 0 || (who & ~S_IRWXO))
|
|
||||||
perm |= S_ISUID|S_ISGID;
|
|
||||||
break;
|
|
||||||
case 't':
|
|
||||||
/*
|
|
||||||
* If specific bits where requested and
|
|
||||||
* only "other" bits ignore sticky.
|
|
||||||
*/
|
|
||||||
if (who == 0 || (who & ~S_IRWXO)) {
|
|
||||||
who |= S_ISTXT;
|
|
||||||
perm |= S_ISTXT;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'w':
|
|
||||||
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
|
|
||||||
break;
|
|
||||||
case 'X':
|
|
||||||
permXbits = S_IXUSR|S_IXGRP|S_IXOTH;
|
|
||||||
break;
|
|
||||||
case 'x':
|
|
||||||
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
|
|
||||||
break;
|
|
||||||
case 'u':
|
|
||||||
case 'g':
|
|
||||||
case 'o':
|
|
||||||
/*
|
|
||||||
* When ever we hit 'u', 'g', or 'o', we have
|
|
||||||
* to flush out any partial mode that we have,
|
|
||||||
* and then do the copying of the mode bits.
|
|
||||||
*/
|
|
||||||
if (perm) {
|
|
||||||
ADDCMD(op, who, perm, mask);
|
|
||||||
perm = 0;
|
|
||||||
}
|
|
||||||
if (op == '=')
|
|
||||||
equalopdone = 1;
|
|
||||||
if (op == '+' && permXbits) {
|
|
||||||
ADDCMD('X', who, permXbits, mask);
|
|
||||||
permXbits = 0;
|
|
||||||
}
|
|
||||||
ADDCMD(*p, who, op, mask);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
/*
|
|
||||||
* Add any permissions that we haven't already
|
|
||||||
* done.
|
|
||||||
*/
|
|
||||||
if (perm || (op == '=' && !equalopdone)) {
|
|
||||||
if (op == '=')
|
|
||||||
equalopdone = 1;
|
|
||||||
ADDCMD(op, who, perm, mask);
|
|
||||||
perm = 0;
|
|
||||||
}
|
|
||||||
if (permXbits) {
|
|
||||||
ADDCMD('X', who, permXbits, mask);
|
|
||||||
permXbits = 0;
|
|
||||||
}
|
|
||||||
goto apply;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
apply:
|
|
||||||
if (!*p)
|
|
||||||
break;
|
|
||||||
if (*p != ',')
|
|
||||||
goto getop;
|
|
||||||
++p;
|
|
||||||
}
|
|
||||||
set->cmd = 0;
|
|
||||||
#ifdef SETMODE_DEBUG
|
|
||||||
(void)printf("Before compress_mode()\n");
|
|
||||||
dumpmode(saveset);
|
|
||||||
#endif
|
|
||||||
compress_mode(saveset);
|
|
||||||
#ifdef SETMODE_DEBUG
|
|
||||||
(void)printf("After compress_mode()\n");
|
|
||||||
dumpmode(saveset);
|
|
||||||
#endif
|
|
||||||
return (saveset);
|
|
||||||
}
|
|
||||||
|
|
||||||
static BITCMD *
|
|
||||||
addcmd(BITCMD *set, int op, int who, int oparg, unsigned int mask)
|
|
||||||
{
|
|
||||||
switch (op) {
|
|
||||||
case '=':
|
|
||||||
set->cmd = '-';
|
|
||||||
set->bits = who ? who : STANDARD_BITS;
|
|
||||||
set++;
|
|
||||||
|
|
||||||
op = '+';
|
|
||||||
/* FALLTHROUGH */
|
|
||||||
case '+':
|
|
||||||
case '-':
|
|
||||||
case 'X':
|
|
||||||
set->cmd = op;
|
|
||||||
set->bits = (who ? who : (int)mask) & oparg;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'u':
|
|
||||||
case 'g':
|
|
||||||
case 'o':
|
|
||||||
set->cmd = op;
|
|
||||||
if (who) {
|
|
||||||
set->cmd2 = ((who & S_IRUSR) ? CMD2_UBITS : 0) |
|
|
||||||
((who & S_IRGRP) ? CMD2_GBITS : 0) |
|
|
||||||
((who & S_IROTH) ? CMD2_OBITS : 0);
|
|
||||||
set->bits = (mode_t)~0;
|
|
||||||
} else {
|
|
||||||
set->cmd2 = CMD2_UBITS | CMD2_GBITS | CMD2_OBITS;
|
|
||||||
set->bits = mask;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oparg == '+')
|
|
||||||
set->cmd2 |= CMD2_SET;
|
|
||||||
else if (oparg == '-')
|
|
||||||
set->cmd2 |= CMD2_CLR;
|
|
||||||
else if (oparg == '=')
|
|
||||||
set->cmd2 |= CMD2_SET|CMD2_CLR;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return (set + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef SETMODE_DEBUG
|
|
||||||
static void
|
|
||||||
dumpmode(BITCMD *set)
|
|
||||||
{
|
|
||||||
for (; set->cmd; ++set)
|
|
||||||
(void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
|
|
||||||
set->cmd, set->bits, set->cmd2 ? " cmd2:" : "",
|
|
||||||
set->cmd2 & CMD2_CLR ? " CLR" : "",
|
|
||||||
set->cmd2 & CMD2_SET ? " SET" : "",
|
|
||||||
set->cmd2 & CMD2_UBITS ? " UBITS" : "",
|
|
||||||
set->cmd2 & CMD2_GBITS ? " GBITS" : "",
|
|
||||||
set->cmd2 & CMD2_OBITS ? " OBITS" : "");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Given an array of bitcmd structures, compress by compacting consecutive
|
|
||||||
* '+', '-' and 'X' commands into at most 3 commands, one of each. The 'u',
|
|
||||||
* 'g' and 'o' commands continue to be separate. They could probably be
|
|
||||||
* compacted, but it's not worth the effort.
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
compress_mode(BITCMD *set)
|
|
||||||
{
|
|
||||||
BITCMD *nset;
|
|
||||||
int setbits, clrbits, Xbits, op;
|
|
||||||
|
|
||||||
for (nset = set;;) {
|
|
||||||
/* Copy over any 'u', 'g' and 'o' commands. */
|
|
||||||
while ((op = nset->cmd) != '+' && op != '-' && op != 'X') {
|
|
||||||
*set++ = *nset++;
|
|
||||||
if (!op)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (setbits = clrbits = Xbits = 0;; nset++) {
|
|
||||||
if ((op = nset->cmd) == '-') {
|
|
||||||
clrbits |= nset->bits;
|
|
||||||
setbits &= ~nset->bits;
|
|
||||||
Xbits &= ~nset->bits;
|
|
||||||
} else if (op == '+') {
|
|
||||||
setbits |= nset->bits;
|
|
||||||
clrbits &= ~nset->bits;
|
|
||||||
Xbits &= ~nset->bits;
|
|
||||||
} else if (op == 'X')
|
|
||||||
Xbits |= nset->bits & ~setbits;
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (clrbits) {
|
|
||||||
set->cmd = '-';
|
|
||||||
set->cmd2 = 0;
|
|
||||||
set->bits = clrbits;
|
|
||||||
set++;
|
|
||||||
}
|
|
||||||
if (setbits) {
|
|
||||||
set->cmd = '+';
|
|
||||||
set->cmd2 = 0;
|
|
||||||
set->bits = setbits;
|
|
||||||
set++;
|
|
||||||
}
|
|
||||||
if (Xbits) {
|
|
||||||
set->cmd = 'X';
|
|
||||||
set->cmd2 = 0;
|
|
||||||
set->bits = Xbits;
|
|
||||||
set++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
7
sh.h
7
sh.h
@ -154,7 +154,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef EXTERN
|
#ifdef EXTERN
|
||||||
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.417 2010/10/01 19:04:38 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.418 2010/10/08 17:56:57 tg Exp $");
|
||||||
#endif
|
#endif
|
||||||
#define MKSH_VERSION "R39 2010/10/01"
|
#define MKSH_VERSION "R39 2010/10/01"
|
||||||
|
|
||||||
@ -305,11 +305,6 @@ extern int getrusage(int, struct rusage *);
|
|||||||
extern int revoke(const char *);
|
extern int revoke(const char *);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !HAVE_SETMODE
|
|
||||||
mode_t getmode(const void *, mode_t);
|
|
||||||
void *setmode(const char *);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ultrix
|
#ifdef __ultrix
|
||||||
/* XXX imake style */
|
/* XXX imake style */
|
||||||
int strcasecmp(const char *, const char *);
|
int strcasecmp(const char *, const char *);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user