Attachment 2530 Details for Bug 2138 – smarter-loader-search-behaviour-3.patch

[patch] smarter-loader-search-behaviour-3.patch

smarter-loader-search-behaviour-3.patch (text/plain), 3.29 KB, created by Adam Jackson on 2005-04-24 13:16:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2005-04-24 13:16:04 UTC

Size: 3.29 KB

patch

obsolete

>Index: loadmod.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 loadmod.c
>--- loadmod.c	23 Apr 2005 19:16:10 -0000	1.3
>+++ loadmod.c	24 Apr 2005 20:12:52 -0000
>@@ -204,13 +204,13 @@
> 
> /* Standard set of module subdirectories to search, in order of preference */
> static const char *stdSubdirs[] = {
>-    "drivers/",
>+    "",
>+    "fonts/",
>     "input/",
>+    "drivers/",
>     "multimedia/",
>     "extensions/",
>-    "fonts/",
>     "internal/",
>-    "",
>     NULL
> };
> 
>@@ -398,19 +398,20 @@
> FindModule(const char *module, const char *dir, const char **subdirlist,
> 	   PatternPtr patterns)
> {
>-    char buf[PATH_MAX + 1];
>+    char buf[PATH_MAX + 1], tmpBuf[PATH_MAX + 1];
>     char *dirpath = NULL;
>     char *name = NULL;
>     struct stat stat_buf;
>-    int len, dirlen;
>+    int dirlen;
>     char *fp;
>-    DIR *d;
>     const char **subdirs = NULL;
>-    PatternPtr p = NULL;
>     const char **s;
>-    struct dirent *dp;
>-    regmatch_t match[2];
>-
>+#ifdef DLOPEN_HACK
>+    const char suffix[3][3] = { "so", "a", "o" };
>+#else
>+    const char suffix[3][3] = { "a", "o", "so" };
>+#endif
>+    
>     subdirs = InitSubdirs(subdirlist);
>     if (!subdirs)
> 	return NULL;
>@@ -431,39 +432,37 @@
> 	strcpy(buf, dirpath);
> 	strcat(buf, *s);
> 	/*xf86Msg(X_INFO,"OS2DIAG: FindModule: buf=%s\n",buf); */
>-	fp = buf + dirlen;
>-	if (stat(buf, &stat_buf) == 0 && S_ISDIR(stat_buf.st_mode) &&
>-	    (d = opendir(buf))) {
>-	    if (buf[dirlen - 1] != '/') {
>-		buf[dirlen++] = '/';
>-		fp++;
>-	    }
>-	    while ((dp = readdir(d))) {
>-		if (dirlen + strlen(dp->d_name) + 1 > PATH_MAX)
>-		    continue;
>-		strcpy(fp, dp->d_name);
>-		if (!(stat(buf, &stat_buf) == 0 && S_ISREG(stat_buf.st_mode)))
>-		    continue;
>-		for (p = patterns; p->pattern; p++) {
>-		    if (regexec(&p->rex, dp->d_name, 2, match, 0) == 0 &&
>-			match[1].rm_so != -1) {
>-			len = match[1].rm_eo - match[1].rm_so;
>-			if (len == strlen(module) &&
>-			    strncmp(module, dp->d_name + match[1].rm_so,
>-				    len) == 0) {
>-			    /*xf86Msg(X_INFO,"OS2DIAG: matching %s\n",buf); */
>-			    name = buf;
>-			    break;
>-			}
>-		    }
>-		}
>-		if (name)
>-		    break;
>+        if ((stat(buf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
>+	    int i;
>+	
>+            if (buf[dirlen - 1] != '/') {
>+                buf[dirlen++] = '/';
>+                fp++;
>+            }
>+	    
>+	    for (i = 0; i < 3 && !name; i++) {
>+                snprintf(tmpBuf, PATH_MAX, "%slib%s.%s", buf, module,
>+                         suffix[i]);
>+                if (stat(tmpBuf, &stat_buf) == 0) {
>+                    name = tmpBuf;
>+                    break;
>+                }
>+                snprintf(tmpBuf, PATH_MAX, "%s%s_drv.%s", buf, module,
>+                         suffix[i]);
>+                if (stat(tmpBuf, &stat_buf) == 0) {
>+                    name = tmpBuf;
>+                    break;
>+                }
>+                snprintf(tmpBuf, PATH_MAX, "%s%s.%s", buf, module,
>+                         suffix[i]);
>+                if (stat(tmpBuf, &stat_buf) == 0) {
>+                    name = tmpBuf;
>+                    break;
>+                }
> 	    }
>-	    closedir(d);
> 	    if (name)
> 		break;
>-	}
>+        }
>     }
>     FreeSubdirs(subdirs);
>     if (dirpath != dir)

Actions: View | Splinter Review

Attachments on bug 2138: 1687 | 1701 | 2530

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.