]> granicus.if.org Git - python/commitdiff
posix_listdir(): When an error occurs, call
authorBarry Warsaw <barry@python.org>
Thu, 27 May 1999 23:13:21 +0000 (23:13 +0000)
committerBarry Warsaw <barry@python.org>
Thu, 27 May 1999 23:13:21 +0000 (23:13 +0000)
posix_error_with_filename() instead of posix_error(), passing in the
name argument, so you get information on which directory was being
listed.

Modules/posixmodule.c

index f3fbd7af05513ff88e2c05f42feb3b0d42f2c815..f7b16a05ef928e46330dd164fad253c70b8b8f76 100644 (file)
@@ -773,7 +773,7 @@ posix_listdir(self, args)
                errno = GetLastError();
                if (errno == ERROR_FILE_NOT_FOUND)
                        return PyList_New(0);
-               return posix_error();
+               return posix_error_with_filename(name);
        }
        do {
                if (FileData.cFileName[0] == '.' &&
@@ -798,7 +798,7 @@ posix_listdir(self, args)
 
        if (FindClose(hFindFile) == FALSE) {
                errno = GetLastError();
-               return posix_error();
+               return posix_error_with_filename(&name);
        }
 
        return d;
@@ -836,7 +836,7 @@ posix_listdir(self, args)
                           _A_HIDDEN | _A_SYSTEM | _A_SUBDIR, &ep) != 0)
         {
                errno = ENOENT;
-               return posix_error();
+               return posix_error_with_filename(name);
        }
        do {
                if (ep.name[0] == '.' &&
@@ -906,7 +906,7 @@ posix_listdir(self, args)
 
     if (rc != NO_ERROR) {
         errno = ENOENT;
-        return posix_error();
+        return posix_error_with_filename(name);
     }
 
     if (srchcnt > 0) { /* If Directory is NOT Totally Empty, */
@@ -948,7 +948,7 @@ posix_listdir(self, args)
        Py_BEGIN_ALLOW_THREADS
        if ((dirp = opendir(name)) == NULL) {
                Py_BLOCK_THREADS
-               return posix_error();
+               return posix_error_with_filename(name);
        }
        if ((d = PyList_New(0)) == NULL) {
                closedir(dirp);