r1806 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: mbanck
Date: 2006-09-28 09:29:08 +0000 (Thu, 28 Sep 2006)
New Revision: 1806
Added:
glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add hurd-i386/submitted-futimes.diff (fix touch on the Hurd) by
Thomas Schwinge and Samuel Thibault.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-09-24 16:49:07 UTC (rev 1805)
+++ glibc-package/trunk/debian/changelog 2006-09-28 09:29:08 UTC (rev 1806)
@@ -6,7 +6,9 @@
[ Michael Banck ]
* Add hurd-i386/cvs-getsid.diff (fix getsid(0) on the Hurd) by
- Samuel Thibault (patch from glibc-2.4)
+ Samuel Thibault (patch from glibc-2.4).
+ * Add hurd-i386/submitted-futimes.diff (fix touch on the Hurd) by
+ Thomas Schwinge and Samuel Thibault.
-- Aurelien Jarno <aurel32@debian.org> Thu, 24 Aug 2006 21:04:20 +0200
Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff 2006-09-28 09:29:08 UTC (rev 1806)
@@ -0,0 +1,38 @@
+Index: sysdeps/mach/hurd/futimes.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/futimes.c,v
+retrieving revision 1.1
+diff -u -p -r1.1 futimes.c
+--- sysdeps/mach/hurd/futimes.c 27 Aug 2002 02:09:20 -0000 1.1
++++ sysdeps/mach/hurd/futimes.c 23 Sep 2006 12:29:52 -0000
+@@ -28,20 +28,22 @@
+ int
+ __futimes (int fd, const struct timeval tvp[2])
+ {
+- struct timeval timevals[2];
+ error_t err;
++ time_value_t new_atime, new_mtime;
+
+ if (tvp == NULL)
+- {
+ /* Setting the number of microseconds to `-1' tells the
+ underlying filesystems to use the current time. */
+- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
+- tvp = timevals;
++ new_atime.microseconds = new_mtime.microseconds = -1;
++ else
++ {
++ new_atime.seconds = tvp[0].tv_sec;
++ new_atime.microseconds = tvp[0].tv_usec;
++ new_mtime.seconds = tvp[1].tv_sec;
++ new_mtime.microseconds = tvp[1].tv_usec;
+ }
+
+- err = HURD_DPORT_USE (fd, __file_utimes (port,
+- *(time_value_t *) &tvp[0],
+- *(time_value_t *) &tvp[1]));
++ err = HURD_DPORT_USE (fd, __file_utimes (port, new_atime, new_mtime));
+ return err ? __hurd_dfail (fd, err) : 0;
+ }
+ weak_alias (__futimes, futimes)
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-09-24 16:49:07 UTC (rev 1805)
+++ glibc-package/trunk/debian/patches/series 2006-09-28 09:29:08 UTC (rev 1806)
@@ -79,6 +79,7 @@
hurd-i386/cvs-posix-opts.diff -p1
hurd-i386/local-enable-ldconfig.diff -p1
hurd-i386/local-mlock.diff -p1
+hurd-i386/submitted-futimes.diff -p0
hurd-i386/submitted-ioctl-decode-argument.diff -p0
hurd-i386/submitted-sysvshm.diff -p1
Reply to: