Author: Amaury Forgeot d'Arc <amaur...@gmail.com> Branch: more-rposix Changeset: r74367:048ec065ff5a Date: 2014-11-07 00:54 +0100 http://bitbucket.org/pypy/pypy/changeset/048ec065ff5a/
Log: Move uid/gid functions diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py --- a/rpython/rlib/rposix.py +++ b/rpython/rlib/rposix.py @@ -588,11 +588,51 @@ c_setsid = external('setsid', [], rffi.PID_T) c_getsid = external('getsid', [rffi.PID_T], rffi.PID_T) +c_getuid = external('getuid', [], rffi.INT) +c_geteuid = external('geteuid', [], rffi.INT) +c_setuid = external('setuid', [rffi.INT], rffi.INT) +c_seteuid = external('seteuid', [rffi.INT], rffi.INT) +c_getgid = external('getgid', [], rffi.INT) +c_getegid = external('getegid', [], rffi.INT) +c_setgid = external('setgid', [rffi.INT], rffi.INT) +c_setegid = external('setegid', [rffi.INT], rffi.INT) @replace_os_function('setsid') def setsid(): - return handle_posix_error('os_setsid', c_setsid()) + return handle_posix_error('setsid', c_setsid()) @replace_os_function('getsid') def getsid(pid): - return handle_posix_error('os_setsid', c_getsid(pid)) + return handle_posix_error('getsid', c_getsid(pid)) + +@replace_os_function('getuid') +def getuid(): + return handle_posix_error('getuid', c_getuid()) + +@replace_os_function('geteuid') +def geteuid(): + return handle_posix_error('geteuid', c_geteuid()) + +@replace_os_function('setuid') +def setuid(uid): + return handle_posix_error('setuid', c_setuid(uid)) + +@replace_os_function('seteuid') +def seteuid(uid): + return handle_posix_error('seteuid', c_seteuid(uid)) + +@replace_os_function('getgid') +def getgid(): + return handle_posix_error('getgid', c_getgid()) + +@replace_os_function('getegid') +def getegid(): + return handle_posix_error('getegid', c_getegid()) + +@replace_os_function('setgid') +def setgid(gid): + return handle_posix_error('setgid', c_setgid(gid)) + +@replace_os_function('setegid') +def setegid(gid): + return handle_posix_error('setegid', c_setegid(gid)) diff --git a/rpython/rtyper/module/ll_os.py b/rpython/rtyper/module/ll_os.py --- a/rpython/rtyper/module/ll_os.py +++ b/rpython/rtyper/module/ll_os.py @@ -365,42 +365,10 @@ return extdef([int], SomeString(can_be_None=True), "ll_os.ll_confstr", llimpl=confstr_llimpl) - @registering_if(os, 'getuid') - def register_os_getuid(self): - return self.extdef_for_os_function_returning_int('getuid') - - @registering_if(os, 'geteuid') - def register_os_geteuid(self): - return self.extdef_for_os_function_returning_int('geteuid') - - @registering_if(os, 'setuid') - def register_os_setuid(self): - return self.extdef_for_os_function_accepting_int('setuid') - - @registering_if(os, 'seteuid') - def register_os_seteuid(self): - return self.extdef_for_os_function_accepting_int('seteuid') - - @registering_if(os, 'setgid') - def register_os_setgid(self): - return self.extdef_for_os_function_accepting_int('setgid') - - @registering_if(os, 'setegid') - def register_os_setegid(self): - return self.extdef_for_os_function_accepting_int('setegid') - @registering_if(os, 'getpid') def register_os_getpid(self): return self.extdef_for_os_function_returning_int('getpid', releasegil=False) - @registering_if(os, 'getgid') - def register_os_getgid(self): - return self.extdef_for_os_function_returning_int('getgid') - - @registering_if(os, 'getegid') - def register_os_getegid(self): - return self.extdef_for_os_function_returning_int('getegid') - @registering_if(os, 'getgroups') def register_os_getgroups(self): GP = rffi.CArrayPtr(rffi.PID_T) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit