From 15ac25627e7239629be59adedda5d8a9deb330ef Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 29 Jan 2009 14:40:27 -0500 Subject: [PATCH] Remove extra / from Loading module line In the X log, upon module load, it prints a line similar to the following. > (II) Loading /usr/lib64/xorg/modules/extensions//libdbe.so The attached patch removes the extra / before the module name. Code already exists in hw/xfree86/loader/loadmod.c:InitPathList to add a trailing slash if needed, removing the one added by sprintf is harmless. Signed-off-by: James Cloos --- hw/xfree86/loader/loadmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 3f754934e..16105a738 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -411,21 +411,21 @@ FindModuleInSubdir(const char *dirpath, const char *module) snprintf(tmpBuf, PATH_MAX, "lib%s.so", module); if (strcmp(direntry->d_name, tmpBuf) == 0) { ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2); - sprintf(ret, "%s/%s", dirpath, tmpBuf); + sprintf(ret, "%s%s", dirpath, tmpBuf); break; } snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module); if (strcmp(direntry->d_name, tmpBuf) == 0) { ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2); - sprintf(ret, "%s/%s", dirpath, tmpBuf); + sprintf(ret, "%s%s", dirpath, tmpBuf); break; } snprintf(tmpBuf, PATH_MAX, "%s.so", module); if (strcmp(direntry->d_name, tmpBuf) == 0) { ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2); - sprintf(ret, "%s/%s", dirpath, tmpBuf); + sprintf(ret, "%s%s", dirpath, tmpBuf); break; } }