Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
cc0bbbc7
Commit
cc0bbbc7
authored
Apr 25, 2015
by
Victor Stinner
Browse files
Options
Browse Files
Download
Plain Diff
(Merge 3.4) Issue #9246: On POSIX, os.getcwd() now supports paths longer than
1025 bytes. Patch written by William Orr.
parents
51f58059
4403d7de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
9 deletions
+32
-9
Misc/NEWS
Misc/NEWS
+4
-1
Modules/posixmodule.c
Modules/posixmodule.c
+28
-8
No files found.
Misc/NEWS
View file @
cc0bbbc7
...
...
@@ -15,6 +15,9 @@ Core and Builtins
Library
-------
- Issue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes.
Patch written by William Orr.
- Issue #17445: add difflib.diff_bytes() to support comparison of
byte strings (fixes a regression from Python 2).
...
...
@@ -33,7 +36,7 @@ Library
-
Issue
#
23728
:
binascii
.
crc_hqx
()
could
return
an
integer
outside
of
the
range
0
-
0xffff
for
empty
data
.
-
Issue
#
23887
:
urllib
.
error
.
HTTPError
now
has
a
proper
repr
()
representation
.
-
Issue
#
23887
:
urllib
.
error
.
HTTPError
now
has
a
proper
repr
()
representation
.
Patch
by
Berker
Peksag
.
Documentation
...
...
Modules/posixmodule.c
View file @
cc0bbbc7
...
...
@@ -3267,12 +3267,15 @@ os_lchown_impl(PyModuleDef *module, path_t *path, uid_t uid, gid_t gid)
static
PyObject
*
posix_getcwd
(
int
use_bytes
)
{
char
buf
[
1026
];
char
*
res
;
char
*
buf
,
*
tmpbuf
;
char
*
cwd
;
const
size_t
chunk
=
1024
;
size_t
buflen
=
0
;
PyObject
*
obj
;
#ifdef MS_WINDOWS
if
(
!
use_bytes
)
{
wchar_t
wbuf
[
1026
];
wchar_t
wbuf
[
MAXPATHLEN
];
wchar_t
*
wbuf2
=
wbuf
;
PyObject
*
resobj
;
DWORD
len
;
...
...
@@ -3306,14 +3309,31 @@ posix_getcwd(int use_bytes)
return
NULL
;
#endif
buf
=
cwd
=
NULL
;
Py_BEGIN_ALLOW_THREADS
res
=
getcwd
(
buf
,
sizeof
buf
);
do
{
buflen
+=
chunk
;
tmpbuf
=
PyMem_RawRealloc
(
buf
,
buflen
);
if
(
tmpbuf
==
NULL
)
break
;
buf
=
tmpbuf
;
cwd
=
getcwd
(
buf
,
buflen
);
}
while
(
cwd
==
NULL
&&
errno
==
ERANGE
);
Py_END_ALLOW_THREADS
if
(
res
==
NULL
)
if
(
cwd
==
NULL
)
{
PyMem_RawFree
(
buf
);
return
posix_error
();
}
if
(
use_bytes
)
return
PyBytes_FromStringAndSize
(
buf
,
strlen
(
buf
));
return
PyUnicode_DecodeFSDefault
(
buf
);
obj
=
PyBytes_FromStringAndSize
(
buf
,
strlen
(
buf
));
else
obj
=
PyUnicode_DecodeFSDefault
(
buf
);
PyMem_RawFree
(
buf
);
return
obj
;
}
...
...
@@ -8873,7 +8893,7 @@ os_truncate_impl(PyModuleDef *module, path_t *path, Py_off_t length)
fd
=
_wopen
(
path
->
wide
,
_O_WRONLY
|
_O_BINARY
|
_O_NOINHERIT
);
else
fd
=
_open
(
path
->
narrow
,
_O_WRONLY
|
_O_BINARY
|
_O_NOINHERIT
);
if
(
fd
<
0
)
if
(
fd
<
0
)
result
=
-
1
;
else
{
result
=
_chsize_s
(
fd
,
length
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment