marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Always switch back to server dir when open_fd returns. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
oldstable
Sebastian Lackner 2015-09-24 04:20:18 +02:00 committed by Alexandre Julliard
parent 205799d131
commit 0425c0eb95
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/fd.c
View File

@ -1835,34 +1835,31 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
fd->closed = closed_fd;
fd->cacheable = !inode->device->removable;
list_add_head( &inode->open, &fd->inode_entry );
closed_fd = NULL;
/* check directory options */
if ((options & FILE_DIRECTORY_FILE) && !S_ISDIR(st.st_mode))
{
release_object( fd );
set_error( STATUS_NOT_A_DIRECTORY );
return NULL;
goto error;
}
if ((options & FILE_NON_DIRECTORY_FILE) && S_ISDIR(st.st_mode))
{
release_object( fd );
set_error( STATUS_FILE_IS_A_DIRECTORY );
return NULL;
goto error;
}
if ((err = check_sharing( fd, access, sharing, flags, options )))
{
release_object( fd );
set_error( err );
return NULL;
goto error;
}
closed_fd->unlink = (options & FILE_DELETE_ON_CLOSE) != 0;
fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0;
if (flags & O_TRUNC)
{
if (S_ISDIR(st.st_mode))
{
release_object( fd );
set_error( STATUS_OBJECT_NAME_COLLISION );
return NULL;
goto error;
}
ftruncate( fd->unix_fd, 0 );
}
@ -1877,6 +1874,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
free( closed_fd );
fd->cacheable = 1;
}
if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */
return fd;
error: