From ea41722c92313e884368106832d3454114ba88b3 Mon Sep 17 00:00:00 2001 From: Ryan Long 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/libfs/src/imfs/imfs_init.c | 30 +++++++++++++++---- cpukit/libfs/src/imfs/imfs_utime.c | 41 ------------------------- cpukit/libfs/src/imfs/imfs_utimens.c | 58 ++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 47 deletions(-) delete mode 100644 cpukit/libfs/src/imfs/imfs_utime.c create mode 100644 cpukit/libfs/src/imfs/imfs_utimens.c (limited to 'cpukit/libfs/src/imfs') diff --git a/cpukit/libfs/src/imfs/imfs_init.c b/cpukit/libfs/src/imfs/imfs_init.c index 1b9b76912a..8685caae68 100644 --- a/cpukit/libfs/src/imfs/imfs_init.c +++ b/cpukit/libfs/src/imfs/imfs_init.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** * @file * @@ -7,12 +9,28 @@ */ /* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). + * COPYRIGHT (C) 1989, 2021 On-Line Applications Research Corporation (OAR). + * + * 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 @@ -40,7 +58,7 @@ static const rtems_filesystem_operations_table IMFS_ops = { .mount_h = IMFS_mount, .unmount_h = IMFS_unmount, .fsunmount_me_h = IMFS_fsunmount, - .utime_h = IMFS_utime, + .utimens_h = IMFS_utimens, .symlink_h = IMFS_symlink, .readlink_h = IMFS_readlink, .rename_h = IMFS_rename, diff --git a/cpukit/libfs/src/imfs/imfs_utime.c b/cpukit/libfs/src/imfs/imfs_utime.c deleted file mode 100644 index 21e5139ce7..0000000000 --- a/cpukit/libfs/src/imfs/imfs_utime.c +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file - * - * @ingroup IMFS - * - * @brief Set IMFS File Access and Modification Times - */ - -/* - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * 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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include - -int IMFS_utime( - const rtems_filesystem_location_info_t *loc, - time_t actime, - time_t modtime -) -{ - IMFS_jnode_t *the_jnode; - - the_jnode = (IMFS_jnode_t *) loc->node_access; - - the_jnode->stat_atime = actime; - the_jnode->stat_mtime = modtime; - the_jnode->stat_ctime = time( NULL ); - - return 0; -} diff --git a/cpukit/libfs/src/imfs/imfs_utimens.c b/cpukit/libfs/src/imfs/imfs_utimens.c new file mode 100644 index 0000000000..78cc766ab0 --- /dev/null +++ b/cpukit/libfs/src/imfs/imfs_utimens.c @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup IMFS + * + * @brief Set IMFS File Access and Modification Times + */ + +/* + * COPYRIGHT (C) 1989, 2021 On-Line Applications Research Corporation (OAR). + * + * 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. + * + * 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 +#include "config.h" +#endif + +#include + +#include + +int IMFS_utimens( + const rtems_filesystem_location_info_t *loc, + struct timespec times[2] +) +{ + IMFS_jnode_t *the_jnode; + + the_jnode = (IMFS_jnode_t *) loc->node_access; + + the_jnode->stat_atime = times[0].tv_sec; + the_jnode->stat_mtime = times[1].tv_sec; + the_jnode->stat_ctime = time( NULL ); + + return 0; +} -- cgit v1.2.3