From 75dd0ea28ca081f8177d36a1eeda0bb91b3f4ab2 Mon Sep 17 00:00:00 2001 From: dkf Date: Fri, 7 Mar 2003 11:38:28 +0000 Subject: * generic/tclCmdAH.c (Tcl_FileObjCmd): Fix the setting of a file's mtime and atime on 64-bit platforms. [Bug #698146] --- ChangeLog | 5 +++++ generic/tclCmdAH.c | 26 +++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbc88be..b806f78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-07 Donal K. Fellows + + * generic/tclCmdAH.c (Tcl_FileObjCmd): Fix the setting of a file's + mtime and atime on 64-bit platforms. [Bug #698146] + 2003-03-06 Mo DeJong * tests/io.test: Doh! Undo accidental commenting diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index 2992367..03c1c38 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCmdAH.c,v 1.27 2002/07/02 12:16:05 vincentdarley Exp $ + * RCS: @(#) $Id: tclCmdAH.c,v 1.28 2003/03/07 11:38:29 dkf Exp $ */ #include "tclInt.h" @@ -835,11 +835,17 @@ Tcl_FileObjCmd(dummy, interp, objc, objv) return TCL_ERROR; } if (objc == 4) { - if (Tcl_GetLongFromObj(interp, objv[3], - (long*)(&buf.st_atime)) != TCL_OK) { + /* + * Need separate variable for reading longs from an + * object on 64-bit platforms. [Bug #698146] + */ + long newTime; + + if (Tcl_GetLongFromObj(interp, objv[3], &newTime) != TCL_OK) { return TCL_ERROR; } - tval.actime = buf.st_atime; + + tval.actime = newTime; tval.modtime = buf.st_mtime; if (Tcl_FSUtime(objv[2], &tval) != 0) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), @@ -1071,12 +1077,18 @@ Tcl_FileObjCmd(dummy, interp, objc, objv) return TCL_ERROR; } if (objc == 4) { - if (Tcl_GetLongFromObj(interp, objv[3], - (long*)(&buf.st_mtime)) != TCL_OK) { + /* + * Need separate variable for reading longs from an + * object on 64-bit platforms. [Bug #698146] + */ + long newTime; + + if (Tcl_GetLongFromObj(interp, objv[3], &newTime) != TCL_OK) { return TCL_ERROR; } + tval.actime = buf.st_atime; - tval.modtime = buf.st_mtime; + tval.modtime = newTime; if (Tcl_FSUtime(objv[2], &tval) != 0) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "could not set modification time for file \"", -- cgit v0.12