libsysio-commit

[Libsysio-commit] HEAD: libsysio/src truncate.c

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13939

Modified Files:
	truncate.c 
Log Message:
set EINVAL for non-dir, non-regular file

Index: truncate.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -b -B -p -r1.4 -r1.5
--- truncate.c	10 Oct 2003 18:50:31 -0000	1.4
+++ truncate.c	23 Oct 2003 15:20:31 -0000	1.5
@@ -68,8 +68,10 @@ do_truncate(struct pnode *pno, struct in
 		ino = pno->p_base->pb_ino;
 	if (!ino)
 		return -EBADF;
+	if (S_ISDIR(ino->i_mode))			/* for others too? */
+		return -EISDIR;
 	if (!S_ISREG(ino->i_mode))
-		return -EISDIR;				/* for others too? */
+		return -EINVAL;
 
 	(void )memset(&stbuf, 0, sizeof(stbuf));
 	stbuf.st_size = length;

[Libsysio-commit] HEAD: libsysio/src truncate.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6661/src

Modified Files:
	truncate.c 
Log Message:


Add a new macro, F_CHKRW, that given a pointer to an open file table entry
and one of 'r' or 'w' will return:

	0	if the access is permitted against the open file
	-EBADF	if not opened for the desired access
	-EROFS	if 'w' and the file system was mounted read-only

Then, using the new macro, implemented a check for the truncate/ftruncate
calls to assure the file and mount will permit the operation before
attempting it against the lower-level driver.


Index: truncate.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -b -B -p -r1.13 -r1.14
--- truncate.c	21 Sep 2004 16:18:31 -0000	1.13
+++ truncate.c	10 Apr 2006 23:25:54 -0000	1.14
@@ -43,6 +43,7 @@
 
 #include <unistd.h>
 #include <string.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <assert.h>
 #include <sys/types.h>
@@ -52,6 +53,8 @@
 #include "sysio.h"
 #include "inode.h"
 #include "file.h"
+#include "fs.h"
+#include "mount.h"
 
 #include "sysio-symbols.h"
 
@@ -133,6 +136,9 @@ PREPEND(_, SYSIO_INTERFACE_NAME(ftruncat
 		err = -EBADF;
 		goto out;
 	}
+	err = F_CHKRW(fil, 'w');
+	if (err)
+		goto out;
 	err = do_truncate(NULL, fil->f_ino, length);
 out:
 	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err);

[Libsysio-commit] HEAD: libsysio/src truncate.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25748/src

Modified Files:
	truncate.c 
Log Message:


F_CHKRW macro in file.h was improperly implemented. Not according to
comment. From Bob Glossman at Cray.

Reimplemented and new implementation used in truncate.c


Index: truncate.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -b -B -p -r1.14 -r1.15
--- truncate.c	10 Apr 2006 23:25:54 -0000	1.14
+++ truncate.c	12 Apr 2007 18:00:42 -0000	1.15
@@ -136,9 +136,10 @@ PREPEND(_, SYSIO_INTERFACE_NAME(ftruncat
 		err = -EBADF;
 		goto out;
 	}
-	err = F_CHKRW(fil, 'w');
-	if (err)
+	if (!F_CHKRW(fil, 'w')) {
+		err = -EBADF;
 		goto out;
+	}
 	err = do_truncate(NULL, fil->f_ino, length);
 out:
 	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err);