JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_socket.cc (fhandler_socket::bind): Open file for deletion,

Browse Source 
too.  Don't write to file and especially don't close handle if file
	couldn't be created.  Set delete disposition if writing failed,
	instead of calling unlink_nt.
This commit is contained in:
Corinna Vinschen 2007-10-10 16:07:46 +00:00
parent 97f0a0ecf6
commit 4797f5bca3
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2007-10-10 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::bind): Open file for deletion,
too. Don't write to file and especially don't close handle if file
couldn't be created. Set delete disposition if writing failed,
instead of calling unlink_nt.
2007-09-27 Corinna Vinschen <corinna@vinschen.de> 2007-09-27 Corinna Vinschen <corinna@vinschen.de>
* ntdll.h (struct _FILE_COMPRESSION_INFORMATION): Align with definition * ntdll.h (struct _FILE_COMPRESSION_INFORMATION): Align with definition

41
winsup/cygwin/fhandler_socket.cc
View File

@ -831,7 +831,7 @@ fhandler_socket::bind (const struct sockaddr *name, int namelen)
HANDLE fh; HANDLE fh;
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
status = NtCreateFile (&fh, GENERIC_WRITE | SYNCHRONIZE, status = NtCreateFile (&fh, DELETE | FILE_GENERIC_WRITE,
pc.get_object_attr (attr, sa), &io, NULL, fattr, pc.get_object_attr (attr, sa), &io, NULL, fattr,
FILE_SHARE_VALID_FLAGS, FILE_CREATE, FILE_SHARE_VALID_FLAGS, FILE_CREATE,
FILE_NON_DIRECTORY_FILE FILE_NON_DIRECTORY_FILE
@ -845,24 +845,31 @@ fhandler_socket::bind (const struct sockaddr *name, int namelen)
else else
__seterrno_from_nt_status (status); __seterrno_from_nt_status (status);
} }
char buf[sizeof (SOCKET_COOKIE) + 80];
__small_sprintf (buf, "%s%u %c ", SOCKET_COOKIE, sin.sin_port, get_socket_type () == SOCK_STREAM ? 's' : get_socket_type () == SOCK_DGRAM ? 'd' : '-');
af_local_set_secret (strchr (buf, '\0'));
DWORD blen = strlen (buf) + 1;
status = NtWriteFile (fh, NULL, NULL, NULL, &io, buf, blen, NULL, 0);
NtClose (fh);
if (!NT_SUCCESS (status))
{
extern NTSTATUS unlink_nt (path_conv &pc);
__seterrno_from_nt_status (status);
unlink_nt (pc);
}
else else
{ {
set_sun_path (un_addr->sun_path); char buf[sizeof (SOCKET_COOKIE) + 80];
res = 0; __small_sprintf (buf, "%s%u %c ", SOCKET_COOKIE, sin.sin_port,
get_socket_type () == SOCK_STREAM ? 's'
: get_socket_type () == SOCK_DGRAM ? 'd' : '-');
af_local_set_secret (strchr (buf, '\0'));
DWORD blen = strlen (buf) + 1;
status = NtWriteFile (fh, NULL, NULL, NULL, &io, buf, blen, NULL, 0);
if (!NT_SUCCESS (status))
{
__seterrno_from_nt_status (status);
FILE_DISPOSITION_INFORMATION fdi = { TRUE };
status = NtSetInformationFile (fh, &io, &fdi, sizeof fdi,
FileDispositionInformation);
if (!NT_SUCCESS (status))
debug_printf ("Setting delete dispostion failed, status = %p",
status);
}
else
{
set_sun_path (un_addr->sun_path);
res = 0;
}
NtClose (fh);
} }
#undef un_addr #undef un_addr
} }