From ea41722c92313e884368106832d3454114ba88b3 Mon Sep 17 00:00:00 2001
From: Ryan Long <ryan.long@oarcorp.com>
Date: Fri, 30 Apr 2021 13:14:48 -0400
Subject: Change filesystem utime_h handler to utimens_h

Also updated licenses.

Closes #4400
Updates #3899
---
 cpukit/libcsupport/src/__usrenv.c  | 39 +++++++++++++++++++++++++++-----------
 cpukit/libcsupport/src/futimens.c  |  2 +-
 cpukit/libcsupport/src/utimensat.c |  2 +-
 3 files changed, 30 insertions(+), 13 deletions(-)

(limited to 'cpukit/libcsupport/src')

diff --git a/cpukit/libcsupport/src/__usrenv.c b/cpukit/libcsupport/src/__usrenv.c
index 5c25eaa8d6..ebafa9e8b0 100644
--- a/cpukit/libcsupport/src/__usrenv.c
+++ b/cpukit/libcsupport/src/__usrenv.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  *  @file
  *
@@ -6,15 +8,31 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
+ * COPYRIGHT (C) 2021 On-Line Applications Research Corporation (OAR).
+ *
+ * Modifications to support reference counting in the file system are
+ * Copyright (c) 2012 embedded brains GmbH.
  *
- *  Modifications to support reference counting in the file system are
- *  Copyright (c) 2012 embedded brains GmbH.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -145,10 +163,9 @@ static void null_op_fsunmount_me(
   /* Do nothing */
 }
 
-static int null_op_utime(
+static int null_op_utimens(
   const rtems_filesystem_location_info_t *loc,
-  time_t actime,
-  time_t modtime
+  struct timespec times[2]
 )
 {
   return -1;
@@ -207,7 +224,7 @@ static const rtems_filesystem_operations_table null_ops = {
   .mount_h = null_op_mount,
   .unmount_h = null_op_unmount,
   .fsunmount_me_h = null_op_fsunmount_me,
-  .utime_h = null_op_utime,
+  .utimens_h = null_op_utimens,
   .symlink_h = null_op_symlink,
   .readlink_h = null_op_readlink,
   .rename_h = null_op_rename,
diff --git a/cpukit/libcsupport/src/futimens.c b/cpukit/libcsupport/src/futimens.c
index f82c78282f..151e7a168d 100644
--- a/cpukit/libcsupport/src/futimens.c
+++ b/cpukit/libcsupport/src/futimens.c
@@ -76,7 +76,7 @@ int futimens(
     return rv;
   }
 
-  rv = (*currentloc->mt_entry->ops->utime_h)(
+  rv = (*currentloc->mt_entry->ops->utimens_h)(
     currentloc,
     new_times
   );
diff --git a/cpukit/libcsupport/src/utimensat.c b/cpukit/libcsupport/src/utimensat.c
index 3e91b65aae..c053218ad0 100644
--- a/cpukit/libcsupport/src/utimensat.c
+++ b/cpukit/libcsupport/src/utimensat.c
@@ -214,7 +214,7 @@ int utimensat(
     return rv;
   }
 
-  rv = (*currentloc->mt_entry->ops->utime_h)(
+  rv = (*currentloc->mt_entry->ops->utimens_h)(
     currentloc,
     new_times
   );
-- 
cgit v1.2.3