combined patches from http://bugs.python.org/issue3187

Modules/posixmodule.c

 
 /* POSIX module implementation */
 
 /* This file is also used for Windows NT/MS-Win and OS/2.  In that case the
    module actually calls itself 'nt' or 'os2', not 'posix', and a few
    functions are either unimplemented or implemented differently.  The source
    assumes that for Windows NT, the macro 'MS_WINDOWS' is defined independent
    of the compiler used.  Different compilers define their own feature
    test macro, e.g. '__BORLANDC__' or '_MSC_VER'.  For OS/2, the compiler
    independent macro PYOS_OS2 should be defined.  On OS/2 the default
@@ skipping 1950 matching lines @@
         if (res < 0)
                 return posix_error_with_allocated_filename(path);
         PyMem_Free(path);
         Py_INCREF(Py_None);
         return Py_None;
 }
 #endif /* HAVE_LCHOWN */
 
 
 #ifdef HAVE_GETCWD
-PyDoc_STRVAR(posix_getcwd__doc__,
-"getcwd() -> path\n\n\
-Return a string representing the current working directory.");
-
 static PyObject *
-posix_getcwd(PyObject *self, PyObject *noargs)
-{
-        int bufsize_incr = 1024;
-        int bufsize = 0;
-        char *tmpbuf = NULL;
-        char *res = NULL;
-        PyObject *dynamic_return;
-
-        Py_BEGIN_ALLOW_THREADS
-        do {
-                bufsize = bufsize + bufsize_incr;
-                tmpbuf = malloc(bufsize);
-                if (tmpbuf == NULL) {
-                        break;
-                }
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
-                res = _getcwd2(tmpbuf, bufsize);
-#else
-                res = getcwd(tmpbuf, bufsize);
-#endif
-
-                if (res == NULL) {
-                        free(tmpbuf);
-                }
-        } while ((res == NULL) && (errno == ERANGE));
-        Py_END_ALLOW_THREADS
-
-        if (res == NULL)
-                return posix_error();
-
-        dynamic_return = PyUnicode_FromString(tmpbuf);
-        free(tmpbuf);
-
-        return dynamic_return;
-}
-
-PyDoc_STRVAR(posix_getcwdu__doc__,
-"getcwdu() -> path\n\n\
-Return a unicode string representing the current working directory.");
-
-static PyObject *
-posix_getcwdu(PyObject *self, PyObject *noargs)
+posix_getcwd(int use_bytes)
 {
         char buf[1026];
         char *res;
 
 #ifdef Py_WIN_WIDE_FILENAMES
-        DWORD len;
-        if (unicode_file_names()) {
+        if (!use_bytes && unicode_file_names()) {
                 wchar_t wbuf[1026];
                 wchar_t *wbuf2 = wbuf;
                 PyObject *resobj;
+                DWORD len;
                 Py_BEGIN_ALLOW_THREADS
                 len = GetCurrentDirectoryW(sizeof wbuf/ sizeof wbuf[0], wbuf);
                 /* If the buffer is large enough, len does not include the
                    terminating \0. If the buffer is too small, len includes
                    the space needed for the terminator. */
                 if (len >= sizeof wbuf/ sizeof wbuf[0]) {
                         wbuf2 = malloc(len * sizeof(wchar_t));
                         if (wbuf2)
                                 len = GetCurrentDirectoryW(len, wbuf2);
                 }
@@ skipping 14 matching lines @@
 
         Py_BEGIN_ALLOW_THREADS
 #if defined(PYOS_OS2) && defined(PYCC_GCC)
         res = _getcwd2(buf, sizeof buf);
 #else
         res = getcwd(buf, sizeof buf);
 #endif
         Py_END_ALLOW_THREADS
         if (res == NULL)
                 return posix_error();
+        if (use_bytes)
+                return PyBytes_FromStringAndSize(buf, strlen(buf));
         return PyUnicode_Decode(buf, strlen(buf), Py_FileSystemDefaultEncoding,"strict");
+}
+
+PyDoc_STRVAR(posix_getcwd__doc__,
+"getcwd() -> path\n\n\
+Return a unicode string representing the current working directory.");
+
+static PyObject *
+posix_getcwd_unicode(PyObject *self)
+{
+    return posix_getcwd(0);
+}
+
+PyDoc_STRVAR(posix_getcwdb__doc__,
+"getcwdb() -> path\n\n\
+Return a bytes string representing the current working directory.");
+
+static PyObject *
+posix_getcwd_bytes(PyObject *self)
+{
+    return posix_getcwd(1);
 }
 #endif
 
 
 #ifdef HAVE_LINK
 PyDoc_STRVAR(posix_link__doc__,
 "link(src, dst)\n\n\
 Create a hard link to a file.");
 
 static PyObject *
@@ skipping 298 matching lines @@
                         PyObject *w;
 
                         w = PyUnicode_FromEncodedObject(v,
                                         Py_FileSystemDefaultEncoding,
                                         "strict");
                         if (w != NULL) {
                                 Py_DECREF(v);
                                 v = w;
                         }
                         else {
-                                /* fall back to the original byte string, as
-                                   discussed in patch #683592 */
+                                /* Ignore undecodable filenames, as discussed
+                                 * in issue 3187. To include these,
+                                 * use getcwdb(). */
                                 PyErr_Clear();
+                                Py_DECREF(v);
+                                continue;
                         }
                 }
                 if (PyList_Append(d, v) != 0) {
                         Py_DECREF(v);
                         Py_DECREF(d);
                         d = NULL;
                         break;
                 }
                 Py_DECREF(v);
         }
@@ skipping 2076 matching lines @@
                 PyObject *w;
 
                 w = PyUnicode_FromEncodedObject(v,
                                 Py_FileSystemDefaultEncoding,
                                 "strict");
                 if (w != NULL) {
                         Py_DECREF(v);
                         v = w;
                 }
                 else {
-                        /* fall back to the original byte string, as
-                           discussed in patch #683592 */
-                        PyErr_Clear();
+                        v = NULL;
                 }
         }
         return v;
 }
 #endif /* HAVE_READLINK */
 
 
 #ifdef HAVE_SYMLINK
 PyDoc_STRVAR(posix_symlink__doc__,
 "symlink(src, dst)\n\n\
@@ skipping 2310 matching lines @@
 #ifdef HAVE_LCHOWN
         {"lchown",      posix_lchown, METH_VARARGS, posix_lchown__doc__},
 #endif /* HAVE_LCHOWN */
 #ifdef HAVE_CHROOT
         {"chroot",      posix_chroot, METH_VARARGS, posix_chroot__doc__},
 #endif
 #ifdef HAVE_CTERMID
         {"ctermid",     posix_ctermid, METH_NOARGS, posix_ctermid__doc__},
 #endif
 #ifdef HAVE_GETCWD
-        {"getcwd",      posix_getcwd, METH_NOARGS, posix_getcwd__doc__},
-        {"getcwdu",     posix_getcwdu, METH_NOARGS, posix_getcwdu__doc__},
+        {"getcwd",      (PyCFunction)posix_getcwd_unicode,
+        METH_NOARGS, posix_getcwd__doc__},
+        {"getcwdb",     (PyCFunction)posix_getcwd_bytes,
+        METH_NOARGS, posix_getcwdb__doc__},
 #endif
 #ifdef HAVE_LINK
         {"link",        posix_link, METH_VARARGS, posix_link__doc__},
 #endif /* HAVE_LINK */
         {"listdir",     posix_listdir, METH_VARARGS, posix_listdir__doc__},
         {"lstat",       posix_lstat, METH_VARARGS, posix_lstat__doc__},
         {"mkdir",       posix_mkdir, METH_VARARGS, posix_mkdir__doc__},
 #ifdef HAVE_NICE
         {"nice",        posix_nice, METH_VARARGS, posix_nice__doc__},
 #endif /* HAVE_NICE */
@@ skipping 634 matching lines @@
 
 
 #endif /* __APPLE__ */
         return m;
 
 }
 
 #ifdef __cplusplus
 }
 #endif