github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added g_umask_hex() call

Browse Source
This commit is contained in:
matt335672
2022-03-23 12:14:54 +00:00
parent 4bfeddbbed
commit 0a54106866
2 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/os_calls.c
+64 -15
View File
@@ -2322,6 +2322,55 @@ g_file_lock(int fd, int start, int len)
#endif #endif
} }
/*****************************************************************************/
/* Converts a hex mask to a mode_t value */
#if !defined(_WIN32)
static mode_t
hex_to_mode_t(int hex)
{
mode_t mode = 0;
mode |= (hex & 0x4000) ? S_ISUID : 0;
mode |= (hex & 0x2000) ? S_ISGID : 0;
mode |= (hex & 0x1000) ? S_ISVTX : 0;
mode |= (hex & 0x0400) ? S_IRUSR : 0;
mode |= (hex & 0x0200) ? S_IWUSR : 0;
mode |= (hex & 0x0100) ? S_IXUSR : 0;
mode |= (hex & 0x0040) ? S_IRGRP : 0;
mode |= (hex & 0x0020) ? S_IWGRP : 0;
mode |= (hex & 0x0010) ? S_IXGRP : 0;
mode |= (hex & 0x0004) ? S_IROTH : 0;
mode |= (hex & 0x0002) ? S_IWOTH : 0;
mode |= (hex & 0x0001) ? S_IXOTH : 0;
return mode;
}
#endif
/*****************************************************************************/
/* Converts a mode_t value to a hex mask */
#if !defined(_WIN32)
static int
mode_t_to_hex(mode_t mode)
{
int hex = 0;
hex |= (mode & S_ISUID) ? 0x4000 : 0;
hex |= (mode & S_ISGID) ? 0x2000 : 0;
hex |= (mode & S_ISVTX) ? 0x1000 : 0;
hex |= (mode & S_IRUSR) ? 0x0400 : 0;
hex |= (mode & S_IWUSR) ? 0x0200 : 0;
hex |= (mode & S_IXUSR) ? 0x0100 : 0;
hex |= (mode & S_IRGRP) ? 0x0040 : 0;
hex |= (mode & S_IWGRP) ? 0x0020 : 0;
hex |= (mode & S_IXGRP) ? 0x0010 : 0;
hex |= (mode & S_IROTH) ? 0x0004 : 0;
hex |= (mode & S_IWOTH) ? 0x0002 : 0;
hex |= (mode & S_IXOTH) ? 0x0001 : 0;
return hex;
}
#endif
/*****************************************************************************/ /*****************************************************************************/
/* returns error */ /* returns error */
int int
@@ -2330,22 +2379,22 @@ g_chmod_hex(const char *filename, int flags)
#if defined(_WIN32) #if defined(_WIN32)
return 0; return 0;
#else #else
int fl; mode_t m = hex_to_mode_t(flags);
return chmod(filename, m);
#endif
}
fl = 0; /*****************************************************************************/
fl |= (flags & 0x4000) ? S_ISUID : 0; /* returns error */
fl |= (flags & 0x2000) ? S_ISGID : 0; int
fl |= (flags & 0x1000) ? S_ISVTX : 0; g_umask_hex(int flags)
fl |= (flags & 0x0400) ? S_IRUSR : 0; {
fl |= (flags & 0x0200) ? S_IWUSR : 0; #if defined(_WIN32)
fl |= (flags & 0x0100) ? S_IXUSR : 0; return flags;
fl |= (flags & 0x0040) ? S_IRGRP : 0; #else
fl |= (flags & 0x0020) ? S_IWGRP : 0; mode_t m = hex_to_mode_t(flags);
fl |= (flags & 0x0010) ? S_IXGRP : 0; m = umask(m);
fl |= (flags & 0x0004) ? S_IROTH : 0; return mode_t_to_hex(m);
fl |= (flags & 0x0002) ? S_IWOTH : 0;
fl |= (flags & 0x0001) ? S_IXOTH : 0;
return chmod(filename, fl);
#endif #endif
} }
common/os_calls.h
+1
View File
@@ -128,6 +128,7 @@ int g_file_write(int fd, const char *ptr, int len);
int g_file_seek(int fd, int offset); int g_file_seek(int fd, int offset);
int g_file_lock(int fd, int start, int len); int g_file_lock(int fd, int start, int len);
int g_chmod_hex(const char *filename, int flags); int g_chmod_hex(const char *filename, int flags);
int g_umask_hex(int flags);
int g_chown(const char *name, int uid, int gid); int g_chown(const char *name, int uid, int gid);
int g_mkdir(const char *dirname); int g_mkdir(const char *dirname);
char *g_get_current_dir(char *dirname, int maxlen); char *g_get_current_dir(char *dirname, int maxlen);