Merge pull request #2008 from compnerd/security-through-obscurity

Author: swift-ci

TestFoundation/TestFileHandle.swift

@@ -301,38 +301,41 @@ class TestFileHandle : XCTestCase {
     }
 
     func test_truncateFile() {
-        mkstemp(template: "test_truncateFile.XXXXXX") { (fh) in
-            fh.truncateFile(atOffset: 50)
-            XCTAssertEqual(fh.offsetInFile, 50)
+        let url: URL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(ProcessInfo.processInfo.globallyUniqueString, isDirectory: false)
+        _ = FileManager.default.createFile(atPath: url.path, contents: Data())
 
-            fh.truncateFile(atOffset: 0)
-            XCTAssertEqual(fh.offsetInFile, 0)
+        let fh: FileHandle = FileHandle(forUpdatingAtPath: url.path)!
 
-            fh.truncateFile(atOffset: 100)
-            XCTAssertEqual(fh.offsetInFile, 100)
+        fh.truncateFile(atOffset: 50)
+        XCTAssertEqual(fh.offsetInFile, 50)
 
-            fh.write(Data([1, 2]))
-            XCTAssertEqual(fh.offsetInFile, 102)
+        fh.truncateFile(atOffset: 0)
+        XCTAssertEqual(fh.offsetInFile, 0)
 
-            fh.seek(toFileOffset: 4)
-            XCTAssertEqual(fh.offsetInFile, 4)
+        fh.truncateFile(atOffset: 100)
+        XCTAssertEqual(fh.offsetInFile, 100)
 
-            (0..<20).forEach { fh.write(Data([$0])) }
-            XCTAssertEqual(fh.offsetInFile, 24)
+        fh.write(Data([1, 2]))
+        XCTAssertEqual(fh.offsetInFile, 102)
 
-            fh.seekToEndOfFile()
-            XCTAssertEqual(fh.offsetInFile, 102)
+        fh.seek(toFileOffset: 4)
+        XCTAssertEqual(fh.offsetInFile, 4)
 
-            fh.truncateFile(atOffset: 10)
-            XCTAssertEqual(fh.offsetInFile, 10)
+        (0..<20).forEach { fh.write(Data([$0])) }
+        XCTAssertEqual(fh.offsetInFile, 24)
 
-            fh.seek(toFileOffset: 0)
-            XCTAssertEqual(fh.offsetInFile, 0)
+        fh.seekToEndOfFile()
+        XCTAssertEqual(fh.offsetInFile, 102)
 
-            let data = fh.readDataToEndOfFile()
-            XCTAssertEqual(data.count, 10)
-            XCTAssertEqual(data, Data([0, 0, 0, 0, 0, 1, 2, 3, 4, 5]))
-        }
+        fh.truncateFile(atOffset: 10)
+        XCTAssertEqual(fh.offsetInFile, 10)
+
+        fh.seek(toFileOffset: 0)
+        XCTAssertEqual(fh.offsetInFile, 0)
+
+        let data = fh.readDataToEndOfFile()
+        XCTAssertEqual(data.count, 10)
+        XCTAssertEqual(data, Data([0, 0, 0, 0, 0, 1, 2, 3, 4, 5]))
     }
 
     func test_readabilityHandlerCloseFileRace() throws {

TestFoundation/TestProcess.swift

@@ -231,21 +231,24 @@ class TestProcess : XCTestCase {
         process.launchPath = "/usr/bin/which"
         process.arguments = ["which"]
 
-        mkstemp(template: "TestProcess.XXXXXX") { handle in
-            process.standardOutput = handle
+        let url: URL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(ProcessInfo.processInfo.globallyUniqueString, isDirectory: false)
+        _ = FileManager.default.createFile(atPath: url.path, contents: Data())
 
-            process.launch()
-            process.waitUntilExit()
-            XCTAssertEqual(process.terminationStatus, 0)
+        let handle: FileHandle = FileHandle(forUpdatingAtPath: url.path)!
 
-            handle.seek(toFileOffset: 0)
-            let data = handle.readDataToEndOfFile()
-            guard let string = String(data: data, encoding: .ascii) else {
-                XCTFail("Could not read stdout")
-                return
-            }
-            XCTAssertTrue(string.hasSuffix("/which\n"))
+        process.standardOutput = handle
+
+        process.launch()
+        process.waitUntilExit()
+        XCTAssertEqual(process.terminationStatus, 0)
+
+        handle.seek(toFileOffset: 0)
+        let data = handle.readDataToEndOfFile()
+        guard let string = String(data: data, encoding: .ascii) else {
+            XCTFail("Could not read stdout")
+            return
         }
+        XCTAssertTrue(string.hasSuffix("/which\n"))
     }
 
     func test_passthrough_environment() {

TestFoundation/TestUtils.swift

@@ -42,16 +42,3 @@ func ensureFiles(_ fileNames: [String]) -> Bool {
     }
     return result
 }
-
-func mkstemp(template: String, body: (FileHandle) throws -> Void) rethrows {
-    let url = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(template)
-
-    try url.withUnsafeFileSystemRepresentation {
-        switch mkstemp(UnsafeMutablePointer(mutating: $0!)) {
-        case -1: XCTFail("Could not create temporary file")
-        case let fd:
-            defer { url.withUnsafeFileSystemRepresentation { _ = unlink($0!) } }
-            try body(FileHandle(fileDescriptor: fd, closeOnDealloc: true))
-        }
-    }
-}