midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
sbase/libutil/mode.c

153 lines
2.7 KiB
C
Raw Normal View History

parsemode: No need to return after eprintf Also, since parsemode exits on failure, don't bother checking return value in xinstall (this would never trigger anyway because mode_t can be unsigned).
2016-12-01 07:27:59 +00:00
/* See LICENSE file for copyright and license details. */
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
#include <stdlib.h>
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
#include <string.h>
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
#include <sys/stat.h>
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
#include <unistd.h>
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
#include "../util.h"
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
mode_t
getumask(void)
{
code style Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-06-01 12:59:47 +00:00
mode_t mask = umask(0);
umask(mask);
return mask;
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
}
mode_t
parsemode(const char *str, mode_t mode, mode_t mask)
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
{
char *end;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
const char *p = str;
int octal, op;
mode_t who, perm, clear;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
octal = strtol(str, &end, 8);
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (*end == '\0') {
parsemode: No need to return after eprintf Also, since parsemode exits on failure, don't bother checking return value in xinstall (this would never trigger anyway because mode_t can be unsigned).
2016-12-01 07:27:59 +00:00
if (octal < 0 || octal > 07777)
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
eprintf("%s: invalid mode\n", str);
libutil/mode: Remove unnecessary octal-to-mode conversion The values of the file mode macros are specified explicitly by POSIX, so we can just use the octal value directly.
2019-11-02 02:07:10 +00:00
return octal;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
}
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
next:
/* first, determine which bits we will be modifying */
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
for (who = 0; *p; p++) {
switch (*p) {
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
/* masks */
case 'u':
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
who |= S_IRWXU|S_ISUID;
continue;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
case 'g':
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
who |= S_IRWXG|S_ISGID;
continue;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
case 'o':
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
who |= S_IRWXO;
continue;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
case 'a':
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
who |= S_IRWXU|S_ISUID|S_IRWXG|S_ISGID|S_IRWXO;
continue;
}
break;
}
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (who) {
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
clear = who;
} else {
clear = S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO;
who = ~mask;
}
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
while (*p) {
switch (*p) {
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
/* opers */
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
case '=':
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
case '+':
case '-':
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
op = (int)*p;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
break;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
default:
eprintf("%s: invalid mode\n", str);
}
perm = 0;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
switch (*++p) {
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
/* copy */
case 'u':
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IRUSR)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IRUSR|S_IRGRP|S_IROTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IWUSR)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IXUSR)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_ISUID)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_ISUID|S_ISGID;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
p++;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
break;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
case 'g':
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IRGRP)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IRUSR|S_IRGRP|S_IROTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IWGRP)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IXGRP)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_ISGID)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_ISUID|S_ISGID;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
p++;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
break;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
case 'o':
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IROTH)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IRUSR|S_IRGRP|S_IROTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IWOTH)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (mode & S_IXOTH)
style fix: fix indentation (double)
2014-11-09 19:22:49 +00:00
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
p++;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
break;
default:
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
for (; *p; p++) {
switch (*p) {
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
/* modes */
case 'r':
perm |= S_IRUSR|S_IRGRP|S_IROTH;
break;
case 'w':
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
break;
case 'x':
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
break;
chmod: Implement X perm symbol Instead of clearing the format bits before calling parsemode, leave them in so we can differentiate between directories and other files, then clear the format bits in the result.
2020-01-06 21:08:38 +00:00
case 'X':
if (S_ISDIR(mode) || mode & (S_IXUSR|S_IXGRP|S_IXOTH))
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
break;
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
case 's':
perm |= S_ISUID|S_ISGID;
break;
case 't':
perm |= S_ISVTX;
break;
default:
goto apply;
}
}
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
}
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
Do not indent label
2015-12-21 09:54:33 +00:00
apply:
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
/* apply */
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
switch (op) {
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
case '=':
mode &= ~clear;
/* fallthrough */
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
case '+':
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
mode |= perm & who;
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
break;
case '-':
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
mode &= ~(perm & who);
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
break;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
}
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
/* if we hit a comma, move on to the next clause */
Sort includes and more cleanup and fixes in util/
2014-11-13 18:54:28 +00:00
if (*p == ',') {
Fix symbolic mode parsing in parsemode I found quite a lot of bugs, so I ended up pretty much rewriting as I followed the spec¹. Now, it works as follows: - Determine a mask (who) of bits that can be modified for the subsequent operations. If none are specified, select all file mode bits. - In a loop, determine which operation (+, -, =) to apply. - If the next character is a permcopy (u, g, o), set the new permissions (perm) corresponding to the bits set in the user, group or other parts of the existing mode. - Otherwise, set the new permissions by looping through the next r, w, x, s, t characters. - Now, the set of bits we want to add or remove is (who & perm). Set or remove these bits according the the operation (first clearing the appropriate bits if the operation is =). - Continue from the top if the next character is a comma, otherwise, process the next operation. I tested this on some made up inputs, and I believe it is working correctly now: parsemode("g+w", 0644, 0), before: 0606, now: 0664, fixed parsemode("u+rx", 0222, 0), before: 0077, now: 0722, fixed parsemode("+x", 0644, 023), before: 0754, now: 0754, still works parsemode("+w", 0444, 022), before: 0644, now: 0644, still works parsemode("+w", 0444, 0), before: 0666, now: 0666, still works parsemode("+s", 0755, 0), before: 0755, now: 6755, fixed parsemode("u+s", 0755, 0), before: 0055, now: 4755, fixed parsemode("g+s", 0755, 0), before: 0705, now: 2755, fixed parsemode("g=u", 0700, 0), before: 0000, now: 0770, fixed parsemode("go=u-w", 0700, 0), before: 0000, now: 0755, fixed parsemode("o+u-g", 0641, 0), before: 0000, now: 0643, fixed parsemode("u=rx,o+w,g-r", 0654, 0) before: error, now: 0516, fixed parsemode(",", 0654, 0), before: error, now: error, still works ¹ http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chmod.html
2014-11-02 22:24:52 +00:00
p++;
goto next;
}
parsemode: rework - for octal input: reset mode to 0. - take umask into account. - make '=rwx' etc work. - we wont support crazy but valid modes like "a+rw,g=x,o=g" - uudecode: use parsemode, mask is 0. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-23 19:28:59 +00:00
}
chmod: Implement X perm symbol Instead of clearing the format bits before calling parsemode, leave them in so we can differentiate between directories and other files, then clear the format bits in the result.
2020-01-06 21:08:38 +00:00
return mode & ~S_IFMT;
make parsemode() generic use for uudecode and chmod Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-04-09 13:17:20 +00:00
}