Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbsd: Move lutimes to bsd compat

Browse Source 
* Rework be149e8ccf since lutimes isn't posix
This commit is contained in:
Alexander von Gluck IV 2017-11-16 08:00:48 -06:00
parent 015b5dd659
commit 1d3d336a97
5 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
headers/compatibility/bsd/sys/time.h Normal file
View File

@ -0,0 +1,29 @@
/*
* Copyright 2016-2017 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _BSD_SYS_TIME_H_
#define _BSD_SYS_TIME_H_
#include_next <sys/time.h>
#ifdef _BSD_SOURCE
#ifdef __cplusplus
extern "C" {
#endif
int lutimes(const char *path, const struct timeval times[2]);
#ifdef __cplusplus
}
#endif
#endif
#endif /* _BSD_SYS_TIME_H_ */

1
headers/posix/sys/time.h
View File

@ -44,7 +44,6 @@ extern int setitimer(int which, const struct itimerval *value, struct itimerval
extern int gettimeofday(struct timeval *tv, void *tz);
extern int utimes(const char *path, const struct timeval times[2]);
extern int lutimes(const char *path, const struct timeval times[2]);
/* legacy */
#ifdef __cplusplus

1
src/libs/bsd/Jamfile
View File

@ -16,6 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
fgetln.c
getpass.c
issetugid.c
lutimes.c
progname.c
pty.cpp
signal.c

23
src/libs/bsd/lutimes.c Normal file
View File

@ -0,0 +1,23 @@
/*
* Copyright, 2016-2017 Haiku, Inc. All rights reserved.
* Released under the terms of the MIT license.
*
* Authors:
* Alexander von Gluck IV, kallisti5@unixzen.com
*/
#include <sys/time.h>
#include <OS.h>
extern int _utimes(const char* path, const struct timeval times[2],
bool traverseLink);
int
lutimes(const char* path, const struct timeval times[2])
{
return _utimes(path, times, false);
}

32
src/system/libroot/posix/sys/utimes.c
View File

@ -17,7 +17,10 @@
int
utimes(const char* path, const struct timeval times[2])
_utimes(const char* path, const struct timeval times[2], bool traverseLink);
extern int
_utimes(const char* path, const struct timeval times[2], bool traverseLink)
{
struct stat stat;
status_t status;
@ -35,36 +38,17 @@ utimes(const char* path, const struct timeval times[2])
}
// traverseLeafLink == true
status = _kern_write_stat(-1, path, true, &stat, sizeof(struct stat),
B_STAT_MODIFICATION_TIME | B_STAT_ACCESS_TIME);
status = _kern_write_stat(-1, path, traverseLink, &stat,
sizeof(struct stat), B_STAT_MODIFICATION_TIME | B_STAT_ACCESS_TIME);
RETURN_AND_SET_ERRNO(status);
}
int
lutimes(const char* path, const struct timeval times[2])
utimes(const char* path, const struct timeval times[2])
{
struct stat stat;
status_t status;
if (times != NULL) {
stat.st_atim.tv_sec = times[0].tv_sec;
stat.st_atim.tv_nsec = times[0].tv_usec * 1000;
stat.st_mtim.tv_sec = times[1].tv_sec;
stat.st_mtim.tv_nsec = times[1].tv_usec * 1000;
} else {
bigtime_t now = real_time_clock_usecs();
stat.st_atim.tv_sec = stat.st_mtim.tv_sec = now / 1000000;
stat.st_atim.tv_nsec = stat.st_mtim.tv_nsec = (now % 1000000) * 1000;
}
// traverseLeafLink == false
status = _kern_write_stat(-1, path, false, &stat, sizeof(struct stat),
B_STAT_MODIFICATION_TIME | B_STAT_ACCESS_TIME);
RETURN_AND_SET_ERRNO(status);
return _utimes(path, times, true);
}