1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Steve Majewski's patch #103495, MatchFilename() and find_module()

Browse Source 
patch for case-preserving HFS+ suport.  Untested except to verify that
it builds and doesn't break anything on Linux RH6.1.
This commit is contained in:
Barry Warsaw 2001-02-02 19:12:16 +00:00
parent 5e7cb240af
commit 914a0b1db6
1 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Python/import.c
View File

@ -836,6 +836,40 @@ static int check_case(char *, int, int, char *);
static int find_init_module(char *); /* Forward */ static int find_init_module(char *); /* Forward */
#ifdef HAVE_DIRENT_H
static int MatchFilename(char *pathname, char *filename);
#include <sys/types.h>
#include <dirent.h>
static int MatchFilename(char *pathname, char *filename)
{
DIR *dirp;
struct dirent *dp;
int len = strlen(filename);
if ((pathname == NULL) || (strlen(pathname) == 0))
pathname = ".";
dirp = opendir(pathname);
if (dirp) {
while ((dp = readdir(dirp)) != NULL) {
#ifdef _DIRENT_HAVE_D_NAMELINE
int namelen = dp->d_namlen;
#else /* !_DIRENT_HAVE_D_NAMELINE */
int namelen = strlen(dp->d_name);
#endif /* _DIRENT_HAVE_D_NAMELINE */
if (namelen == len && !strcmp(dp->d_name, filename)) {
(void)closedir(dirp);
return 1; /* Found */
}
}
}
(void)closedir(dirp);
return 0 ; /* Not found */
}
#endif /* HAVE_DIRENT_H */
static struct filedescr * static struct filedescr *
find_module(char *realname, PyObject *path, char *buf, size_t buflen, find_module(char *realname, PyObject *path, char *buf, size_t buflen,
FILE **p_fp) FILE **p_fp)
@ -966,8 +1000,27 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
if (Py_VerboseFlag > 1) if (Py_VerboseFlag > 1)
PySys_WriteStderr("# trying %s\n", buf); PySys_WriteStderr("# trying %s\n", buf);
fp = fopen(buf, fdp->mode); fp = fopen(buf, fdp->mode);
#ifdef HAVE_DIRENT_H
if (fp != NULL) { /* check case */
char *curpath = PyString_AsString(v);
char *nstart = buf + strlen(curpath);
if (*nstart == SEP)
nstart++;
if (MatchFilename(curpath, nstart)) {
break; /* Found */
}
fclose(fp); /* No. Close & continue search */
fp = NULL;
if (Py_VerboseFlag > 1)
PySys_WriteStderr(
"# case mismatch for %s: %s\n",
name, buf);
}
#else /* !HAVE_DIRENT_H */
if (fp != NULL) if (fp != NULL)
break; break;
#endif /* HAVE_DIRENT_H */
} }
#endif /* !macintosh */ #endif /* !macintosh */
if (fp != NULL) if (fp != NULL)