Hi!
> If utimensat(2) is not defined on the platform we switch
> to using utimes(2).
>
> Signed-off-by: Stanislav Kholmanskikh <[email protected]>
> ---
> include/safe_file_ops.h | 1 +
> lib/safe_file_ops.c | 53
> ++++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 53 insertions(+), 1 deletions(-)
>
> diff --git a/include/safe_file_ops.h b/include/safe_file_ops.h
> index 77ad594..1815984 100644
> --- a/include/safe_file_ops.h
> +++ b/include/safe_file_ops.h
> @@ -36,6 +36,7 @@
>
> #include <sys/stat.h>
>
> +#include "lapi/utime.h"
> #include "test.h"
>
> /*
> diff --git a/lib/safe_file_ops.c b/lib/safe_file_ops.c
> index 8cfd264..dee8558 100644
> --- a/lib/safe_file_ops.c
> +++ b/lib/safe_file_ops.c
> @@ -21,11 +21,15 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> */
>
> +#include "config.h"
> #include <stdarg.h>
> #include <stdio.h>
> +#include <sys/time.h>
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <fcntl.h>
> +#include <unistd.h>
> +#include <utime.h>
>
> #include "safe_file_ops.h"
>
> @@ -186,10 +190,57 @@ void safe_touch(const char *file, const int lineno,
> pathname, file, lineno);
> }
>
> +
> +#if HAVE_UTIMENSAT
> ret = utimensat(AT_FDCWD, pathname, times, 0);
> +#else
> + if (times == NULL) {
> + ret = utimes(pathname, NULL);
> + } else {
> + int i;
> + struct stat sb;
> + struct timeval cotimes[2];
> +
> + ret = stat(pathname, &sb);
> + if (ret == -1)
> + tst_brkm(TBROK | TERRNO, cleanup_fn,
> + "Failed to stat file '%s' at %s:%d",
> + pathname, file, lineno);
> +
> + ret = gettimeofday(&(cotimes[0]), NULL);
^
this is the same as cotimes as
it translates to &(*(cotimes+0))
> + if (ret == -1)
> + tst_brkm(TBROK | TERRNO, cleanup_fn,
> + "Failed to gettimeofday() at %s:%d",
> + file, lineno);
> + cotimes[1] = cotimes[0];
> +
> + for (i = 0; i < 2; i++) {
> + if (times[i].tv_nsec == UTIME_NOW) {
> + /* do nothing, because cotimes[i]
> + * already has the current time
> + */
> + } else if (times[i].tv_nsec == UTIME_OMIT) {
> + if (i == 0) {
> + cotimes[i].tv_sec = sb.st_atime;
> + cotimes[i].tv_usec = sb.st_atim.tv_nsec;
> + cotimes[i].tv_usec /= 1000;
> + } else {
> + cotimes[i].tv_sec = sb.st_mtime;
> + cotimes[i].tv_usec = sb.st_mtim.tv_nsec;
> + cotimes[i].tv_usec /= 1000;
> + }
> + } else {
> + cotimes[i].tv_sec = times[i].tv_sec;
> + cotimes[i].tv_usec = times[i].tv_nsec / 1000;
> + }
This part would be easier to read as a swith()
statement:
switch (times[i].tv_nsec) {
case UTIME_NOW:
break;
case UTIME_OMIT:
...
break;
}
Moreover I would move it into a function such as:
void set_time(struct timeval *res, struct timespec *src,
long cur_tv_sec, long cur_tv_usec)
{
switch (src[i].tv_nsec) {
...
}
And call it as:
set_time(cotimes, times, sb.st_atime, sb.st_atim.tv_nsec/1000);
set_time(cotimes+1, times+1, sb.st_mtime, sb.st_mtim.tv_nsec/1000);
Instead of the for loop, what do you think?
> + }
> +
> + ret = utimes(pathname, cotimes);
> + }
> +#endif
> if (ret == -1)
> tst_brkm(TBROK | TERRNO, cleanup_fn,
> - "Failed to do utimensat() on file '%s' at %s:%d",
> + "Failed to update the access/modification times on file
> '%s' at %s:%d",
> pathname, file, lineno);
> }
>
The rest of the patchset looks fine to me.
--
Cyril Hrubis
[email protected]
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
