svn commit: trunk/uClibc/libc/misc/internals
vda at uclibc.org
vda at uclibc.org
Sun May 25 06:08:34 UTC 2008
Author: vda
Date: 2008-05-24 23:08:33 -0700 (Sat, 24 May 2008)
New Revision: 22074
Log:
__uClibc_main.c: save ~70 bytes by not checking that /dev/null
is indeed a char device with correct (maj,min).
(If it's not such a char device, the system is screwed anyway,
nothing can be done about it...)
text data bss dec hex filename
- 715 4 21 740 2e4 libc/misc/internals/__uClibc_main.o
+ 644 4 21 669 29d libc/misc/internals/__uClibc_main.o
Modified:
trunk/uClibc/libc/misc/internals/__uClibc_main.c
Changeset:
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2008-05-25 04:31:54 UTC (rev 22073)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2008-05-25 06:08:33 UTC (rev 22074)
@@ -132,16 +132,14 @@
static void __check_one_fd(int fd, int mode)
{
/* Check if the specified fd is already open */
- if (unlikely(__libc_fcntl(fd, F_GETFD)==-1 && *(__errno_location())==EBADF))
+ if (__libc_fcntl(fd, F_GETFD) == -1)
{
/* The descriptor is probably not open, so try to use /dev/null */
- struct stat st;
int nullfd = __libc_open(_PATH_DEVNULL, mode);
/* /dev/null is major=1 minor=3. Make absolutely certain
* that is in fact the device that we have opened and not
* some other wierd file... */
- if ( (nullfd!=fd) || fstat(fd, &st) || !S_ISCHR(st.st_mode) ||
- (st.st_rdev != makedev(1, 3)))
+ if (nullfd!=fd)
{
abort();
}
@@ -155,13 +153,13 @@
uid = getuid();
euid = geteuid();
+ if (uid != euid)
+ return 1;
gid = getgid();
egid = getegid();
-
- if(uid == euid && gid == egid) {
- return 0;
- }
- return 1;
+ if (gid != egid)
+ return 1;
+ return 0; /* we are not suid */
}
#endif
More information about the uClibc-cvs
mailing list