Changeset 1ad26cd in rtems

Timestamp:

Oct 18, 2018, 10:38:58 AM (2 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

3cf12c9

Parents:

3825926

git-author:

Sebastian Huber <sebastian.huber@…> (10/18/18 10:38:58)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/22/18 06:06:05)

Message:

Support O_NOFOLLOW open() flag

Close #3546.

Files:

• cpukit/libcsupport/src/open.c (modified) (1 diff)
• testsuites/psxtests/psxfile01/test.c (modified) (4 diffs)

cpukit/libcsupport/src/open.c

@@ -75 +75 @@
   bool truncate = (oflag & O_TRUNC) == O_TRUNC;
   bool open_dir;
-  int eval_flags = RTEMS_FS_FOLLOW_LINK
+#ifdef O_NOFOLLOW
+  int follow = (oflag & O_NOFOLLOW) == O_NOFOLLOW ? 0 : RTEMS_FS_FOLLOW_LINK;
+#else
+  int follow = RTEMS_FS_FOLLOW_LINK;
+#endif
+  int eval_flags = follow
     | (read_access ? RTEMS_FS_PERMS_READ : 0)
     | (write_access ? RTEMS_FS_PERMS_WRITE : 0)

testsuites/psxtests/psxfile01/test.c

@@ -60 +60 @@
 static const char somefile[] = "somefile";
 
+static const char somelink[] = "somelink";
+
 /*
  *  File test support routines.
@@ -153 +155 @@
   status = unlink( somefile );
   rtems_test_assert( status == 0 );
+
+  errno = 0;
+  fd = open( somefile, O_RDONLY );
+  rtems_test_assert( fd == -1 );
+  rtems_test_assert( errno == ENOENT );
 }
 
@@ -175 +182 @@
   status = unlink( somefile );
   rtems_test_assert( status == 0 );
+
+  errno = 0;
+  fd = open( somefile, O_RDONLY );
+  rtems_test_assert( fd == -1 );
+  rtems_test_assert( errno == ENOENT );
+}
+
+static void test_open_nofollow(void)
+{
+  int status;
+  int fd;
+  struct stat st;
+
+  fd = open( somefile, O_CREAT, S_IRWXU );
+  rtems_test_assert( fd >= 0 );
+
+  status = close( fd );
+  rtems_test_assert( status == 0 );
+
+  status = symlink( somefile, somelink );
+  rtems_test_assert( status == 0 );
+
+  fd = open( somelink, O_RDONLY );
+  rtems_test_assert( fd >= 0 );
+
+  status = fstat( fd, &st );
+  rtems_test_assert( status == 0 );
+  rtems_test_assert( S_ISREG( st.st_mode ) );
+
+  status = close( fd );
+  rtems_test_assert( status == 0 );
+
+#ifdef O_NOFOLLOW
+  fd = open( somelink, O_RDONLY | O_NOFOLLOW );
+  rtems_test_assert( fd >= 0 );
+
+  status = fstat( fd, &st );
+  rtems_test_assert( status == 0 );
+  rtems_test_assert( S_ISLNK( st.st_mode ) );
+
+  status = close( fd );
+  rtems_test_assert( status == 0 );
+#endif
+
+  status = unlink( somelink );
+  rtems_test_assert( status == 0 );
+
+  errno = 0;
+  fd = open( somelink, O_RDONLY );
+  rtems_test_assert( fd == -1 );
+  rtems_test_assert( errno == ENOENT );
+
+  status = unlink( somefile );
+  rtems_test_assert( status == 0 );
+
+  errno = 0;
+  fd = open( somefile, O_RDONLY );
+  rtems_test_assert( fd == -1 );
+  rtems_test_assert( errno == ENOENT );
 }
 
@@ -210 +276 @@
   test_open_directory();
   test_open_cloexec();
+  test_open_nofollow();
 
   /*