mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-09 20:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Ugly fix for SF bug 131239 (-x flag busted).

Browse source 
Bug was introduced by tricks played to make .pyc files executable
via cmdline arg.  Then again, -x worked via a trick to begin with.
If anyone can think of a portable way to test -x, be my guest!
This commit is contained in:
Tim Peters 2001-02-11 04:35:39 +00:00
parent 497314e2e5
commit 3e876565a3
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Python/pythonrun.c
View file

@ -578,10 +578,21 @@ maybe_pyc_file(FILE *fp, char* filename, char* ext, int closeit)
be read as they are on disk. */
unsigned int halfmagic = PyImport_GetMagicNumber() & 0xFFFF;
unsigned char buf[2];
if (fread(buf, 1, 2, fp) == 2
&& ((unsigned int)buf[1]<<8 | buf[0]) == halfmagic)
return 1;
fseek(fp, 0, SEEK_SET);
/* Mess: In case of -x, the stream is NOT at its start now,
and ungetc() was used to push back the first newline,
which makes the current stream position formally undefined
until that newline is read back. So first we getc(), so
that ftell() is well-defined.
*/
const int maybepushedback = getc(fp);
const long currentpos = ftell(fp);
int ispyc = 0;
rewind(fp);
ispyc = fread(buf, 1, 2, fp) == 2 &&
((unsigned int)buf[1]<<8 | buf[0]) == halfmagic;
fseek(fp, currentpos, SEEK_SET);
ungetc(maybepushedback, fp);
return ispyc;
}
return 0;
}