d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Add legacy support for futimens() and utimensat().

Browse Source 
In order to allow using utimensat() in install(1), add futimens() and
utimensat() to -legacy.

The files futimens.c and utimensat.c are modified copies of the files under
lib/libc/sys/ since the libc versions use symbols that do not exist in the
libc on the build system (sys_futimens and sys_utimensat) . I expect the
next non-sweeping change to both sets of files to be to delete them, anyway.

This will allow reverting r299942 (which is a revert of r299850) enabling
nanosecond timestamps in install(1).

Reviewed by:	bdrewery
This commit is contained in:
Jilles Tjoelker 2016-06-09 21:57:34 +00:00
parent ad02cb0399
commit d80f1dd1d7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=301763
5 changed files with 261 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -646,6 +646,8 @@ _worldtmp: .PHONY
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
-p ${WORLDTMP}/legacy/usr >/dev/null
.endif
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${WORLDTMP}/legacy/usr/include >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-p ${WORLDTMP}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \

10
tools/build/Makefile
View File

@ -4,9 +4,11 @@
LIB= egacy
SRC=
INCSGROUPS= INCS
INCSGROUPS= INCS SYSINCS
INCS=
SYSINCSDIR= ${INCLUDEDIR}/sys
BOOTSTRAPPING?= 0
_WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/grp.h || true
@ -33,6 +35,12 @@ SRCS+= reallocarray.c
CFLAGS+= -I${.CURDIR}/../../lib/libc/include
.endif
_WITH_UTIMENS!= grep -c utimensat /usr/include/sys/stat.h || true
.if ${_WITH_UTIMENS} == 0
SYSINCS+= stat.h
SRCS+= futimens.c utimensat.c
.endif
.if empty(SRCS)
SRCS= dummy.c
.endif

96
tools/build/futimens.c Normal file
View File

@ -0,0 +1,96 @@
/*-
* Copyright (c) 2015 Jilles Tjoelker
* All rights reserved.
*
* 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 AUTHOR 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 AUTHOR 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.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#ifndef UTIME_NOW
#define UTIME_NOW -1
#define UTIME_OMIT -2
#endif
int
futimens(int fd, const struct timespec times[2])
{
struct timeval now, tv[2], *tvp;
struct stat sb;
int osreldate;
if (times == NULL || (times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW))
tvp = NULL;
else if (times[0].tv_nsec == UTIME_OMIT &&
times[1].tv_nsec == UTIME_OMIT)
return (0);
else {
if ((times[0].tv_nsec < 0 || times[0].tv_nsec > 999999999) &&
times[0].tv_nsec != UTIME_NOW &&
times[0].tv_nsec != UTIME_OMIT) {
errno = EINVAL;
return (-1);
}
if ((times[1].tv_nsec < 0 || times[1].tv_nsec > 999999999) &&
times[1].tv_nsec != UTIME_NOW &&
times[1].tv_nsec != UTIME_OMIT) {
errno = EINVAL;
return (-1);
}
tv[0].tv_sec = times[0].tv_sec;
tv[0].tv_usec = times[0].tv_nsec / 1000;
tv[1].tv_sec = times[1].tv_sec;
tv[1].tv_usec = times[1].tv_nsec / 1000;
tvp = tv;
if (times[0].tv_nsec == UTIME_OMIT ||
times[1].tv_nsec == UTIME_OMIT) {
if (fstat(fd, &sb) == -1)
return (-1);
if (times[0].tv_nsec == UTIME_OMIT) {
tv[0].tv_sec = sb.st_atim.tv_sec;
tv[0].tv_usec = sb.st_atim.tv_nsec / 1000;
}
if (times[1].tv_nsec == UTIME_OMIT) {
tv[1].tv_sec = sb.st_mtim.tv_sec;
tv[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
}
}
if (times[0].tv_nsec == UTIME_NOW ||
times[1].tv_nsec == UTIME_NOW) {
if (gettimeofday(&now, NULL) == -1)
return (-1);
if (times[0].tv_nsec == UTIME_NOW)
tv[0] = now;
if (times[1].tv_nsec == UTIME_NOW)
tv[1] = now;
}
}
return (futimes(fd, tvp));
}

46
tools/build/stat.h Normal file
View File

@ -0,0 +1,46 @@
/*-
* Copyright (c) 2016 Jilles Tjoelker <jilles@FreeBSD.org>
* All rights reserved.
*
* 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 AUTHOR 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 AUTHOR 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.
*
* $FreeBSD$
*/
#ifndef _LEGACY_SYS_STAT_H_
#define _LEGACY_SYS_STAT_H_
#include_next <sys/stat.h>
#ifndef UTIME_NOW
#define UTIME_NOW -1
#define UTIME_OMIT -2
#endif
__BEGIN_DECLS
int futimens(int, const struct timespec *);
int utimensat(int, const char *, const struct timespec *, int);
__END_DECLS
#endif /* !_LEGACY_SYS_STAT_H_ */

108
tools/build/utimensat.c Normal file
View File

@ -0,0 +1,108 @@
/*-
* Copyright (c) 2015 Jilles Tjoelker
* All rights reserved.
*
* 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 AUTHOR 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 AUTHOR 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.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#ifndef UTIME_NOW
#define UTIME_NOW -1
#define UTIME_OMIT -2
#endif
int
utimensat(int fd, const char *path, const struct timespec times[2], int flag)
{
struct timeval now, tv[2], *tvp;
struct stat sb;
int osreldate;
if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0) {
errno = EINVAL;
return (-1);
}
if (times == NULL || (times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW))
tvp = NULL;
else if (times[0].tv_nsec == UTIME_OMIT &&
times[1].tv_nsec == UTIME_OMIT)
return (0);
else {
if ((times[0].tv_nsec < 0 || times[0].tv_nsec > 999999999) &&
times[0].tv_nsec != UTIME_NOW &&
times[0].tv_nsec != UTIME_OMIT) {
errno = EINVAL;
return (-1);
}
if ((times[1].tv_nsec < 0 || times[1].tv_nsec > 999999999) &&
times[1].tv_nsec != UTIME_NOW &&
times[1].tv_nsec != UTIME_OMIT) {
errno = EINVAL;
return (-1);
}
tv[0].tv_sec = times[0].tv_sec;
tv[0].tv_usec = times[0].tv_nsec / 1000;
tv[1].tv_sec = times[1].tv_sec;
tv[1].tv_usec = times[1].tv_nsec / 1000;
tvp = tv;
if (times[0].tv_nsec == UTIME_OMIT ||
times[1].tv_nsec == UTIME_OMIT) {
if (fstatat(fd, path, &sb, flag) == -1)
return (-1);
if (times[0].tv_nsec == UTIME_OMIT) {
tv[0].tv_sec = sb.st_atim.tv_sec;
tv[0].tv_usec = sb.st_atim.tv_nsec / 1000;
}
if (times[1].tv_nsec == UTIME_OMIT) {
tv[1].tv_sec = sb.st_mtim.tv_sec;
tv[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
}
}
if (times[0].tv_nsec == UTIME_NOW ||
times[1].tv_nsec == UTIME_NOW) {
if (gettimeofday(&now, NULL) == -1)
return (-1);
if (times[0].tv_nsec == UTIME_NOW)
tv[0] = now;
if (times[1].tv_nsec == UTIME_NOW)
tv[1] = now;
}
}
if ((flag & AT_SYMLINK_NOFOLLOW) == 0)
return (futimesat(fd, path, tvp));
else if ((flag & AT_SYMLINK_NOFOLLOW) != 0 &&
(fd == AT_FDCWD || path[0] == '/'))
return (lutimes(path, tvp));
else {
errno = ENOTSUP;
return (-1);
}
}