mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 03:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

#3626: On cygwin, starting "python z" would not display any error message:

Browse source 
printf("%ls") fails if the wide string is 1 char long :-(
This commit is contained in:
Amaury Forgeot d'Arc 2008-10-30 23:03:32 +00:00
parent e329d1af13
commit dd8059f078
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/main.c
View file

@ -564,8 +564,17 @@ Py_Main(int argc, wchar_t **argv)
if (sts==-1 && filename!=NULL) {
if ((fp = _wfopen(filename, L"r")) == NULL) {
fprintf(stderr, "%ls: can't open file '%ls': [Errno %d] %s\n",
argv[0], filename, errno, strerror(errno));
char cfilename[PATH_MAX];
size_t r = wcstombs(cfilename, filename, PATH_MAX);
if (r == PATH_MAX)
/* cfilename is not null-terminated;
* forcefully null-terminating it
* might break the shift state */
strcpy(cfilename, "<file name too long>");
if (r == ((size_t)-1))
strcpy(cfilename, "<unprintable file name>");
fprintf(stderr, "%ls: can't open file '%s': [Errno %d] %s\n",
argv[0], cfilename, errno, strerror(errno));
return 2;
}