From fc10b24accd082fb33c8f92ff8b92481c22fe3dc Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 13 Jan 2010 17:48:34 -0800 Subject: [PATCH] Add implementation of fdprintf, clearenv, and stubs for ttyname_r, *usershell Change-Id: I5fe7e8b6ee5edbb49e707c3b6737a58563781fa3 --- libc/Android.mk | 2 ++ libc/bionic/clearenv.c | 39 ++++++++++++++++++++++++++++ libc/bionic/fdprintf.c | 58 ++++++++++++++++++++++++++++++++++++++++++ libc/bionic/stubs.c | 23 +++++++++++++++++ libc/include/stdio.h | 11 ++++++++ libc/include/unistd.h | 6 +++++ 6 files changed, 139 insertions(+) create mode 100644 libc/bionic/clearenv.c create mode 100644 libc/bionic/fdprintf.c diff --git a/libc/Android.mk b/libc/Android.mk index 0d3e2c35b..c32cc30fe 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -222,11 +222,13 @@ libc_common_src_files := \ bionic/arc4random.c \ bionic/basename.c \ bionic/basename_r.c \ + bionic/clearenv.c \ bionic/dirname.c \ bionic/dirname_r.c \ bionic/drand48.c \ bionic/erand48.c \ bionic/err.c \ + bionic/fdprintf.c \ bionic/fork.c \ bionic/fts.c \ bionic/if_nametoindex.c \ diff --git a/libc/bionic/clearenv.c b/libc/bionic/clearenv.c new file mode 100644 index 000000000..ffc58d9fe --- /dev/null +++ b/libc/bionic/clearenv.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +extern char** environ; + +int clearenv(void) +{ + char **P = environ; + int offset; + + for (P = &environ[offset]; *P; ++P) + *P = 0; + return 0; +} diff --git a/libc/bionic/fdprintf.c b/libc/bionic/fdprintf.c new file mode 100644 index 000000000..c1d05add5 --- /dev/null +++ b/libc/bionic/fdprintf.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +int vfdprintf(int fd, const char * __restrict format, __va_list ap) +{ + char *buf=0; + int ret; + ret = vasprintf(&buf, format, ap); + if (ret < 0) + goto end; + + ret = write(fd, buf, ret); + free(buf); +end: + return ret; +} + +int fdprintf(int fd, const char * __restrict format, ...) +{ + __va_list ap; + int ret; + + va_start(ap, format); + ret = vfdprintf(fd, format, ap); + va_end(ap); + + return ret; +} diff --git a/libc/bionic/stubs.c b/libc/bionic/stubs.c index 365f21a2a..586d4977e 100644 --- a/libc/bionic/stubs.c +++ b/libc/bionic/stubs.c @@ -361,6 +361,12 @@ char* ttyname(int fd) return NULL; } +int ttyname_r(int fd, char *buf, size_t buflen) +{ + fprintf(stderr, "FIX ME! implement ttyname_r() %s:%d\n", __FILE__, __LINE__); + return -ERANGE; +} + struct netent *getnetbyaddr(uint32_t net, int type) { fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); @@ -378,3 +384,20 @@ struct protoent *getprotobynumber(int proto) fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); return NULL; } + +char* getusershell(void) +{ + fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); + return NULL; +} + +void setusershell(void) +{ + fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); +} + +void endusershell(void) +{ + fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); +} + diff --git a/libc/include/stdio.h b/libc/include/stdio.h index 791b26083..f0e103e0f 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -437,4 +437,15 @@ static __inline int __sputc(int _c, FILE *_p) { #define getchar_unlocked() getc_unlocked(stdin) #define putchar_unlocked(c) putc_unlocked(c, stdout) +#ifdef _GNU_SOURCE +/* + * glibc defines dprintf(int, const char*, ...), which is poorly named + * and likely to conflict with locally defined debugging printfs + * fdprintf is a better name, and some programs that use fdprintf use a + * #define fdprintf dprintf for compatibility + */ +int fdprintf(int, const char*, ...); +int vfdprintf(int, const char*, __va_list); +#endif /* _GNU_SOURCE */ + #endif /* _STDIO_H_ */ diff --git a/libc/include/unistd.h b/libc/include/unistd.h index 954f34e2f..b4f1dda17 100644 --- a/libc/include/unistd.h +++ b/libc/include/unistd.h @@ -99,6 +99,10 @@ extern int setfsuid(uid_t); extern int issetugid(void); extern char* getlogin(void); extern int getlogin_r(char* name, size_t namesize); +extern char* getusershell(void); +extern void setusershell(void); +extern void endusershell(void); + /* Macros for access() */ @@ -163,6 +167,8 @@ extern char *optarg; extern int optind, opterr, optopt; extern int isatty(int); +extern char* ttyname(int); +extern int ttyname_r(int, char*, size_t); extern int acct(const char* filepath);