* Use a real programming language.

This commit is contained in:
Eelco Dolstra 2005-09-30 09:50:51 +00:00
parent 3dd9c1ffca
commit 955d3334ed
3 changed files with 7 additions and 5 deletions

View File

@ -16,5 +16,7 @@ if test "$STABLE" != "1"; then
fi
AC_PROG_CC
AC_PROG_CXX
AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
AC_OUTPUT

View File

@ -1,3 +1,3 @@
bin_PROGRAMS = patchelf
patchelf_SOURCES = patchelf.c
patchelf_SOURCES = patchelf.cc

View File

@ -65,7 +65,7 @@ static void readFile(char * fileName, mode_t * fileMode)
*fileMode = st.st_mode;
maxSize = fileSize + 128 * 1024;
contents = malloc(fileSize + maxSize);
contents = (unsigned char *) malloc(fileSize + maxSize);
if (!contents) abort();
int fd = open(fileName, O_RDONLY);
@ -169,7 +169,7 @@ static void setInterpreter(void)
growFile(phdr->p_offset + interpSize);
phdr->p_vaddr = phdr->p_paddr = firstPage + interpOffset % 4096;
phdr->p_filesz = phdr->p_memsz = interpSize;
strncpy(contents + interpOffset,
strncpy((char *) contents + interpOffset,
newInterpreter, interpSize);
changed = 1;
break;
@ -219,7 +219,7 @@ static void shrinkRPath(void)
if (phdrs[i].p_vaddr <= strTabAddr &&
strTabAddr < phdrs[i].p_vaddr + phdrs[i].p_filesz)
{
strTab = contents +
strTab = (char *) contents +
strTabAddr - phdrs[i].p_vaddr + phdrs[i].p_offset;
}
@ -257,7 +257,7 @@ static void shrinkRPath(void)
for (i = 0; i < nrNeededLibs; ++i)
neededLibFound[i] = 0;
char * newRPath = malloc(strlen(rpath) + 1);
char * newRPath = (char *) malloc(strlen(rpath) + 1);
*newRPath = 0;
char * pos = rpath;