diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-05-11 13:28:43 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-05-11 13:28:43 (GMT) |
| commit | 879768dd97f98626c919a460a90dd0d54855de9c (patch) | |
| tree | 8813f6d751a0087d8402860bc82e54ca87f0028c /PC | |
| parent | 38e3b7d2d36a2029ad86c9c23d031e5350e80d35 (diff) | |
| download | cpython-879768dd97f98626c919a460a90dd0d54855de9c.zip cpython-879768dd97f98626c919a460a90dd0d54855de9c.tar.gz cpython-879768dd97f98626c919a460a90dd0d54855de9c.tar.bz2 | |
Change WindowsError to carry the Win32 error code in winerror,
and the DOS error code in errno. Revert changes where
WindowsError catch blocks unnecessarily special-case OSError.
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/errmap.h | 78 | ||||
| -rw-r--r-- | PC/errmap.mak | 5 | ||||
| -rw-r--r-- | PC/generrmap.c | 20 |
3 files changed, 103 insertions, 0 deletions
diff --git a/PC/errmap.h b/PC/errmap.h new file mode 100644 index 0000000..59aeea1 --- /dev/null +++ b/PC/errmap.h @@ -0,0 +1,78 @@ +/* Generated file. Do not edit. */ +int winerror_to_errno(int winerror) +{ + switch(winerror) { + case 2: return 2; + case 3: return 2; + case 4: return 24; + case 5: return 13; + case 6: return 9; + case 7: return 12; + case 8: return 12; + case 9: return 12; + case 10: return 7; + case 11: return 8; + case 15: return 2; + case 16: return 13; + case 17: return 18; + case 18: return 2; + case 19: return 13; + case 20: return 13; + case 21: return 13; + case 22: return 13; + case 23: return 13; + case 24: return 13; + case 25: return 13; + case 26: return 13; + case 27: return 13; + case 28: return 13; + case 29: return 13; + case 30: return 13; + case 31: return 13; + case 32: return 13; + case 33: return 13; + case 34: return 13; + case 35: return 13; + case 36: return 13; + case 53: return 2; + case 65: return 13; + case 67: return 2; + case 80: return 17; + case 82: return 13; + case 83: return 13; + case 89: return 11; + case 108: return 13; + case 109: return 32; + case 112: return 28; + case 114: return 9; + case 128: return 10; + case 129: return 10; + case 130: return 9; + case 132: return 13; + case 145: return 41; + case 158: return 13; + case 161: return 2; + case 164: return 11; + case 167: return 13; + case 183: return 17; + case 188: return 8; + case 189: return 8; + case 190: return 8; + case 191: return 8; + case 192: return 8; + case 193: return 8; + case 194: return 8; + case 195: return 8; + case 196: return 8; + case 197: return 8; + case 198: return 8; + case 199: return 8; + case 200: return 8; + case 201: return 8; + case 202: return 8; + case 206: return 2; + case 215: return 11; + case 1816: return 12; + default: return EINVAL; + } +} diff --git a/PC/errmap.mak b/PC/errmap.mak new file mode 100644 index 0000000..646bcd0 --- /dev/null +++ b/PC/errmap.mak @@ -0,0 +1,5 @@ +errmap.h: generrmap.exe + .\generrmap.exe > errmap.h + +genermap.exe: generrmap.c + cl generrmap.c diff --git a/PC/generrmap.c b/PC/generrmap.c new file mode 100644 index 0000000..2b25063 --- /dev/null +++ b/PC/generrmap.c @@ -0,0 +1,20 @@ +#include <stdio.h> +#include <errno.h> + +/* Extract the mapping of Win32 error codes to errno */ + +int main() +{ + int i; + printf("/* Generated file. Do not edit. */\n"); + printf("int winerror_to_errno(int winerror)\n"); + printf("{\n\tswitch(winerror) {\n"); + for(i=1; i < 65000; i++) { + _dosmaperr(i); + if (errno == EINVAL) + continue; + printf("\t\tcase %d: return %d;\n", i, errno); + } + printf("\t\tdefault: return EINVAL;\n"); + printf("\t}\n}\n"); +} |