sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

Fix different args to sys_fcntl without going varargs....

Browse Source 
Jeremy.
(This used to be commit 65742067e07195048edcee46dae95a58a4a50950)
This commit is contained in:
Jeremy Allison 2002-04-19 17:30:27 +00:00
parent 8bc0e73a43
commit 4f4d25d3e1
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/lib/system.c
View File

@ -151,7 +151,22 @@ ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *f
A fcntl wrapper that will deal with EINTR.
********************************************************************/
int sys_fcntl(int fd, int cmd, void *arg)
int sys_fcntl_ptr(int fd, int cmd, void *arg)
{
int ret;
do {
errno = 0;
ret = fcntl(fd, cmd, arg);
} while (ret == -1 && errno == EINTR);
return ret;
}
/*******************************************************************
A fcntl wrapper that will deal with EINTR.
********************************************************************/
int sys_fcntl_long(int fd, int cmd, long arg)
{
int ret;

6
source3/lib/util.c
View File

@ -552,13 +552,13 @@ int set_blocking(int fd, BOOL set)
#endif
#endif
if((val = sys_fcntl(fd, F_GETFL, 0)) == -1)
if((val = sys_fcntl_long(fd, F_GETFL, 0)) == -1)
return -1;
if(set) /* Turn blocking on - ie. clear nonblock flag */
val &= ~FLAG_TO_SET;
else
val |= FLAG_TO_SET;
return sys_fcntl( fd, F_SETFL, val);
return sys_fcntl_long( fd, F_SETFL, val);
#undef FLAG_TO_SET
}
@ -1353,7 +1353,7 @@ BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
lock.l_len = count;
lock.l_pid = 0;
ret = sys_fcntl(fd,op,&lock);
ret = sys_fcntl_ptr(fd,op,&lock);
if (ret == -1 && errno != 0)
DEBUG(3,("fcntl_lock: fcntl lock gave errno %d (%s)\n",errno,strerror(errno)));

6
source3/smbd/notify_kernel.c
View File

@ -130,7 +130,7 @@ static void *kernel_register_notify(connection_struct *conn, char *path, uint32
return NULL;
}
if (sys_fcntl(fd, F_SETSIG, RT_SIGNAL_NOTIFY) == -1) {
if (sys_fcntl_long(fd, F_SETSIG, RT_SIGNAL_NOTIFY) == -1) {
DEBUG(3,("Failed to set signal handler for change notify\n"));
return NULL;
}
@ -147,7 +147,7 @@ static void *kernel_register_notify(connection_struct *conn, char *path, uint32
if (flags & FILE_NOTIFY_CHANGE_EA) kernel_flags |= DN_ATTRIB;
if (flags & FILE_NOTIFY_CHANGE_FILE_NAME) kernel_flags |= DN_RENAME|DN_DELETE;
if (sys_fcntl(fd, F_NOTIFY, kernel_flags) == -1) {
if (sys_fcntl_long(fd, F_NOTIFY, kernel_flags) == -1) {
DEBUG(3,("Failed to set async flag for change notify\n"));
return NULL;
}
@ -168,7 +168,7 @@ static BOOL kernel_notify_available(void)
int fd, ret;
fd = open("/tmp", O_RDONLY);
if (fd == -1) return False; /* uggh! */
ret = sys_fcntl(fd, F_NOTIFY, 0);
ret = sys_fcntl_long(fd, F_NOTIFY, 0);
close(fd);
return ret == 0;
}

12
source3/smbd/oplock_irix.c
View File

@ -56,7 +56,7 @@ static BOOL irix_oplocks_available(void)
unlink(tmpname);
if(sys_fcntl(fd, F_OPLKREG, pfd[1]) == -1) {
if(sys_fcntl_long(fd, F_OPLKREG, pfd[1]) == -1) {
DEBUG(0,("check_kernel_oplocks: Kernel oplocks are not available on this machine. \
Disabling kernel oplock support.\n" ));
close(pfd[0]);
@ -65,7 +65,7 @@ Disabling kernel oplock support.\n" ));
return False;
}
if(sys_fcntl(fd, F_OPLKACK, OP_REVOKE) < 0 ) {
if(sys_fcntl_long(fd, F_OPLKACK, OP_REVOKE) < 0 ) {
DEBUG(0,("check_kernel_oplocks: Error when removing kernel oplock. Error was %s. \
Disabling kernel oplock support.\n", strerror(errno) ));
close(pfd[0]);
@ -111,7 +111,7 @@ Error was %s.\n", strerror(errno) ));
* request outstanding.
*/
if(sys_fcntl(oplock_pipe_read, F_OPLKSTAT, &os) < 0) {
if(sys_fcntl_ptr(oplock_pipe_read, F_OPLKSTAT, &os) < 0) {
DEBUG(0,("receive_local_message: fcntl of kernel notification failed. \
Error was %s.\n", strerror(errno) ));
if(errno == EAGAIN) {
@ -164,7 +164,7 @@ dev = %x, inode = %.0f\n, file_id = %ul", (unsigned int)fsp->dev, (double)fsp->i
static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type)
{
if (sys_fcntl(fsp->fd, F_OPLKREG, oplock_pipe_write) == -1) {
if (sys_fcntl_long(fsp->fd, F_OPLKREG, oplock_pipe_write) == -1) {
if(errno != EAGAIN) {
DEBUG(0,("set_file_oplock: Unable to get kernel oplock on file %s, dev = %x, \
inode = %.0f, file_id = %ul. Error was %s\n",
@ -195,7 +195,7 @@ static void irix_release_kernel_oplock(files_struct *fsp)
* Check and print out the current kernel
* oplock state of this file.
*/
int state = sys_fcntl(fsp->fd, F_OPLKACK, -1);
int state = sys_fcntl_long(fsp->fd, F_OPLKACK, -1);
dbgtext("release_kernel_oplock: file %s, dev = %x, inode = %.0f file_id = %ul, has kernel \
oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev,
(double)fsp->inode, fsp->file_id, state );
@ -204,7 +204,7 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev,
/*
* Remove the kernel oplock on this file.
*/
if(sys_fcntl(fsp->fd, F_OPLKACK, OP_REVOKE) < 0) {
if(sys_fcntl_long(fsp->fd, F_OPLKACK, OP_REVOKE) < 0) {
if( DEBUGLVL( 0 )) {
dbgtext("release_kernel_oplock: Error when removing kernel oplock on file " );
dbgtext("%s, dev = %x, inode = %.0f, file_id = %ul. Error was %s\n",