diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-04-06 15:13:59 +0200 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-04-06 15:13:59 +0200 |
| commit | 3b3285b1b7c02d36c74a6ae265fdb02ca991c96b (patch) | |
| tree | 0f3bf060794323ff690f6f4a86dc903c4570f540 /utils | |
| parent | 289d19f45d7f8af9a4079938a3426aafdd2674ba (diff) | |
| parent | 85f4b028d767fc390a7b866d2f58d58be489242d (diff) | |
Merge remote-tracking branch 'origin/master' into prelink
* origin/master: (137 commits)
utils/ldd: Check for returned pointer from strrchr not the value it holds
cris: add provide arch-specific vfork implementation
lutimes.c, stubs.c: fix compiling lutimes, if __NR_utimensat is not defined
bump version to 0.9.32-rc3-git
release 0.9.32-rc3
memalign: include sys/param.h for MAX
arm/bits/atomic.h: Include common/bit/atomic.h for thumb1
wctype.h: fix libc_hidden_proto for iswupper and add it for iswspace
add libc_hidden_proto for wcs[n]casecmp_l
really fix missing __libc_drand48_data
Revert "missing prototype of __libc_drand48_data fixed"
missing prototype of __libc_drand48_data fixed
time.c, time.h: remove unused hidden strftime/strptime
nanosleep.c: remove duplicated libc_hidden_proto
ctype.c, ctype.h: remove commented parts that were banned for removal after 0.9.31
_wctype.c, wctype.h: remove unused isw* and wctype_l hidden functions
time.c, wchar.h: remove unused hidden wcsftime
str[n]casecmp.c: fix hidden usage
remove unused hidden functions
frv/memset.S: add missing libc_hidden_def
...
Conflicts:
ldso/ldso/ldso.c
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/getconf.c | 1 | ||||
| -rw-r--r-- | utils/ldconfig.c | 2 | ||||
| -rw-r--r-- | utils/ldd.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/utils/getconf.c b/utils/getconf.c index 812783ecf..5ff98e6fc 100644 --- a/utils/getconf.c +++ b/utils/getconf.c @@ -15,6 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE 1 #include <unistd.h> #include <errno.h> #include <string.h> diff --git a/utils/ldconfig.c b/utils/ldconfig.c index a25de260a..024be7ca4 100644 --- a/utils/ldconfig.c +++ b/utils/ldconfig.c @@ -568,7 +568,7 @@ static char *get_extpath(void) if ((file = fopen(realconffile, "r")) != NULL) { fstat(fileno(file), &st); res = xmalloc(st.st_size + 1); - fread(res, 1, st.st_size, file); + (void)fread(res, 1, st.st_size, file); fclose(file); res[st.st_size] = '\0'; diff --git a/utils/ldd.c b/utils/ldd.c index 3858c815c..904075c23 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -553,7 +553,7 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr) interp_name = strdup(s); interp_dir = strdup(s); tmp = strrchr(interp_dir, '/'); - if (*tmp) + if (tmp) *tmp = '\0'; else { free(interp_dir); |