mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Fix use of utimensat(2).

Browse source 
* libguile/posix.c (scm_utime): Use "#ifdef HAVE_UTIMENSAT", not "#if
  HAVE_UTIMENSAT".  Fix GCC warning around call to utimensat(2):
  "passing argument 3 of 'utimensat' from incompatible pointer type".

* test-suite/tests/posix.test ("utime"): New test prefix.
This commit is contained in:
Ludovic Courtès 2010-01-19 00:23:33 +01:00
parent 5b6b22e8ea
commit adfb428466
2 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libguile/posix.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. /* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -1399,7 +1399,7 @@ SCM_DEFINE (scm_utime, "utime", 1, 5, 0,
if (SCM_UNBNDP (actime)) if (SCM_UNBNDP (actime))
{ {
#if HAVE_UTIMENSAT #ifdef HAVE_UTIMENSAT
atim_sec = 0; atim_sec = 0;
atim_nsec = UTIME_NOW; atim_nsec = UTIME_NOW;
#else #else
@ -1418,7 +1418,7 @@ SCM_DEFINE (scm_utime, "utime", 1, 5, 0,
if (SCM_UNBNDP (modtime)) if (SCM_UNBNDP (modtime))
{ {
#if HAVE_UTIMENSAT #ifdef HAVE_UTIMENSAT
mtim_sec = 0; mtim_sec = 0;
mtim_nsec = UTIME_NOW; mtim_nsec = UTIME_NOW;
#else #else
@ -1440,7 +1440,7 @@ SCM_DEFINE (scm_utime, "utime", 1, 5, 0,
else else
f = SCM_NUM2INT (6, flags); f = SCM_NUM2INT (6, flags);
#if HAVE_UTIMENSAT #ifdef HAVE_UTIMENSAT
{ {
struct timespec times[2]; struct timespec times[2];
times[0].tv_sec = atim_sec; times[0].tv_sec = atim_sec;
@ -1449,7 +1449,7 @@ SCM_DEFINE (scm_utime, "utime", 1, 5, 0,
times[1].tv_nsec = mtim_nsec; times[1].tv_nsec = mtim_nsec;
STRING_SYSCALL (pathname, c_pathname, STRING_SYSCALL (pathname, c_pathname,
rv = utimensat (AT_FDCWD, c_pathname, &times, f)); rv = utimensat (AT_FDCWD, c_pathname, times, f));
} }
#else #else
{ {

21
test-suite/tests/posix.test
View file

@ -1,6 +1,6 @@
;;;; posix.test --- Test suite for Guile POSIX functions. -*- scheme -*- ;;;; posix.test --- Test suite for Guile POSIX functions. -*- scheme -*-
;;;; ;;;;
;;;; Copyright 2003, 2004, 2006, 2007 Free Software Foundation, Inc. ;;;; Copyright 2003, 2004, 2006, 2007, 2010 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -160,4 +160,23 @@
(throw 'unsupported) (throw 'unsupported)
(ttyname file))))) (ttyname file)))))
;;
;; utimes
;;
(with-test-prefix "utime"
(pass-if "valid argument (second resolution)"
(let ((file "posix.test-utime"))
(dynamic-wind
(lambda ()
(close-port (open-output-file file)))
(lambda ()
(let* ((accessed (+ (current-time) 3600))
(modified (- accessed 1000)))
(utime file accessed modified)
(let ((info (stat file)))
(and (= (stat:atime info) accessed)
(= (stat:mtime info) modified)))))
(lambda ()
(delete-file file))))))