[Commits] r16044 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/futimes.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Dec  2 00:02:19 2011
New Revision: 16044

Log:
Import glibc-mainline for 2011-12-02

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Dec  2 00:02:19 2011
@@ -1,3 +1,8 @@
+2011-12-01  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/futimes.c: Truncate time values when
+	falling back to utime.
+
 2011-11-30  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* sysdeps/s390/fpu/libm-test-ulps: Relax cpow (2 + 3 i, 4 + 0 i)

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c Fri Dec  2 00:02:19 2011
@@ -1,5 +1,5 @@
 /* futimes -- change access and modification times of open file.  Linux version.
-   Copyright (C) 2002,2003,2005,2006,2007 Free Software Foundation, Inc.
+   Copyright (C) 2002,2003,2005,2006,2007,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -95,8 +95,8 @@
       if (tvp != NULL)
 	{
 	  times = &buf;
-	  buf.actime = tvp[0].tv_sec + (tvp[0].tv_usec + 500000) / 1000000;
-	  buf.modtime = tvp[1].tv_sec + (tvp[1].tv_usec + 500000) / 1000000;
+	  buf.actime = tvp[0].tv_sec;
+	  buf.modtime = tvp[1].tv_sec;
 	}
       else
 	times = NULL;

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits