diff options
author | Ryan Long <ryan.long@oarcorp.com> | 2021-04-30 13:14:48 -0400 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2021-05-28 14:27:40 -0500 |
commit | ea41722c92313e884368106832d3454114ba88b3 (patch) | |
tree | 9e7145c88aec146e45a2b6f8040f8767b56629f9 /cpukit/libfs/src/ftpfs | |
parent | psx13: Added tests for utimensat() and futimens() (diff) | |
download | rtems-ea41722c92313e884368106832d3454114ba88b3.tar.bz2 |
Change filesystem utime_h handler to utimens_h
Also updated licenses.
Closes #4400
Updates #3899
Diffstat (limited to 'cpukit/libfs/src/ftpfs')
-rw-r--r-- | cpukit/libfs/src/ftpfs/ftpfs.c | 44 | ||||
-rw-r--r-- | cpukit/libfs/src/ftpfs/tftpDriver.c | 2 |
2 files changed, 25 insertions, 21 deletions
diff --git a/cpukit/libfs/src/ftpfs/ftpfs.c b/cpukit/libfs/src/ftpfs/ftpfs.c index 5e0cb95dd3..06d06bc9cc 100644 --- a/cpukit/libfs/src/ftpfs/ftpfs.c +++ b/cpukit/libfs/src/ftpfs/ftpfs.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** * @file * @@ -5,27 +7,29 @@ */ /* - * Copyright (c) 2009-2012 embedded brains GmbH. - * - * embedded brains GmbH - * Obere Lagerstr. 30 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> - * - * (c) Copyright 2002 - * Thomas Doerfler - * IMD Ingenieurbuero fuer Microcomputertechnik - * Herbststr. 8 - * 82178 Puchheim, Germany - * <Thomas.Doerfler@imd-systems.de> + * COPYRIGHT (C) 2009-2012 embedded brains GmbH. + * COPYRIGHT (C) 2002 IMD Ingenieurbuero fuer Microcomputertechnik. * - * This code has been created after closly inspecting "tftpdriver.c" from Eric - * Norum. + * 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 @@ -1384,7 +1388,7 @@ static const rtems_filesystem_operations_table rtems_ftpfs_ops = { .mount_h = rtems_filesystem_default_mount, .unmount_h = rtems_filesystem_default_unmount, .fsunmount_me_h = rtems_ftpfs_unmount_me, - .utime_h = rtems_filesystem_default_utime, + .utimens_h = rtems_filesystem_default_utimens, .symlink_h = rtems_filesystem_default_symlink, .readlink_h = rtems_filesystem_default_readlink, .rename_h = rtems_filesystem_default_rename, diff --git a/cpukit/libfs/src/ftpfs/tftpDriver.c b/cpukit/libfs/src/ftpfs/tftpDriver.c index 7cbb402b63..bc0e74ad86 100644 --- a/cpukit/libfs/src/ftpfs/tftpDriver.c +++ b/cpukit/libfs/src/ftpfs/tftpDriver.c @@ -1039,7 +1039,7 @@ static const rtems_filesystem_operations_table rtems_tftp_ops = { .mount_h = rtems_filesystem_default_mount, .unmount_h = rtems_filesystem_default_unmount, .fsunmount_me_h = rtems_tftpfs_shutdown, - .utime_h = rtems_filesystem_default_utime, + .utimens_h = rtems_filesystem_default_utimens, .symlink_h = rtems_filesystem_default_symlink, .readlink_h = rtems_filesystem_default_readlink, .rename_h = rtems_filesystem_default_rename, |