security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Fixed an fopen problem on Windows Vista.

Browse source
This commit is contained in:
Werner Koch 2009-06-03 17:24:24 +00:00
parent 323cca8041
commit dac70ca2fd
6 changed files with 70 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

84
common/estream.c
View file

@ -897,67 +897,49 @@ static es_cookie_io_functions_t estream_functions_file =
};
/* Stream primitives. */
static int
es_convert_mode (const char *mode, unsigned int *modeflags)
{
unsigned int omode, oflags;
/* FIXME: We need to allow all mode flags permutations. */
struct
{
const char *mode;
unsigned int flags;
} mode_flags[] = { { "r",
O_RDONLY },
{ "rb",
O_RDONLY | O_BINARY },
{ "w",
O_WRONLY | O_TRUNC | O_CREAT },
{ "wb",
O_WRONLY | O_TRUNC | O_CREAT | O_BINARY },
{ "a",
O_WRONLY | O_APPEND | O_CREAT },
{ "ab",
O_WRONLY | O_APPEND | O_CREAT | O_BINARY },
{ "r+",
O_RDWR },
{ "rb+",
O_RDWR | O_BINARY },
{ "r+b",
O_RDONLY | O_WRONLY | O_BINARY },
{ "w+",
O_RDWR | O_TRUNC | O_CREAT },
{ "wb+",
O_RDWR | O_TRUNC | O_CREAT | O_BINARY },
{ "w+b",
O_RDWR | O_TRUNC | O_CREAT | O_BINARY },
{ "a+",
O_RDWR | O_CREAT | O_APPEND },
{ "ab+",
O_RDWR | O_CREAT | O_APPEND | O_BINARY },
{ "a+b",
O_RDWR | O_CREAT | O_APPEND | O_BINARY }
};
unsigned int i;
int err;
for (i = 0; i < DIM (mode_flags); i++)
if (! strcmp (mode_flags[i].mode, mode))
switch (*mode)
{
case 'r':
omode = O_RDONLY;
oflags = 0;
break;
if (i == DIM (mode_flags))
{
case 'w':
omode = O_WRONLY;
oflags = O_TRUNC | O_CREAT;
break;
case 'a':
omode = O_WRONLY;
oflags = O_APPEND | O_CREAT;
break;
default:
errno = EINVAL;
err = -1;
return -1;
}
else
for (mode++; *mode; mode++)
{
err = 0;
*modeflags = mode_flags[i].flags;
switch (*mode)
{
case '+':
omode = O_RDWR;
break;
case 'b':
oflags |= O_BINARY;
break;
case 'x':
oflags |= O_EXCL;
break;
default: /* Ignore unknown flags. */
break;
}
}
return err;
*modeflags = (omode | oflags);
return 0;
}