svn commit: trunk/uClibc/libc: inet inet/rpc misc/dirent misc/ftw misc/ etc...
psm at uclibc.org
psm at uclibc.org
Sun Dec 4 01:08:49 UTC 2005
Author: psm
Date: 2005-12-03 17:08:42 -0800 (Sat, 03 Dec 2005)
New Revision: 12662
Log:
More hiding, 300 left
Modified:
trunk/uClibc/libc/inet/hostid.c
trunk/uClibc/libc/inet/rpc/auth_unix.c
trunk/uClibc/libc/inet/rpc/clnt_perror.c
trunk/uClibc/libc/inet/rpc/clnt_tcp.c
trunk/uClibc/libc/inet/rpc/clnt_udp.c
trunk/uClibc/libc/inet/rpc/clnt_unix.c
trunk/uClibc/libc/inet/rpc/getrpcport.c
trunk/uClibc/libc/inet/rpc/pmap_getport.c
trunk/uClibc/libc/inet/rpc/rcmd.c
trunk/uClibc/libc/inet/rpc/rexec.c
trunk/uClibc/libc/inet/rpc/ruserpass.c
trunk/uClibc/libc/inet/rpc/svc.c
trunk/uClibc/libc/inet/rpc/svc_simple.c
trunk/uClibc/libc/inet/rpc/svc_unix.c
trunk/uClibc/libc/inet/rpc/xdr.c
trunk/uClibc/libc/misc/dirent/scandir.c
trunk/uClibc/libc/misc/dirent/scandir64.c
trunk/uClibc/libc/misc/ftw/ftw.c
trunk/uClibc/libc/misc/glob/glob.c
trunk/uClibc/libc/misc/internals/__uClibc_main.c
trunk/uClibc/libc/misc/ttyent/getttyent.c
trunk/uClibc/libc/misc/wordexp/wordexp.c
trunk/uClibc/libc/stdio/_stdio.h
trunk/uClibc/libc/stdio/popen.c
trunk/uClibc/libc/stdio/scanf.c
trunk/uClibc/libc/stdio/setbuf.c
trunk/uClibc/libc/stdio/setbuffer.c
trunk/uClibc/libc/stdio/setlinebuf.c
trunk/uClibc/libc/stdio/setvbuf.c
trunk/uClibc/libc/stdio/ungetc.c
trunk/uClibc/libc/stdlib/malloc-simple/alloc.c
trunk/uClibc/libc/stdlib/malloc-standard/free.c
trunk/uClibc/libc/stdlib/malloc/free.c
trunk/uClibc/libc/stdlib/stdlib.c
trunk/uClibc/libc/stdlib/system.c
trunk/uClibc/libc/stdlib/unix_grantpt.c
trunk/uClibc/libc/sysdeps/linux/common/execve.c
trunk/uClibc/libc/sysdeps/linux/common/fchdir.c
trunk/uClibc/libc/sysdeps/linux/common/geteuid.c
trunk/uClibc/libc/sysdeps/linux/common/getuid.c
trunk/uClibc/libc/sysdeps/linux/common/munmap.c
trunk/uClibc/libc/unistd/exec.c
trunk/uClibc/libc/unistd/getpass.c
Changeset:
Modified: trunk/uClibc/libc/inet/hostid.c
===================================================================
--- trunk/uClibc/libc/inet/hostid.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/hostid.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -1,3 +1,6 @@
+#define geteuid __geteuid
+#define getuid __getuid
+
#define __FORCE_GLIBC
#include <features.h>
#include <stdio.h>
Modified: trunk/uClibc/libc/inet/rpc/auth_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/auth_unix.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/auth_unix.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -40,6 +40,7 @@
#define sysconf __sysconf
#define getegid __getegid
+#define geteuid __geteuid
#define xdrmem_create __xdrmem_create
#define __FORCE_GLIBC
Modified: trunk/uClibc/libc/inet/rpc/clnt_perror.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_perror.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/clnt_perror.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -302,8 +302,8 @@
}
-char *
-clnt_spcreateerror (const char *msg)
+char attribute_hidden *
+__clnt_spcreateerror (const char *msg)
{
char chrbuf[1024];
char *str = _buf ();
@@ -345,16 +345,17 @@
*++cp = '\0';
return str;
}
+strong_alias(__clnt_spcreateerror,clnt_spcreateerror)
void
clnt_pcreateerror (const char *msg)
{
#ifdef USE_IN_LIBIO
if (_IO_fwide (stderr, 0) > 0)
- (void) __fwprintf (stderr, L"%s", clnt_spcreateerror (msg));
+ (void) __fwprintf (stderr, L"%s", __clnt_spcreateerror (msg));
else
#endif
- (void) fputs (clnt_spcreateerror (msg), stderr);
+ (void) fputs (__clnt_spcreateerror (msg), stderr);
}
struct auth_errtab
Modified: trunk/uClibc/libc/inet/rpc/clnt_tcp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_tcp.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/clnt_tcp.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -53,6 +53,7 @@
#define authnone_create __authnone_create
#define xdrrec_create __xdrrec_create
#define xdrmem_create __xdrmem_create
+#define pmap_getport __pmap_getport
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/clnt_udp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_udp.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/clnt_udp.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -43,6 +43,8 @@
#define authnone_create __authnone_create
#define xdrmem_create __xdrmem_create
+#define pmap_getport __pmap_getport
+
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/clnt_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_unix.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/clnt_unix.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -50,6 +50,7 @@
#define xdrrec_create __xdrrec_create
#define xdrmem_create __xdrmem_create
#define getegid __getegid
+#define geteuid __geteuid
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/getrpcport.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/getrpcport.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/getrpcport.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -35,6 +35,8 @@
* Copyright (c) 1985 by Sun Microsystems, Inc.
*/
+#define pmap_getport __pmap_getport
+
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/pmap_getport.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/pmap_getport.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/pmap_getport.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -53,12 +53,8 @@
* Calls the pmap service remotely to do the lookup.
* Returns 0 if no map exists.
*/
-u_short
-pmap_getport (address, program, version, protocol)
- struct sockaddr_in *address;
- u_long program;
- u_long version;
- u_int protocol;
+u_short attribute_hidden
+__pmap_getport (struct sockaddr_in *address, u_long program, u_long version, u_int protocol)
{
u_short port = 0;
int socket = -1;
@@ -92,3 +88,4 @@
address->sin_port = 0;
return port;
}
+strong_alias(__pmap_getport,pmap_getport)
Modified: trunk/uClibc/libc/inet/rpc/rcmd.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -38,6 +38,7 @@
#define bcopy __bcopy
#define sysconf __sysconf
#define getline __getline
+#define geteuid __geteuid
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/rexec.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rexec.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/rexec.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -47,15 +47,10 @@
int rexecoptions;
char ahostbuf[NI_MAXHOST];
-extern int ruserpass(const char *host, const char **aname, const char **apass);
+extern int __ruserpass(const char *host, const char **aname, const char **apass) attribute_hidden;
-int
-rexec_af(ahost, rport, name, pass, cmd, fd2p, af)
- char **ahost;
- int rport;
- const char *name, *pass, *cmd;
- int *fd2p;
- sa_family_t af;
+int attribute_hidden
+__rexec_af(char **ahost, int rport, const char *name, const char *pass, const char *cmd, int *fd2p, sa_family_t af)
{
struct sockaddr_storage sa2, from;
struct addrinfo hints, *res0;
@@ -88,7 +83,7 @@
else{
*ahost = NULL;
}
- ruserpass(res0->ai_canonname, &name, &pass);
+ __ruserpass(res0->ai_canonname, &name, &pass);
retry:
s = socket(res0->ai_family, res0->ai_socktype, 0);
if (s < 0) {
@@ -179,6 +174,7 @@
freeaddrinfo(res0);
return (-1);
}
+strong_alias(__rexec_af,rexec_af)
int
rexec(ahost, rport, name, pass, cmd, fd2p)
@@ -187,5 +183,5 @@
const char *name, *pass, *cmd;
int *fd2p;
{
- return rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
+ return __rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
}
Modified: trunk/uClibc/libc/inet/rpc/ruserpass.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/ruserpass.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/ruserpass.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -29,7 +29,9 @@
#define __fsetlocking __fsetlocking_internal
#define getgid __getgid
+#define getuid __getuid
#define getegid __getegid
+#define geteuid __geteuid
#define __FORCE_GLIBC
#include <features.h>
@@ -95,7 +97,7 @@
-int ruserpass(const char *host, const char **aname, const char **apass)
+int attribute_hidden __ruserpass(const char *host, const char **aname, const char **apass)
{
char *hdir, *buf, *tmp;
char myname[1024], *mydomain;
@@ -292,6 +294,7 @@
(void) fclose(cfile);
return (-1);
}
+strong_alias(__ruserpass,ruserpass)
static int
token()
Modified: trunk/uClibc/libc/inet/rpc/svc.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/svc.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -230,8 +230,8 @@
/* ******************* REPLY GENERATION ROUTINES ************ */
/* Send a reply to an rpc request */
-bool_t
-svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
+bool_t attribute_hidden
+__svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
caddr_t xdr_location)
{
struct rpc_msg rply;
@@ -244,6 +244,7 @@
rply.acpted_rply.ar_results.proc = xdr_results;
return SVC_REPLY (xprt, &rply);
}
+strong_alias(__svc_sendreply,svc_sendreply)
/* No procedure error reply */
void
@@ -285,8 +286,8 @@
}
/* Authentication error reply */
-void
-svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
+void attribute_hidden
+__svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
{
struct rpc_msg rply;
@@ -296,12 +297,13 @@
rply.rjcted_rply.rj_why = why;
SVC_REPLY (xprt, &rply);
}
+strong_alias(__svcerr_auth,svcerr_auth)
/* Auth too weak error reply */
void
svcerr_weakauth (SVCXPRT *xprt)
{
- svcerr_auth (xprt, AUTH_TOOWEAK);
+ __svcerr_auth (xprt, AUTH_TOOWEAK);
}
/* Program unavailable error reply */
@@ -446,7 +448,7 @@
}
else if ((why = _authenticate (&r, &msg)) != AUTH_OK)
{
- svcerr_auth (xprt, why);
+ __svcerr_auth (xprt, why);
goto call_done;
}
Modified: trunk/uClibc/libc/inet/rpc/svc_simple.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_simple.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/svc_simple.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -37,6 +37,9 @@
*
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
+
+#define svc_sendreply __svc_sendreply
+
#define __FORCE_GLIBC
#define _GNU_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/svc_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_unix.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/svc_unix.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -40,6 +40,7 @@
#define xdrrec_create __xdrrec_create
#define xprt_register __xprt_register
#define getegid __getegid
+#define geteuid __geteuid
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/xdr.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/xdr.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/inet/rpc/xdr.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -220,8 +220,8 @@
* XDR hyper integers
* same as xdr_u_hyper - open coded to save a proc call!
*/
-bool_t
-xdr_hyper (XDR *xdrs, quad_t *llp)
+bool_t attribute_hidden
+__xdr_hyper (XDR *xdrs, quad_t *llp)
{
long t1;
unsigned long int t2;
@@ -247,14 +247,15 @@
return FALSE;
}
+strong_alias(__xdr_hyper,xdr_hyper)
/*
* XDR hyper integers
* same as xdr_hyper - open coded to save a proc call!
*/
-bool_t
-xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
+bool_t attribute_hidden
+__xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
{
unsigned long t1;
unsigned long t2;
@@ -280,17 +281,18 @@
return FALSE;
}
+strong_alias(__xdr_u_hyper,xdr_u_hyper)
bool_t
xdr_longlong_t (XDR *xdrs, quad_t *llp)
{
- return xdr_hyper (xdrs, llp);
+ return __xdr_hyper (xdrs, llp);
}
bool_t
xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
{
- return xdr_u_hyper (xdrs, ullp);
+ return __xdr_u_hyper (xdrs, ullp);
}
/*
Modified: trunk/uClibc/libc/misc/dirent/scandir.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/scandir.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/misc/dirent/scandir.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -20,6 +20,8 @@
/* Modified for uClibc by Erik Andersen
*/
+#define qsort __qsort
+
#include <dirent.h>
#include <stdio.h>
#include <string.h>
Modified: trunk/uClibc/libc/misc/dirent/scandir64.c
===================================================================
--- trunk/uClibc/libc/misc/dirent/scandir64.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/misc/dirent/scandir64.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -20,6 +20,8 @@
/* Modified for uClibc by Erik Andersen
*/
+#define qsort __qsort
+
#include <features.h>
#ifdef __UCLIBC_HAS_LFS__
#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
Modified: trunk/uClibc/libc/misc/ftw/ftw.c
===================================================================
--- trunk/uClibc/libc/misc/ftw/ftw.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/misc/ftw/ftw.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -25,6 +25,7 @@
#define stpcpy __stpcpy
#define tsearch __tsearch
#define tdestroy __tdestroy
+#define fchdir __fchdir
#define _GNU_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/misc/glob/glob.c
===================================================================
--- trunk/uClibc/libc/misc/glob/glob.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/misc/glob/glob.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -17,6 +17,7 @@
#define strrchr __strrchr
#define strcoll __strcoll
+#define qsort __qsort
#include <features.h>
#include <stdlib.h>
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -14,7 +14,9 @@
*/
#define getgid __getgid
+#define getuid __getuid
#define getegid __getegid
+#define geteuid __geteuid
#define _ERRNO_H
#include <features.h>
Modified: trunk/uClibc/libc/misc/ttyent/getttyent.c
===================================================================
--- trunk/uClibc/libc/misc/ttyent/getttyent.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/misc/ttyent/getttyent.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -46,19 +46,6 @@
static struct ttyent tty;
-struct ttyent * getttynam(const char *tty)
-{
- register struct ttyent *t;
-
- setttyent();
- while ((t = getttyent()))
- if (!__strcmp(tty, t->ty_name))
- break;
- endttyent();
- return (t);
-}
-
-
/* Skip over the current field, removing quotes, and return
* a pointer to the next field.
*/
@@ -101,13 +88,30 @@
return ((p = __strchr(p, '=')) ? ++p : NULL);
}
-struct ttyent * getttyent(void)
+int attribute_hidden __setttyent(void)
{
+
+ if (tf) {
+ rewind(tf);
+ return (1);
+ } else if ((tf = fopen(_PATH_TTYS, "r"))) {
+ /* We do the locking ourselves. */
+#ifdef __UCLIBC_HAS_THREADS__
+ __fsetlocking (tf, FSETLOCKING_BYCALLER);
+#endif
+ return (1);
+ }
+ return (0);
+}
+strong_alias(__setttyent,setttyent)
+
+struct ttyent attribute_hidden * __getttyent(void)
+{
register int c;
register char *p;
static char *line = NULL;
- if (!tf && !setttyent())
+ if (!tf && !__setttyent())
return (NULL);
if (!line) {
@@ -177,25 +181,10 @@
*p = '\0';
return (&tty);
}
+strong_alias(__getttyent,getttyent)
-int setttyent(void)
+int attribute_hidden __endttyent(void)
{
-
- if (tf) {
- rewind(tf);
- return (1);
- } else if ((tf = fopen(_PATH_TTYS, "r"))) {
- /* We do the locking ourselves. */
-#ifdef __UCLIBC_HAS_THREADS__
- __fsetlocking (tf, FSETLOCKING_BYCALLER);
-#endif
- return (1);
- }
- return (0);
-}
-
-int endttyent(void)
-{
int rval;
if (tf) {
@@ -205,3 +194,16 @@
}
return (1);
}
+strong_alias(__endttyent,endttyent)
+
+struct ttyent * getttynam(const char *tty)
+{
+ register struct ttyent *t;
+
+ __setttyent();
+ while ((t = __getttyent()))
+ if (!__strcmp(tty, t->ty_name))
+ break;
+ __endttyent();
+ return (t);
+}
Modified: trunk/uClibc/libc/misc/wordexp/wordexp.c
===================================================================
--- trunk/uClibc/libc/misc/wordexp/wordexp.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/misc/wordexp/wordexp.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -26,6 +26,8 @@
#define unsetenv __unsetenv
#define waitpid __waitpid
#define kill __kill
+#define getuid __getuid
+#define execve __execve
#define _GNU_SOURCE
#include <sys/cdefs.h>
Modified: trunk/uClibc/libc/stdio/_stdio.h
===================================================================
--- trunk/uClibc/libc/stdio/_stdio.h 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/_stdio.h 2005-12-04 01:08:42 UTC (rev 12662)
@@ -260,6 +260,8 @@
extern int __stdio_trans2r_o(FILE *__restrict stream, int oflag) attribute_hidden;
extern int __stdio_trans2w_o(FILE *__restrict stream, int oflag) attribute_hidden;
+extern int __setvbuf (FILE *__restrict __stream, char *__restrict __buf,
+ int __modes, size_t __n) __THROW attribute_hidden;
/**********************************************************************/
#ifdef __STDIO_BUFFERS
Modified: trunk/uClibc/libc/stdio/popen.c
===================================================================
--- trunk/uClibc/libc/stdio/popen.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/popen.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -15,6 +15,7 @@
*/
#define waitpid __waitpid
+#define execl __execl
#include <stdio.h>
#include <stdlib.h>
Modified: trunk/uClibc/libc/stdio/scanf.c
===================================================================
--- trunk/uClibc/libc/stdio/scanf.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/scanf.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -46,6 +46,7 @@
#define wcslen __wcslen
#define mbsrtowcs __mbsrtowcs
#define mbrtowc __mbrtowc
+#define ungetc __ungetc
#define _ISOC99_SOURCE /* for LLONG_MAX primarily... */
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/stdio/setbuf.c
===================================================================
--- trunk/uClibc/libc/stdio/setbuf.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/setbuf.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -10,6 +10,6 @@
void setbuf(FILE * __restrict stream, register char * __restrict buf)
{
#ifdef __STDIO_BUFFERS
- setvbuf(stream, buf, ((buf != NULL) ? _IOFBF : _IONBF), BUFSIZ);
+ __setvbuf(stream, buf, ((buf != NULL) ? _IOFBF : _IONBF), BUFSIZ);
#endif
}
Modified: trunk/uClibc/libc/stdio/setbuffer.c
===================================================================
--- trunk/uClibc/libc/stdio/setbuffer.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/setbuffer.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -16,6 +16,6 @@
size_t size)
{
#ifdef __STDIO_BUFFERS
- setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), size);
+ __setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), size);
#endif
}
Modified: trunk/uClibc/libc/stdio/setlinebuf.c
===================================================================
--- trunk/uClibc/libc/stdio/setlinebuf.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/setlinebuf.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -15,6 +15,6 @@
void setlinebuf(FILE * __restrict stream)
{
#ifdef __STDIO_BUFFERS
- setvbuf(stream, NULL, _IOLBF, (size_t) 0);
+ __setvbuf(stream, NULL, _IOLBF, (size_t) 0);
#endif
}
Modified: trunk/uClibc/libc/stdio/setvbuf.c
===================================================================
--- trunk/uClibc/libc/stdio/setvbuf.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/setvbuf.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -14,7 +14,7 @@
#error Assumption violated for buffering mode flags
#endif
-int setvbuf(register FILE * __restrict stream, register char * __restrict buf,
+int attribute_hidden __setvbuf(register FILE * __restrict stream, register char * __restrict buf,
int mode, size_t size)
{
#ifdef __STDIO_BUFFERS
@@ -104,3 +104,4 @@
#endif
}
+strong_alias(__setvbuf,setvbuf)
Modified: trunk/uClibc/libc/stdio/ungetc.c
===================================================================
--- trunk/uClibc/libc/stdio/ungetc.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdio/ungetc.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -24,7 +24,7 @@
* (See section 7.19.6.2 of the C9X rationale -- WG14/N897.)
*/
-int ungetc(int c, register FILE *stream)
+int attribute_hidden __ungetc(int c, register FILE *stream)
{
__STDIO_AUTO_THREADLOCK_VAR;
@@ -75,3 +75,4 @@
return c;
}
+strong_alias(__ungetc,ungetc)
Modified: trunk/uClibc/libc/stdlib/malloc/free.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/free.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdlib/malloc/free.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -11,6 +11,8 @@
* Written by Miles Bader <miles at gnu.org>
*/
+#define munmap __munmap
+
#include <stdlib.h>
#include <unistd.h>
#include <sys/mman.h>
Modified: trunk/uClibc/libc/stdlib/malloc-simple/alloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-simple/alloc.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdlib/malloc-simple/alloc.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -6,6 +6,8 @@
* Parts of the memalign code were stolen from malloc-930716.
*/
+#define munmap __munmap
+
#define _GNU_SOURCE
#include <features.h>
#include <unistd.h>
Modified: trunk/uClibc/libc/stdlib/malloc-standard/free.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-standard/free.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdlib/malloc-standard/free.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -14,6 +14,8 @@
Hacked up for uClibc by Erik Andersen <andersen at codepoet.org>
*/
+#define munmap __munmap
+
#include "malloc.h"
Modified: trunk/uClibc/libc/stdlib/stdlib.c
===================================================================
--- trunk/uClibc/libc/stdlib/stdlib.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdlib/stdlib.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -750,7 +750,7 @@
* calculation, as well as to reduce the generated code size with
* bcc and gcc. */
-void qsort (void *base,
+void attribute_hidden __qsort (void *base,
size_t nel,
size_t width,
int (*comp)(const void *, const void *))
@@ -795,6 +795,7 @@
} while (wgap);
}
}
+strong_alias(__qsort,qsort)
/* ---------- original snippets version below ---------- */
Modified: trunk/uClibc/libc/stdlib/system.c
===================================================================
--- trunk/uClibc/libc/stdlib/system.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdlib/system.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -1,4 +1,5 @@
#define wait4 __wait4
+#define execl __execl
#include <stdio.h>
#include <stddef.h>
Modified: trunk/uClibc/libc/stdlib/unix_grantpt.c
===================================================================
--- trunk/uClibc/libc/stdlib/unix_grantpt.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/stdlib/unix_grantpt.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -19,6 +19,7 @@
#define memchr __memchr
#define getgid __getgid
+#define getuid __getuid
#define setrlimit __setrlimit
#define waitpid __waitpid
Modified: trunk/uClibc/libc/sysdeps/linux/common/execve.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/execve.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/sysdeps/linux/common/execve.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -16,7 +16,8 @@
static inline _syscall3(int, __syscall_execve, const char *, filename,
char *const *, argv, char *const *, envp);
-int execve(const char * filename, char *const * argv, char *const * envp)
+int attribute_hidden __execve(const char * filename, char *const * argv, char *const * envp)
{
return __syscall_execve(filename, argv, envp);
}
+strong_alias(__execve,execve)
Modified: trunk/uClibc/libc/sysdeps/linux/common/fchdir.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/fchdir.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/sysdeps/linux/common/fchdir.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -9,4 +9,6 @@
#include "syscalls.h"
#include <unistd.h>
-_syscall1(int, fchdir, int, fd);
+#define __NR___fchdir __NR_fchdir
+attribute_hidden _syscall1(int, __fchdir, int, fd);
+strong_alias(__fchdir,fchdir)
Modified: trunk/uClibc/libc/sysdeps/linux/common/geteuid.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/geteuid.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/sysdeps/linux/common/geteuid.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -7,19 +7,22 @@
* GNU Library General Public License (LGPL) version 2 or later.
*/
+#define getuid __getuid
+
#include "syscalls.h"
#include <unistd.h>
#ifdef __NR_geteuid
#define __NR___syscall_geteuid __NR_geteuid
static inline _syscall0(int, __syscall_geteuid);
-uid_t geteuid(void)
+uid_t attribute_hidden __geteuid(void)
{
return (__syscall_geteuid());
}
#else
-uid_t geteuid(void)
+uid_t attribute_hidden __geteuid(void)
{
return (getuid());
}
#endif
+strong_alias(__geteuid,geteuid)
Modified: trunk/uClibc/libc/sysdeps/linux/common/getuid.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getuid.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/sysdeps/linux/common/getuid.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -17,7 +17,8 @@
static inline _syscall0(int, __syscall_getuid);
-uid_t getuid(void)
+uid_t attribute_hidden __getuid(void)
{
return (__syscall_getuid());
}
+strong_alias(__getuid,getuid)
Modified: trunk/uClibc/libc/sysdeps/linux/common/munmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/munmap.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/sysdeps/linux/common/munmap.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -10,4 +10,6 @@
#include "syscalls.h"
#include <unistd.h>
#include <sys/mman.h>
-_syscall2(int, munmap, void *, start, size_t, length);
+#define __NR___munmap __NR_munmap
+attribute_hidden _syscall2(int, __munmap, void *, start, size_t, length);
+strong_alias(__munmap,munmap)
Modified: trunk/uClibc/libc/unistd/exec.c
===================================================================
--- trunk/uClibc/libc/unistd/exec.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/unistd/exec.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -30,6 +30,9 @@
* to free the storage allocated for the copy. Better ideas anyone?
*/
+#define munmap __munmap
+#define execve __execve
+
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
@@ -91,7 +94,7 @@
/**********************************************************************/
#ifdef L_execl
-int execl(const char *path, const char *arg, ...)
+int attribute_hidden __execl(const char *path, const char *arg, ...)
{
EXEC_ALLOC_SIZE(size) /* Do NOT add a semicolon! */
int n;
@@ -122,6 +125,7 @@
return n;
}
+strong_alias(__execl,execl)
#endif
/**********************************************************************/
@@ -174,6 +178,8 @@
/**********************************************************************/
#ifdef L_execlp
+extern int __execvp(const char *path, char *const argv[]) attribute_hidden;
+
int execlp(const char *file, const char *arg, ...)
{
EXEC_ALLOC_SIZE(size) /* Do NOT add a semicolon! */
@@ -215,7 +221,7 @@
* /bin, and then /usr/bin. */
static const char default_path[] = ":/bin:/usr/bin";
-int execvp(const char *path, char *const argv[])
+int attribute_hidden __execvp(const char *path, char *const argv[])
{
char *buf = NULL;
char *p;
@@ -312,6 +318,7 @@
return -1;
}
+strong_alias(__execvp,execvp)
#endif
/**********************************************************************/
Modified: trunk/uClibc/libc/unistd/getpass.c
===================================================================
--- trunk/uClibc/libc/unistd/getpass.c 2005-12-03 23:36:38 UTC (rev 12661)
+++ trunk/uClibc/libc/unistd/getpass.c 2005-12-04 01:08:42 UTC (rev 12662)
@@ -16,6 +16,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#define setvbuf __setvbuf
+
#include <stdio.h>
#include <string.h>
#include <termios.h>
More information about the uClibc-cvs
mailing list