cleanup style; no functional changes

4 files changed, 952 insertions, 1020 deletions

diff --git a/utils/chroot_realpath.c b/utils/chroot_realpath.c
index dd33c3fc0..0785c6c5b 100644
--- a/utils/chroot_realpath.c
+++ b/utils/chroot_realpath.c
@@ -29,14 +29,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <limits.h>				/* for PATH_MAX */
-#include <sys/param.h>			/* for MAXPATHLEN */
+#include <limits.h>		/* for PATH_MAX */
+#include <sys/param.h>		/* for MAXPATHLEN */
 #include <errno.h>
 #ifndef __set_errno
 #define __set_errno(val) ((errno) = (val))
 #endif
 
-#include <sys/stat.h>			/* for S_IFLNK */
+#include <sys/stat.h>		/* for S_IFLNK */
 
 #ifndef PATH_MAX
 #define PATH_MAX _POSIX_PATH_MAX
@@ -44,7 +44,8 @@
 
 #define MAX_READLINKS 32
 
-char *chroot_realpath(const char *chroot, const char *path, char resolved_path[])
+char *chroot_realpath(const char *chroot, const char *path,
+		      char resolved_path[])
 {
 	char copy_path[PATH_MAX];
 	char link_path[PATH_MAX];
@@ -103,7 +104,7 @@ char *chroot_realpath(const char *chroot, const char *path, char resolved_path[]
 					if (new_path == got_path_root + 1)
 						continue;
 					/* Handle ".." by backing up. */
-					while ((--new_path)[-1] != '/');
+					while ((--new_path)[-1] != '/') ;
 					continue;
 				}
 			}
@@ -144,7 +145,7 @@ char *chroot_realpath(const char *chroot, const char *path, char resolved_path[]
 				new_path = got_path_root;
 			else
 				/* Otherwise back up over this component. */
-				while (*(--new_path) != '/');
+				while (*(--new_path) != '/') ;
 			/* Safe sex check. */
 			if (strlen(path) + n >= PATH_MAX - 2) {
 				__set_errno(ENAMETOOLONG);
@@ -155,7 +156,7 @@ char *chroot_realpath(const char *chroot, const char *path, char resolved_path[]
 			strcpy(copy_path, link_path);
 			path = copy_path;
 		}
-#endif							/* S_IFLNK */
+#endif				/* S_IFLNK */
 		*new_path++ = '/';
 	}
 	/* Delete trailing slash but don't whomp a lone slash. */
diff --git a/utils/ldconfig.c b/utils/ldconfig.c
index 671561238..a5d3ce67c 100644
--- a/utils/ldconfig.c
+++ b/utils/ldconfig.c
@@ -44,16 +44,15 @@
 
 #define BUFFER_SIZE 4096
 
-struct exec
-{
-  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */
-  unsigned a_text;		/* length of text, in bytes */
-  unsigned a_data;		/* length of data, in bytes */
-  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */
-  unsigned a_syms;		/* length of symbol table data in file, in bytes */
-  unsigned a_entry;		/* start address */
-  unsigned a_trsize;		/* length of relocation info for text, in bytes */
-  unsigned a_drsize;		/* length of relocation info for data, in bytes */
+struct exec {
+	unsigned long a_info;	/* Use macros N_MAGIC, etc for access */
+	unsigned a_text;	/* length of text, in bytes */
+	unsigned a_data;	/* length of data, in bytes */
+	unsigned a_bss;		/* length of uninitialized data area for file, in bytes */
+	unsigned a_syms;	/* length of symbol table data in file, in bytes */
+	unsigned a_entry;	/* start address */
+	unsigned a_trsize;	/* length of relocation info for text, in bytes */
+	unsigned a_drsize;	/* length of relocation info for data, in bytes */
 };
 
 #if !defined (N_MAGIC)
@@ -66,7 +65,7 @@ struct exec
 #define NMAGIC 0410
 /* Code indicating demand-paged executable.  */
 #define ZMAGIC 0413
-/* This indicates a demand-paged executable with the header in the text. 
+/* This indicates a demand-paged executable with the header in the text.
    The first page is unmapped to help trap NULL pointer references */
 #define QMAGIC 0314
 /* Code indicating core file.  */
@@ -104,27 +103,26 @@ char *cachefile = LDSO_CACHE;	/* default cache file */
 char *chroot_dir = NULL;
 int byteswap = 0;
 
-struct needed_tab
-{
-  char *soname;
-  int type;
+struct needed_tab {
+	char *soname;
+	int type;
 };
 
 struct needed_tab needed_tab[] = {
-  { "libc.so.0",    LIB_ELF_LIBC0 },
-  { "libm.so.0",    LIB_ELF_LIBC0 },
-  { "libdl.so.0",   LIB_ELF_LIBC0 },
-  { "libc.so.5",    LIB_ELF_LIBC5 },
-  { "libm.so.5",    LIB_ELF_LIBC5 },
-  { "libdl.so.1",   LIB_ELF_LIBC5 },
-  { "libc.so.6",    LIB_ELF_LIBC6 },
-  { "libm.so.6",    LIB_ELF_LIBC6 },
-  { "libdl.so.2",   LIB_ELF_LIBC6 },
-  { NULL,           LIB_ELF }
+	{"libc.so.0", LIB_ELF_LIBC0},
+	{"libm.so.0", LIB_ELF_LIBC0},
+	{"libdl.so.0", LIB_ELF_LIBC0},
+	{"libc.so.5", LIB_ELF_LIBC5},
+	{"libm.so.5", LIB_ELF_LIBC5},
+	{"libdl.so.1", LIB_ELF_LIBC5},
+	{"libc.so.6", LIB_ELF_LIBC6},
+	{"libm.so.6", LIB_ELF_LIBC6},
+	{"libdl.so.2", LIB_ELF_LIBC6},
+	{NULL, LIB_ELF}
 };
 
-extern char *chroot_realpath(const char *chroot, const char *path, char resolved_path[]);
-
+extern char *chroot_realpath(const char *chroot, const char *path,
+			     char resolved_path[]);
 
 /* These two are used internally -- you shouldn't need to use them */
 static void verror_msg(const char *s, va_list p)
@@ -178,21 +176,20 @@ static void warn(const char *s, ...)
 
 static void *xmalloc(size_t size)
 {
-    void *ptr;
-    if ((ptr = malloc(size)) == NULL)
-	err(EXIT_FATAL,"out of memory");
-    return ptr;
+	void *ptr;
+	if ((ptr = malloc(size)) == NULL)
+		err(EXIT_FATAL, "out of memory");
+	return ptr;
 }
 
 static char *xstrdup(const char *str)
 {
-    char *ptr;
-    if ((ptr = strdup(str)) == NULL)
-	err(EXIT_FATAL,"out of memory");
-    return ptr;
+	char *ptr;
+	if ((ptr = strdup(str)) == NULL)
+		err(EXIT_FATAL, "out of memory");
+	return ptr;
 }
 
-
 #undef __ELF_NATIVE_CLASS
 #undef readsonameXX
 #define readsonameXX readsoname32
@@ -204,477 +201,426 @@ static char *xstrdup(const char *str)
 #define readsonameXX readsoname64
 #define __ELF_NATIVE_CLASS 64
 #include "readsoname2.c"
-
-char *readsoname(char *name, FILE *infile, int expected_type, 
+char *readsoname(char *name, FILE *infile, int expected_type,
 		 int *type, int elfclass)
 {
-  char *res;
+	char *res;
 
-  if (elfclass == ELFCLASS32)
-    res = readsoname32(name, infile, expected_type, type);
-  else
-  {
-    res = readsoname64(name, infile, expected_type, type);
+	if (elfclass == ELFCLASS32)
+		res = readsoname32(name, infile, expected_type, type);
+	else {
+		res = readsoname64(name, infile, expected_type, type);
 #if 0
-    *type |= LIB_ELF64;
+		/* relies on multilib support which we dont have ... */
+		*type |= LIB_ELF64;
 #endif
-  }
+	}
 
-  return res;
+	return res;
 }
 
-
-
 /* If shared library, return a malloced copy of the soname and set the
-   type, else return NULL.
-
-   expected_type should be either LIB_ANY or one of the following:-
-   LIB_DLL
-   LIB_ELF
-   LIB_ELF_LIBC5
-   LIB_ELF_LIBC6
-
-   If the lib is ELF and we can not deduce the type the type will
-   be set based on expected_type.
-
-   If the expected, actual/deduced types missmatch we display a warning
-   and use the actual/deduced type.
-*/
+ * type, else return NULL.
+ *
+ * expected_type should be either LIB_ANY or one of the following:-
+ * LIB_DLL
+ * LIB_ELF
+ * LIB_ELF_LIBC5
+ * LIB_ELF_LIBC6
+ *
+ * If the lib is ELF and we can not deduce the type the type will
+ * be set based on expected_type.
+ *
+ * If the expected, actual/deduced types missmatch we display a warning
+ * and use the actual/deduced type.
+ */
 char *is_shlib(const char *dir, const char *name, int *type,
-	int *islink, int expected_type)
+	       int *islink, int expected_type)
 {
-    char *good = NULL;
-    char *cp, *cp2;
-    FILE *file;
-    struct exec exec;
-    ElfW(Ehdr) *elf_hdr;
-    struct stat statbuf;
-    char buff[BUFFER_SIZE];
-    char real[BUFFER_SIZE];
-    static int byteswapflag = -1;	/* start with byte-order unknown */
-
-    /* see if name is of the form *.so* */
-    if (name[strlen(name)-1] != '~' && (cp = strstr(name, ".so")))
-    {
-	/* find the start of the Vminor part, if any */
-	if (cp[3] == '.' && (cp2 = strchr(cp + 4, '.')))
-	    cp = cp2;
-	else
-	    cp = cp + strlen(cp);
-
-	/* construct the full path name */
-	sprintf(buff, "%s%s%s", dir, (*dir && strcmp(dir, "/")) ?
-		"/" : "", name);
-
-	/* get real path in case of chroot */
-	if (!chroot_realpath(chroot_dir, buff, real))
-	    warn("can't resolve %s in chroot %s", buff, chroot_dir);
-
-	/* first, make sure it's a regular file */
-	if (lstat(real, &statbuf))
-	    warn("skipping %s", buff);
-	else if (!S_ISREG(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode))
-	    warnx("%s is not a regular file or symlink, skipping", buff);
-	else
-	{
-	    /* is it a regular file or a symlink */
-	    *islink = S_ISLNK(statbuf.st_mode);
-
-	    /* then try opening it */
-	    if (!(file = fopen(real, "rb")))
-		warn("skipping %s", buff);
-	    else
-	    {
-		/* now make sure it's a shared library */
-		if (fread(&exec, sizeof exec, 1, file) < 1)
-		    warnx("can't read header from %s, skipping", buff);
-		else if (N_MAGIC(exec) != ZMAGIC && N_MAGIC(exec) != QMAGIC &&
-			 N_MAGIC_SWAP(exec) != ZMAGIC && N_MAGIC_SWAP(exec) != QMAGIC)
-		{
-		    elf_hdr = (ElfW(Ehdr) *) &exec;
-		    if (elf_hdr->e_ident[0] != 0x7f ||
-			    strncmp(&elf_hdr->e_ident[1], "ELF",3) != 0)
-		    {
-			/* silently ignore linker scripts */
-			if (strncmp((char *)&exec, "/* GNU ld", 9) != 0)
-			    warnx("%s is not a shared library, skipping", buff);
-		    }
-		    else
-		    {
-			/* always call readsoname to update type */
-			if(expected_type == LIB_DLL) {
-			    warnx("%s is not an a.out library, it's ELF!", buff);
-			    expected_type=LIB_ANY;
-			}
-			*type = LIB_ELF;
-			good = readsoname(buff, file, expected_type, type, 
-				elf_hdr->e_ident[EI_CLASS]);
-			if (byteswapflag == -1)
-			    /* byte-order detected */
-			    byteswapflag = byteswap;
-			if (good == NULL || *islink)
-			{
-			    if (good != NULL)
-				free(good);
-			    good = xstrdup(name);
-			}
-			else
-			{
-			    /* if the soname does not match the filename,
-			       issue a warning, but only in debug mode. */
-			    int len = strlen(good);
-			    if (debug && (strncmp(good, name, len) != 0 ||
-					(name[len] != '\0' && name[len] != '.')))
-				warnx("%s has inconsistent soname (%s)", buff, good);
-			}
-		    }
-		}
+	char *good = NULL;
+	char *cp, *cp2;
+	FILE *file;
+	struct exec exec;
+	ElfW(Ehdr) *elf_hdr;
+	struct stat statbuf;
+	char buff[BUFFER_SIZE];
+	char real[BUFFER_SIZE];
+	static int byteswapflag = -1;	/* start with byte-order unknown */
+
+	/* see if name is of the form *.so* */
+	if (name[strlen(name) - 1] != '~' && (cp = strstr(name, ".so"))) {
+		/* find the start of the Vminor part, if any */
+		if (cp[3] == '.' && (cp2 = strchr(cp + 4, '.')))
+			cp = cp2;
 		else
-		{
-		    /* Determine byte-order */
-		    byteswap = (N_MAGIC(exec) == ZMAGIC || N_MAGIC(exec) == QMAGIC) ? 0 : 1;
-		    if (byteswapflag == -1)
-			/* byte-order detected */
-			byteswapflag = byteswap;
-
-		    if (*islink)
-			good = xstrdup(name);
-		    else
-		    {
-			good = xmalloc(cp - name + 1);
-			strncpy(good, name, cp - name);
-			good[cp - name] = '\0';
-		    }
-		    if(expected_type != LIB_ANY && expected_type != LIB_DLL)
-		    {
-			warnx("%s is not an ELF library, its an a.out DLL!", buff);
-			expected_type=LIB_ANY;
-		    }
-
-		    *type = LIB_DLL;
-		}
-		fclose(file);
-
-		if (byteswapflag >= 0 && byteswap != byteswapflag)
-		{
-		    byteswapflag = -2;
-		    warnx("mixed byte-order detected, using host byte-order...");
+			cp = cp + strlen(cp);
+
+		/* construct the full path name */
+		sprintf(buff, "%s%s%s", dir, (*dir && strcmp(dir, "/")) ? "/" : "", name);
+
+		/* get real path in case of chroot */
+		if (!chroot_realpath(chroot_dir, buff, real))
+			warn("can't resolve %s in chroot %s", buff, chroot_dir);
+
+		/* first, make sure it's a regular file */
+		if (lstat(real, &statbuf))
+			warn("skipping %s", buff);
+		else if (!S_ISREG(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode))
+			warnx("%s is not a regular file or symlink, skipping", buff);
+		else {
+			/* is it a regular file or a symlink */
+			*islink = S_ISLNK(statbuf.st_mode);
+
+			/* then try opening it */
+			if (!(file = fopen(real, "rb")))
+				warn("skipping %s", buff);
+			else {
+				/* now make sure it's a shared library */
+				if (fread(&exec, sizeof exec, 1, file) < 1)
+					warnx("can't read header from %s, skipping", buff);
+				else if (N_MAGIC(exec) != ZMAGIC
+					 && N_MAGIC(exec) != QMAGIC
+					 && N_MAGIC_SWAP(exec) != ZMAGIC
+					 && N_MAGIC_SWAP(exec) != QMAGIC) {
+					elf_hdr = (ElfW(Ehdr) *) & exec;
+					if (elf_hdr->e_ident[0] != 0x7f ||
+					    strncmp(elf_hdr->e_ident+1, "ELF", 3) != 0)
+					{
+						/* silently ignore linker scripts */
+						if (strncmp((char *)&exec, "/* GNU ld", 9) != 0)
+							warnx("%s is not a shared library, skipping", buff);
+					} else {
+						/* always call readsoname to update type */
+						if (expected_type == LIB_DLL) {
+							warnx("%s is not an a.out library, it's ELF!", buff);
+							expected_type = LIB_ANY;
+						}
+						*type = LIB_ELF;
+						good = readsoname(buff, file, expected_type, type,
+						                  elf_hdr->e_ident[EI_CLASS]);
+						if (byteswapflag == -1)
+							/* byte-order detected */
+							byteswapflag = byteswap;
+						if (good == NULL || *islink) {
+							if (good != NULL)
+								free(good);
+							good = xstrdup(name);
+						} else {
+							/* if the soname does not match the filename,
+							   issue a warning, but only in debug mode. */
+							int len = strlen(good);
+							if (debug && (strncmp(good, name, len) != 0
+							    || (name[len] != '\0' && name[len] != '.')))
+								warnx("%s has inconsistent soname (%s)", buff, good);
+						}
+					}
+				} else {
+					/* Determine byte-order */
+					byteswap = (N_MAGIC(exec) == ZMAGIC || N_MAGIC(exec) == QMAGIC) ? 0 : 1;
+					if (byteswapflag == -1)
+						/* byte-order detected */
+						byteswapflag = byteswap;
+
+					if (*islink)
+						good = xstrdup(name);
+					else {
+						good = xmalloc(cp - name + 1);
+						strncpy(good, name, cp - name);
+						good[cp - name] = '\0';
+					}
+					if (expected_type != LIB_ANY && expected_type != LIB_DLL) {
+						warnx("%s is not an ELF library, its an a.out DLL!", buff);
+						expected_type = LIB_ANY;
+					}
+
+					*type = LIB_DLL;
+				}
+				fclose(file);
+
+				if (byteswapflag >= 0 && byteswap != byteswapflag) {
+					byteswapflag = -2;
+					warnx("mixed byte-order detected, using host byte-order...");
+				}
+				if (byteswapflag == -2)
+					byteswap = 0;
+			}
 		}
-		if (byteswapflag == -2)
-		    byteswap = 0;
-	    }
 	}
-    }
 
-    return good;
+	return good;
 }
 
 /* update the symlink to new library */
 void link_shlib(const char *dir, const char *file, const char *so)
 {
-    int change = 1;
-    char libname[BUFFER_SIZE];
-    char linkname[BUFFER_SIZE];
-    char reallibname[BUFFER_SIZE];
-    char reallinkname[BUFFER_SIZE];
-    struct stat libstat;
-    struct stat linkstat;
-
-    /* construct the full path names */
-    sprintf(libname, "%s/%s", dir, file);
-    sprintf(linkname, "%s/%s", dir, so);
-    if (!chroot_realpath(chroot_dir, libname, reallibname))
-	warn("can't resolve %s in chroot %s", libname, chroot_dir);
-    if (!chroot_realpath(chroot_dir, linkname, reallinkname))
-	warn("can't resolve %s in chroot %s", linkname, chroot_dir);
-
-    /* see if a link already exists */
-    if (!stat(reallinkname, &linkstat))
-    {
-	/* now see if it's the one we want */
-	if (stat(reallibname, &libstat))
-	    warn("can't stat %s", libname);
-	else if (libstat.st_dev == linkstat.st_dev &&
-		libstat.st_ino == linkstat.st_ino)
-	    change = 0;
-    }
-
-    /* then update the link, if required */
-    if (change > 0 && !nolinks)
-    {
-	if (!lstat(reallinkname, &linkstat))
-	{
-	    if (!S_ISLNK(linkstat.st_mode))
-	    {
-		warnx("%s is not a symlink", linkname);
-		change = -1;
-	    }
-	    else if (remove(reallinkname))
-	    {
-		warn("can't unlink %s", linkname);
-		change = -1;
-	    }
+	int change = 1;
+	char libname[BUFFER_SIZE];
+	char linkname[BUFFER_SIZE];
+	char reallibname[BUFFER_SIZE];
+	char reallinkname[BUFFER_SIZE];
+	struct stat libstat;
+	struct stat linkstat;
+
+	/* construct the full path names */
+	sprintf(libname, "%s/%s", dir, file);
+	sprintf(linkname, "%s/%s", dir, so);
+	if (!chroot_realpath(chroot_dir, libname, reallibname))
+		warn("can't resolve %s in chroot %s", libname, chroot_dir);
+	if (!chroot_realpath(chroot_dir, linkname, reallinkname))
+		warn("can't resolve %s in chroot %s", linkname, chroot_dir);
+
+	/* see if a link already exists */
+	if (!stat(reallinkname, &linkstat)) {
+		/* now see if it's the one we want */
+		if (stat(reallibname, &libstat))
+			warn("can't stat %s", libname);
+		else if (libstat.st_dev == linkstat.st_dev &&
+		         libstat.st_ino == linkstat.st_ino)
+			change = 0;
 	}
-	if (change > 0)
-	{
-	    if (symlink(file, reallinkname))
-	    {
-		warn("can't link %s to %s", linkname, file);
-		change = -1;
-	    }
+
+	/* then update the link, if required */
+	if (change > 0 && !nolinks) {
+		if (!lstat(reallinkname, &linkstat)) {
+			if (!S_ISLNK(linkstat.st_mode)) {
+				warnx("%s is not a symlink", linkname);
+				change = -1;
+			} else if (remove(reallinkname)) {
+				warn("can't unlink %s", linkname);
+				change = -1;
+			}
+		}
+		if (change > 0) {
+			if (symlink(file, reallinkname)) {
+				warn("can't link %s to %s", linkname, file);
+				change = -1;
+			}
+		}
 	}
-    }
 
-    /* some people like to know what we're doing */
-    if (verbose > 0)
-	printf("\t%s => %s%s\n", so, file,
-		change < 0 ? " (SKIPPED)" :
-		(change > 0 ? " (changed)" : ""));
+	/* some people like to know what we're doing */
+	if (verbose > 0)
+		printf("\t%s => %s%s\n", so, file,
+		       change < 0 ? " (SKIPPED)" :
+		       (change > 0 ? " (changed)" : ""));
 
-    return;
+	return;
 }
 
 /* figure out which library is greater */
 int libcmp(char *p1, char *p2)
 {
-    while (*p1)
-    {
-	if (isdigit(*p1) && isdigit(*p2))
-	{
-	    /* must compare this numerically */
-	    int v1, v2;
-	    v1 = strtoul(p1, &p1, 10);
-	    v2 = strtoul(p2, &p2, 10);
-	    if (v1 != v2)
-		return v1 - v2;
+	while (*p1) {
+		if (isdigit(*p1) && isdigit(*p2)) {
+			/* must compare this numerically */
+			int v1, v2;
+			v1 = strtoul(p1, &p1, 10);
+			v2 = strtoul(p2, &p2, 10);
+			if (v1 != v2)
+				return v1 - v2;
+		} else if (isdigit(*p1) && !isdigit(*p2))
+			return 1;
+		else if (!isdigit(*p1) && isdigit(*p2))
+			return -1;
+		else if (*p1 != *p2)
+			return *p1 - *p2;
+		else
+			p1++, p2++;
 	}
-	else if (isdigit(*p1) && !isdigit(*p2))
-	    return 1;
-	else if (!isdigit(*p1) && isdigit(*p2))
-	    return -1;
-	else if (*p1 != *p2)
-	    return *p1 - *p2;
-	else
-	    p1++, p2++;
-    }
-
-    return *p1 - *p2;
+
+	return *p1 - *p2;
 }
 
-struct lib
-{
-    char *so;			/* soname of a library */
-    char *name;			/* name of a library */
-    int libtype;		/* type of a library */
-    int islink;			/* is it a symlink */
-    struct lib *next;		/* next library in list */
+struct lib {
+	char *so;		/* soname of a library */
+	char *name;		/* name of a library */
+	int libtype;		/* type of a library */
+	int islink;		/* is it a symlink */
+	struct lib *next;	/* next library in list */
 };
 
 /* update all shared library links in a directory */
 void scan_dir(const char *rawname)
 {
-    DIR *dir;
-    const char *name;
-    struct dirent *ent;
-    char *so, *path, *path_n;
-    struct lib *lp, *libs = NULL;
-    int i, libtype, islink, expected_type = LIB_ANY;
-    char realname[BUFFER_SIZE];
-
-    /* We need a writable copy of this string */
-    path = strdup(rawname);
-    if (!path) {
-	err(EXIT_FATAL, "Out of memory!\n");
-    }
-    /* Eliminate all double //s */
-    path_n=path;
-    while((path_n=strstr(path_n, "//"))) {
-	i = strlen(path_n);
-	memmove(path_n, path_n+1, i-1);
-	*(path_n + i - 1)='\0';
-    }
-    name = path;
+	DIR *dir;
+	const char *name;
+	struct dirent *ent;
+	char *so, *path, *path_n;
+	struct lib *lp, *libs = NULL;
+	int i, libtype, islink, expected_type = LIB_ANY;
+	char realname[BUFFER_SIZE];
+
+	/* We need a writable copy of this string */
+	path = strdup(rawname);
+	if (!path) {
+		err(EXIT_FATAL, "Out of memory!\n");
+	}
+	/* Eliminate all double //s */
+	path_n = path;
+	while ((path_n = strstr(path_n, "//"))) {
+		i = strlen(path_n);
+		memmove(path_n, path_n + 1, i - 1);
+		*(path_n + i - 1) = '\0';
+	}
+	name = path;
 
 #if 0
-    char *t;
-    /* Check for an embedded expected type */
-    t=strrchr(name, '=');
-    if( t )
-    {
-	*t++ = '\0'; /* Skip = char */
-	if(strcasecmp(t, "libc4") == 0)
-	{
-	    expected_type = LIB_DLL;
-	} 
-	else
-	{
-	    if(strcasecmp(t, "libc5") == 0)
-	    {
-		expected_type = LIB_ELF_LIBC5; 
-	    }
-	    else
-	    {
-		if(strcasecmp(t, "libc6") == 0)
-		{
-		    expected_type = LIB_ELF_LIBC6;
-		}
-		else 
-		{
-		    if(strcasecmp(t, "libc0") == 0)
-		    {
-			expected_type = LIB_ELF_LIBC0;
-		    }
-		    else
-		    {
-			warnx("Unknown type field '%s' for dir '%s' - ignored", t, name);
-			expected_type = LIB_ANY;
-		    }
+	char *t;
+	/* Check for an embedded expected type */
+	t = strrchr(name, '=');
+	if (t) {
+		*t++ = '\0';	/* Skip = char */
+		if (strcasecmp(t, "libc4") == 0) {
+			expected_type = LIB_DLL;
+		} else {
+			if (strcasecmp(t, "libc5") == 0) {
+				expected_type = LIB_ELF_LIBC5;
+			} else {
+				if (strcasecmp(t, "libc6") == 0) {
+					expected_type = LIB_ELF_LIBC6;
+				} else {
+					if (strcasecmp(t, "libc0") == 0) {
+						expected_type = LIB_ELF_LIBC0;
+					} else {
+						warnx("Unknown type field '%s' for dir '%s' - ignored", t, name);
+						expected_type = LIB_ANY;
+					}
+				}
+			}
 		}
-	    }
 	}
-    }
 #endif
 
-    /* let 'em know what's going on */
-    if (verbose > 0)
-	printf("%s:\n", name);
+	/* let 'em know what's going on */
+	if (verbose > 0)
+		printf("%s:\n", name);
 
-    /* get real path in case of chroot */
-    if (!chroot_realpath(chroot_dir, name, realname))
-	warn("can't resolve %s in chroot %s", name, chroot_dir);
+	/* get real path in case of chroot */
+	if (!chroot_realpath(chroot_dir, name, realname))
+		warn("can't resolve %s in chroot %s", name, chroot_dir);
+
+	/* if we can't open it, we can't do anything */
+	if ((dir = opendir(realname)) == NULL) {
+		warn("skipping %s", name);
+		free(path);
+		return;
+	}
 
-    /* if we can't open it, we can't do anything */
-    if ((dir = opendir(realname)) == NULL)
-    {
-	warn("skipping %s", name);
-	free(path);
-	return;
-    }
-
-    /* yes, we have to look at every single file */
-    while ((ent = readdir(dir)) != NULL)
-    {
-	/* if it's not a shared library, don't bother */
-	if ((so = is_shlib(name, ent->d_name, &libtype, &islink, expected_type)) == NULL)
-	    continue;
-
-	/* have we already seen one with the same so name? */
-	for (lp = libs; lp; lp = lp->next)
-	{
-	    if (strcmp(so, lp->so) == 0)
-	    {
-		/* we have, which one do we want to use? */
-		if ((!islink && lp->islink) ||
-			(islink == lp->islink && 
-			 libcmp(ent->d_name, lp->name) > 0))
-		{
-		    /* let's use the new one */
-		    free(lp->name);
-		    lp->name = xstrdup(ent->d_name);
-		    lp->libtype = libtype;
-		    lp->islink = islink;
-		} 
-		break;
-	    }
+	/* yes, we have to look at every single file */
+	while ((ent = readdir(dir)) != NULL) {
+		/* if it's not a shared library, don't bother */
+		if ((so = is_shlib(name, ent->d_name, &libtype, &islink, expected_type)) == NULL)
+			continue;
+
+		/* have we already seen one with the same so name? */
+		for (lp = libs; lp; lp = lp->next) {
+			if (strcmp(so, lp->so) == 0) {
+				/* we have, which one do we want to use? */
+				if ((!islink && lp->islink) ||
+				    (islink == lp->islink &&
+				     libcmp(ent->d_name, lp->name) > 0)) {
+					/* let's use the new one */
+					free(lp->name);
+					lp->name = xstrdup(ent->d_name);
+					lp->libtype = libtype;
+					lp->islink = islink;
+				}
+				break;
+			}
+		}
+
+		/* congratulations, you're the first one we've seen */
+		if (!lp) {
+			lp = xmalloc(sizeof *lp);
+			lp->so = xstrdup(so);
+			lp->name = xstrdup(ent->d_name);
+			lp->libtype = libtype;
+			lp->islink = islink;
+			lp->next = libs;
+			libs = lp;
+		}
+
+		free(so);
+	}
+
+	/* don't need this any more */
+	closedir(dir);
+
+	/* now we have all the latest libs, update the links */
+	for (lp = libs; lp; lp = lp->next) {
+		if (!lp->islink)
+			link_shlib(name, lp->name, lp->so);
+		if (!nocache)
+			cache_dolib(name, lp->so, lp->libtype);
 	}
 
-	/* congratulations, you're the first one we've seen */
-	if (!lp)
-	{
-	    lp = xmalloc(sizeof *lp);
-	    lp->so = xstrdup(so);
-	    lp->name = xstrdup(ent->d_name);
-	    lp->libtype = libtype;
-	    lp->islink = islink;
-	    lp->next = libs;
-	    libs = lp;
+	/* always try to clean up after ourselves */
+	while (libs) {
+		lp = libs->next;
+		free(libs->so);
+		free(libs->name);
+		free(libs);
+		libs = lp;
 	}
 
-	free(so);
-    }
-
-    /* don't need this any more */
-    closedir(dir);
-
-    /* now we have all the latest libs, update the links */
-    for (lp = libs; lp; lp = lp->next)
-    {
-	if (!lp->islink)
-	    link_shlib(name, lp->name, lp->so);
-	if (!nocache)
-	    cache_dolib(name, lp->so, lp->libtype);
-    }
-
-    /* always try to clean up after ourselves */
-    while (libs)
-    {
-	lp = libs->next;
-	free(libs->so);
-	free(libs->name);
-	free(libs);
-	libs = lp;
-    }
-
-    free(path);
-    return;
+	free(path);
+	return;
 }
 
 #ifndef __LDSO_CACHE_SUPPORT__
 void cache_print(void)
 {
-    printf("Library cache disabled\n");
+	printf("Library cache disabled\n");
 }
 void cache_dolib(const char *dir, const char *so, int libtype)
 {
-    return;
+	return;
 }
 void cache_write(void)
 {
-    return;
+	return;
 }
 #else
 /* return the list of system-specific directories */
 char *get_extpath(void)
 {
-    char *res = NULL, *cp;
-    FILE *file;
-    struct stat stat;
-    char realconffile[BUFFER_SIZE];
-
-    if (!chroot_realpath(chroot_dir, conffile, realconffile))
-	return NULL;
-
-    if ((file = fopen(realconffile, "r")) != NULL)
-    {
-	fstat(fileno(file), &stat);
-	res = xmalloc(stat.st_size + 1);
-	fread(res, 1, stat.st_size, file);
-	fclose(file);
-	res[stat.st_size] = '\0';
-
-	/* convert comments fo spaces */
-	for (cp = res; *cp; /*nada*/) {
-	    if (*cp == '#') {
-		do
-		    *cp++ = ' ';
-		while (*cp && *cp != '\n');
-	    } else {
-		cp++;
-	    }
-	}	  
-    }
-
-    return res;
+	char *res = NULL, *cp;
+	FILE *file;
+	struct stat stat;
+	char realconffile[BUFFER_SIZE];
+
+	if (!chroot_realpath(chroot_dir, conffile, realconffile))
+		return NULL;
+
+	if ((file = fopen(realconffile, "r")) != NULL) {
+		fstat(fileno(file), &stat);
+		res = xmalloc(stat.st_size + 1);
+		fread(res, 1, stat.st_size, file);
+		fclose(file);
+		res[stat.st_size] = '\0';
+
+		/* convert comments fo spaces */
+		for (cp = res; *cp; /*nada */ ) {
+			if (*cp == '#') {
+				do
+					*cp++ = ' ';
+				while (*cp && *cp != '\n');
+			} else {
+				cp++;
+			}
+		}
+	}
+
+	return res;
 }
 
-typedef struct liblist
-{
-    int flags;
-    int sooffset;
-    int liboffset;
-    char *soname;
-    char *libname;
-    struct liblist *next;
+typedef struct liblist {
+	int flags;
+	int sooffset;
+	int liboffset;
+	char *soname;
+	char *libname;
+	struct liblist *next;
 } liblist_t;
 
 static header_t magic = { LDSO_CACHE_MAGIC, LDSO_CACHE_VER, 0 };
@@ -682,393 +628,382 @@ static liblist_t *lib_head = NULL;
 
 static int liblistcomp(liblist_t *x, liblist_t *y)
 {
-    int res;
+	int res;
 
-    if ((res = libcmp(x->soname, y->soname)) == 0)
-    {
-	res = libcmp(strrchr(x->libname, '/') + 1,
-		strrchr(y->libname, '/') + 1);
-    }
+	if ((res = libcmp(x->soname, y->soname)) == 0) {
+		res = libcmp(strrchr(x->libname, '/') + 1,
+			     strrchr(y->libname, '/') + 1);
+	}
 
-    return res;
+	return res;
 }
 
 void cache_dolib(const char *dir, const char *so, int libtype)
 {
-    char fullpath[PATH_MAX];
-    liblist_t *new_lib, *cur_lib;
-
-    magic.nlibs++;
-    sprintf(fullpath, "%s/%s", dir, so);
-    new_lib = xmalloc(sizeof (liblist_t));
-    new_lib->flags = libtype;
-    new_lib->soname = xstrdup(so);
-    new_lib->libname = xstrdup(fullpath);
-
-    if (lib_head == NULL || liblistcomp(new_lib, lib_head) > 0)
-    {
-	new_lib->next = lib_head;
-	lib_head = new_lib;
-    }
-    else
-    {
-	for (cur_lib = lib_head; cur_lib->next != NULL &&
-		liblistcomp(new_lib, cur_lib->next) <= 0;
-		cur_lib = cur_lib->next)
-	    /* nothing */;
-	new_lib->next = cur_lib->next;
-	cur_lib->next = new_lib;
-    }
+	char fullpath[PATH_MAX];
+	liblist_t *new_lib, *cur_lib;
+
+	magic.nlibs++;
+	sprintf(fullpath, "%s/%s", dir, so);
+	new_lib = xmalloc(sizeof(liblist_t));
+	new_lib->flags = libtype;
+	new_lib->soname = xstrdup(so);
+	new_lib->libname = xstrdup(fullpath);
+
+	if (lib_head == NULL || liblistcomp(new_lib, lib_head) > 0) {
+		new_lib->next = lib_head;
+		lib_head = new_lib;
+	} else {
+		for (cur_lib = lib_head; cur_lib->next != NULL &&
+		     liblistcomp(new_lib, cur_lib->next) <= 0;
+		     cur_lib = cur_lib->next)
+			/* nothing */ ;
+		new_lib->next = cur_lib->next;
+		cur_lib->next = new_lib;
+	}
 }
 
 void cache_write(void)
 {
-    int cachefd;
-    int stroffset = 0;
-    char realcachefile[BUFFER_SIZE];
-    char tempfile[BUFFER_SIZE];
-    header_t swap_magic;
-    header_t *magic_ptr;
-    libentry_t swap_lib;
-    libentry_t *lib_ptr;
-    liblist_t *cur_lib;
-
-    if (!magic.nlibs)
-	return;
+	int cachefd;
+	int stroffset = 0;
+	char realcachefile[BUFFER_SIZE];
+	char tempfile[BUFFER_SIZE];
+	header_t swap_magic;
+	header_t *magic_ptr;
+	libentry_t swap_lib;
+	libentry_t *lib_ptr;
+	liblist_t *cur_lib;
+
+	if (!magic.nlibs)
+		return;
+
+	if (!chroot_realpath(chroot_dir, cachefile, realcachefile))
+		err(EXIT_FATAL, "can't resolve %s in chroot %s (%s)",
+		    cachefile, chroot_dir, strerror(errno));
+
+	sprintf(tempfile, "%s~", realcachefile);
+
+	if (unlink(tempfile) && errno != ENOENT)
+		err(EXIT_FATAL, "can't unlink %s~ (%s)", cachefile,
+		    strerror(errno));
+
+	if ((cachefd = creat(tempfile, 0644)) < 0)
+		err(EXIT_FATAL, "can't create %s~ (%s)", cachefile,
+		    strerror(errno));
 
-    if (!chroot_realpath(chroot_dir, cachefile, realcachefile))
-	err(EXIT_FATAL,"can't resolve %s in chroot %s (%s)",
-	    cachefile, chroot_dir, strerror(errno));
-
-    sprintf(tempfile, "%s~", realcachefile);
-
-    if (unlink(tempfile) && errno != ENOENT)
-	err(EXIT_FATAL,"can't unlink %s~ (%s)", cachefile, strerror(errno));
-
-    if ((cachefd = creat(tempfile, 0644)) < 0)
-	err(EXIT_FATAL,"can't create %s~ (%s)", cachefile, strerror(errno));
-
-    if (byteswap) {
-	swap_magic = magic;
-	swap_magic.nlibs = bswap_32(swap_magic.nlibs);
-	magic_ptr = &swap_magic;
-    } else {
-	magic_ptr = &magic;
-    }
-    if (write(cachefd, magic_ptr, sizeof (header_t)) != sizeof (header_t))
-	err(EXIT_FATAL,"can't write %s~ (%s)", cachefile, strerror(errno));
-
-    for (cur_lib = lib_head; cur_lib != NULL; cur_lib = cur_lib->next)
-    {
-	cur_lib->sooffset = stroffset;
-	stroffset += strlen(cur_lib->soname) + 1;
-	cur_lib->liboffset = stroffset;
-	stroffset += strlen(cur_lib->libname) + 1;
 	if (byteswap) {
-	    swap_lib.flags = bswap_32(cur_lib->flags);
-	    swap_lib.sooffset = bswap_32(cur_lib->sooffset);
-	    swap_lib.liboffset = bswap_32(cur_lib->liboffset);
-	    lib_ptr = &swap_lib;
+		swap_magic = magic;