1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/win32.{h,c}: define rb_{p,g,u}id_t.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-05-15 18:36:56 +00:00
parent a8d293220d
commit 208f2f27ca
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon May 16 03:29:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.{h,c}: define rb_{p,g,u}id_t.
Mon May 16 00:21:02 2005 Tanaka Akira <akr@m17n.org> Mon May 16 00:21:02 2005 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb (Pathname#unlink): use SystemCallError instead of * lib/pathname.rb (Pathname#unlink): use SystemCallError instead of

12
win32/win32.c
View File

@ -1772,38 +1772,38 @@ rb_w32_strerror(int e)
#define ROOT_UID 0 #define ROOT_UID 0
#define ROOT_GID 0 #define ROOT_GID 0
UIDTYPE rb_uid_t
getuid(void) getuid(void)
{ {
return ROOT_UID; return ROOT_UID;
} }
UIDTYPE rb_uid_t
geteuid(void) geteuid(void)
{ {
return ROOT_UID; return ROOT_UID;
} }
GIDTYPE rb_gid_t
getgid(void) getgid(void)
{ {
return ROOT_GID; return ROOT_GID;
} }
GIDTYPE rb_gid_t
getegid(void) getegid(void)
{ {
return ROOT_GID; return ROOT_GID;
} }
int int
setuid(int uid) setuid(rb_uid_t uid)
{ {
return (uid == ROOT_UID ? 0 : -1); return (uid == ROOT_UID ? 0 : -1);
} }
int int
setgid(int gid) setgid(rb_gid_t gid)
{ {
return (gid == ROOT_GID ? 0 : -1); return (gid == ROOT_GID ? 0 : -1);
} }

24
win32/win32.h
View File

@ -69,9 +69,9 @@ extern "C++" {
} }
#endif #endif
#define UIDTYPE int #define rb_pid_t int
#define GIDTYPE int #define rb_gid_t int
#define pid_t int #define rb_uid_t int
#define WNOHANG -1 #define WNOHANG -1
#undef getc #undef getc
@ -143,7 +143,7 @@ struct timezone {
#endif #endif
extern void NtInitialize(int *, char ***); extern void NtInitialize(int *, char ***);
extern int rb_w32_cmdvector(const char *, char ***); extern int rb_w32_cmdvector(const char *, char ***);
extern pid_t rb_w32_pipe_exec(const char *, const char *, int, int *); extern rb_pid_t rb_w32_pipe_exec(const char *, const char *, int, int *);
extern int flock(int fd, int oper); extern int flock(int fd, int oper);
extern int rb_w32_is_socket(int); extern int rb_w32_is_socket(int);
extern int rb_w32_accept(int, struct sockaddr *, int *); extern int rb_w32_accept(int, struct sockaddr *, int *);
@ -187,14 +187,14 @@ extern int rb_w32_snprintf(char *, size_t, const char *, ...);
extern int chown(const char *, int, int); extern int chown(const char *, int, int);
extern int link(const char *, const char *); extern int link(const char *, const char *);
extern int gettimeofday(struct timeval *, struct timezone *); extern int gettimeofday(struct timeval *, struct timezone *);
extern pid_t waitpid (pid_t, int *, int); extern rb_pid_t waitpid (rb_pid_t, int *, int);
extern int rb_w32_argv_size(char *const *); extern int rb_w32_argv_size(char *const *);
extern char *rb_w32_join_argv(char *, char *const *); extern char *rb_w32_join_argv(char *, char *const *);
extern int rb_w32_spawn(int, const char *, const char*); extern int rb_w32_spawn(int, const char *, const char*);
extern int rb_w32_aspawn(int, const char *, char *const *); extern int rb_w32_aspawn(int, const char *, char *const *);
extern int kill(int, int); extern int kill(int, int);
extern int fcntl(int, int, ...); extern int fcntl(int, int, ...);
extern pid_t rb_w32_getpid(void); extern rb_pid_t rb_w32_getpid(void);
#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) #if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
extern int rb_w32_isatty(int); extern int rb_w32_isatty(int);
#endif #endif
@ -271,12 +271,12 @@ extern FILE *rb_w32_fsopen(const char *, const char *, int);
// stubs // stubs
// //
extern int ioctl (int, int, ...); extern int ioctl (int, int, ...);
extern UIDTYPE getuid (void); extern rb_uid_t getuid (void);
extern UIDTYPE geteuid (void); extern rb_uid_t geteuid (void);
extern GIDTYPE getgid (void); extern rb_gid_t getgid (void);
extern GIDTYPE getegid (void); extern rb_gid_t getegid (void);
extern int setuid (int); extern int setuid (rb_uid_t);
extern int setgid (int); extern int setgid (rb_gid_t);
extern char *rb_w32_strerror(int); extern char *rb_w32_strerror(int);