Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes acquiring timestamp from a file with long path name on Windows #271

Merged
merged 2 commits into from
Sep 19, 2019
Merged

Fixes acquiring timestamp from a file with long path name on Windows #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f27bf6a
Use JavaMilli for jdk >= 11
eatkins Sep 19, 2019
099aa4f
Fix last modified for long paths on windows
eatkins Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions io/src/main/scala/sbt/internal/io/Milli.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import sbt.io.JavaMilli

import scala.collection.JavaConverters.mapAsJavaMapConverter
import scala.reflect.{ ClassTag, classTag }
import scala.util.control.NonFatal

private abstract class Stat[Time_T](size: Int) extends NativeMapped {
val buffer = ByteBuffer.allocate(size).order(ByteOrder.nativeOrder())
Expand Down Expand Up @@ -262,7 +263,7 @@ private object WinMilli extends MilliNative[FILETIME] {

private def getHandle(lpFileName: String, dwDesiredAccess: Int, dwShareMode: Int): HANDLE = {
val hFile = CreateFile(
lpFileName,
"\\\\?\\" + lpFileName,
dwDesiredAccess,
dwShareMode,
null,
Expand Down Expand Up @@ -341,8 +342,18 @@ object Milli {
// "false", disable native millisecond-accurate modification timestamps.
//
private val jdkTimestamps = {
val prop = System.getProperty("sbt.io.jdktimestamps")
!(prop eq null) && (prop.toLowerCase != "false")
System.getProperty("sbt.io.jdktimestamps") match {
case null =>
System.getProperty("java.specification.version") match {
case null => false
case sv =>
try sv.split("\\.").last.toInt match {
case v if v >= 11 => true
case _ => false
} catch { case NonFatal(_) => false }
}
case p => p.toLowerCase != "false"
}
}

private val milli =
Expand Down
31 changes: 31 additions & 0 deletions io/src/test/scala/sbt/io/LastModifiedSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* sbt IO
*
* Copyright 2011 - 2019, Lightbend, Inc.
* Copyright 2008 - 2010, Mark Harrah
*
* Licensed under Apache License 2.0
* (http://www.apache.org/licenses/LICENSE-2.0).
*/

package sbt.io

import java.nio.file.Files

import org.scalatest.FlatSpec

class LastModifiedSpec extends FlatSpec {
"IO.getModifiedTimeOrZero" should "work with long path names" in IO.withTemporaryDirectory {
dir =>
val fileName = "a" * 32
val nested =
(1 to 8).foldLeft(dir.toPath) {
case (d, _) => Files.createDirectories(d.resolve(fileName))
}
val file = Files.createFile(nested.resolve(fileName)).toFile
// in case target platform only has second precision round to nearest second
val lm = (System.currentTimeMillis / 1000) * 1000
IO.setModifiedTimeOrFalse(file, lm)
assert(IO.getModifiedTimeOrZero(file) == lm)
}
}