From 3b5b19e7bf4598536bc7ef501598c0f6e28e4e5a Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 15 Aug 2014 10:50:39 -0500 Subject: If string_to_mode() is called on a base mode with S_ISDIR() and such set, pass those extra bits through. --- lib/lib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/lib.c b/lib/lib.c index e16873f0..7911315e 100644 --- a/lib/lib.c +++ b/lib/lib.c @@ -686,15 +686,16 @@ char *num_to_sig(int sig) // premute mode bits based on posix mode strings. mode_t string_to_mode(char *modestr, mode_t mode) { - char *whos = "ogua", *hows = "=+-", *whats = "xwrstX", *whys = "ogu"; - char *s, *str = modestr; + char *whos = "ogua", *hows = "=+-", *whats = "xwrstX", *whys = "ogu", + *s, *str = modestr; + mode_t extrabits = mode & ~(07777); // Handle octal mode if (isdigit(*str)) { mode = strtol(str, &s, 8); if (*s || (mode & ~(07777))) goto barf; - return mode; + return mode | extrabits; } // Gaze into the bin of permission... @@ -762,7 +763,8 @@ mode_t string_to_mode(char *modestr, mode_t mode) if (!*str) break; } - return mode; + + return mode|extrabits; barf: error_exit("bad mode '%s'", modestr); } -- cgit v1.2.3