[POSIX] Kill getenv and adopt Process.env

Package.swift

@@ -251,14 +251,10 @@ let package = Package(
 // package dependency like this but there is no other good way of expressing
 // this right now.
 
-#if os(Linux)
-import Glibc
-#else
-import Darwin.C
-#endif
+import class Foundation.ProcessInfo
 
-if getenv("SWIFTPM_BOOTSTRAP") == nil {
-    if getenv("SWIFTCI_USE_LOCAL_DEPS") == nil {
+if ProcessInfo.processInfo.environment["SWIFTPM_BOOTSTRAP"] == nil {
+    if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         package.dependencies += [
             .package(url: "https://github.com/apple/swift-llbuild.git", .branch("master")),
         ]
@@ -272,7 +268,7 @@ if getenv("SWIFTPM_BOOTSTRAP") == nil {
     package.targets.first(where: { $0.name == "SPMLLBuild" })!.dependencies += ["llbuildSwift"]
 }
 
-if getenv("SWIFTPM_BUILD_PACKAGE_EDITOR") != nil {
+if ProcessInfo.processInfo.environment["SWIFTPM_BUILD_PACKAGE_EDITOR"] != nil {
     package.targets += [
         .target(name: "SPMPackageEditor", dependencies: ["Workspace", "SwiftSyntax"]),
         .target(name: "swiftpm-manifest-tool", dependencies: ["SPMPackageEditor"]),

Sources/Basic/Process.swift

@@ -11,7 +11,6 @@
 import class Foundation.ProcessInfo
 
 import enum POSIX.SystemError
-import func POSIX.getenv
 import SPMLibc
 import Dispatch
 
@@ -239,7 +238,7 @@ public final class Process: ObjectIdentifierProtocol {
             }
             // FIXME: This can be cached.
             let envSearchPaths = getEnvSearchPaths(
-                pathString: getenv("PATH"),
+                pathString: Process.env["PATH"],
                 currentWorkingDirectory: localFileSystem.currentWorkingDirectory
             )
             // Lookup and cache the executable path.

Sources/Basic/TemporaryFile.swift

@@ -9,7 +9,6 @@
 */
 
 import SPMLibc
-import func POSIX.getenv
 import class Foundation.FileHandle
 import class Foundation.FileManager
 
@@ -56,7 +55,7 @@ public func determineTempDirectory(_ dir: AbsolutePath? = nil) throws -> Absolut
 /// Returns temporary directory location by searching relevant env variables.
 /// Evaluates once per execution.
 private var cachedTempDirectory: AbsolutePath = {
-    return AbsolutePath(getenv("TMPDIR") ?? getenv("TEMP") ?? getenv("TMP") ?? "/tmp/")
+    return AbsolutePath(Process.env["TMPDIR"] ?? Process.env["TEMP"] ?? Process.env["TMP"] ?? "/tmp/")
 }()
 
 /// This class is basically a wrapper over posix's mkstemps() function to creates disposable files.

Sources/Basic/TerminalController.swift

@@ -9,7 +9,6 @@
 */
 
 import SPMLibc
-import func POSIX.getenv
 
 /// A class to have better control on tty output streams: standard output and standard error.
 /// Allows operations like cursor movement and colored text output on tty.
@@ -95,7 +94,7 @@ public final class TerminalController {
 
     /// Computes the terminal type of the stream.
     public static func terminalType(_ stream: LocalFileOutputByteStream) -> TerminalType {
-        if POSIX.getenv("TERM") == "dumb" {
+        if Process.env["TERM"] == "dumb" {
             return .dumb
         }
         let isTTY = isatty(fileno(stream.filePointer)) != 0
@@ -108,7 +107,7 @@ public final class TerminalController {
     /// - Returns: Current width of terminal if it was determinable.
     public static func terminalWidth() -> Int? {
         // Try to get from environment.
-        if let columns = POSIX.getenv("COLUMNS"), let width = Int(columns) {
+        if let columns = Process.env["COLUMNS"], let width = Int(columns) {
             return width
         }
 

Sources/Build/BuildDelegate.swift

@@ -485,7 +485,8 @@ extension SwiftCompilerMessage {
     }
 
     private func generateProgressText(prefix: String, file: String) -> String {
-        let relativePath = AbsolutePath(file).relative(to: AbsolutePath(getcwd()))
+        // FIXME: Eliminate cwd from here.
+        let relativePath = AbsolutePath(file).relative(to: localFileSystem.currentWorkingDirectory!)
         return "\(prefix) \(relativePath)"
     }
 }

Sources/Build/BuildPlan.swift

@@ -13,7 +13,6 @@ import SPMUtility
 import PackageModel
 import PackageGraph
 import PackageLoading
-import func POSIX.getenv
 
 public struct BuildParameters {
 
@@ -37,7 +36,7 @@ public struct BuildParameters {
         let base: AbsolutePath
         // FIXME: We use this hack to let swiftpm's functional test use shared
         // cache so it doesn't become painfully slow.
-        if getenv("IS_SWIFTPM_TEST") != nil {
+        if Process.env["IS_SWIFTPM_TEST"] != nil {
             base = BuildParameters.swiftpmTestCache
         } else {
             base = buildPath

Sources/Commands/SwiftTool.swift

@@ -825,8 +825,8 @@ private func findPackageRoot() -> AbsolutePath? {
 /// Returns the build path from the environment, if present.
 private func getEnvBuildPath(workingDir: AbsolutePath) -> AbsolutePath? {
     // Don't rely on build path from env for SwiftPM's own tests.
-    guard POSIX.getenv("IS_SWIFTPM_TEST") == nil else { return nil }
-    guard let env = POSIX.getenv("SWIFTPM_BUILD_DIR") else { return nil }
+    guard Process.env["IS_SWIFTPM_TEST"] == nil else { return nil }
+    guard let env = Process.env["SWIFTPM_BUILD_DIR"] else { return nil }
     return AbsolutePath(env, relativeTo: workingDir)
 }
 

Sources/POSIX/Error.swift

@@ -33,7 +33,6 @@ public enum SystemError: Swift.Error {
     case unlink(Int32, String)
     case unsetenv(Int32, String)
     case waitpid(Int32)
-    case usleep(Int32)
 }
 
 import func SPMLibc.strerror_r
@@ -112,8 +111,6 @@ extension SystemError: CustomStringConvertible {
             return "unsetenv error: \(strerror(errno)): \(key)"
         case .waitpid(let errno):
             return "waitpid error: \(strerror(errno))"
-        case .usleep(let errno):
-            return "usleep error: \(strerror(errno))"
         }
     }
 }

Sources/POSIX/chdir.swift

@@ -15,26 +15,7 @@ import var SPMLibc.errno
  Causes the named directory to become the current working directory.
 */
 public func chdir(_ path: String) throws {
-    if memo == nil {
-        let argv0 = try realpath(CommandLine.arguments.first!)
-        let cwd = try realpath(getcwd())
-        memo = (argv0: argv0, wd: cwd)
-    }
-
     guard SPMLibc.chdir(path) == 0 else {
         throw SystemError.chdir(errno, path)
     }
 }
-
-private var memo: (argv0: String, wd: String)?
-
-/**
- The initial working directory before any calls to POSIX.chdir.
-*/
-public func getiwd() -> String {
-    return memo?.wd ?? getcwd()
-}
-
-public var argv0: String {
-    return memo?.argv0 ?? CommandLine.arguments.first!
-}

Sources/POSIX/env.swift

@@ -13,6 +13,7 @@ import func SPMLibc.setenv
 import func SPMLibc.unsetenv
 import var SPMLibc.errno
 
+@available(*, deprecated, message: "Use Foundation.ProcessInfo instead.")
 public func getenv(_ key: String) -> String? {
     let out = SPMLibc.getenv(key)
     return out == nil ? nil : String(validatingUTF8: out!)  //FIXME locale may not be UTF8

Sources/SPMUtility/PkgConfig.swift

@@ -10,7 +10,6 @@
 
 import Basic
 import Foundation
-import func POSIX.getenv
 
 public enum PkgConfigError: Swift.Error, CustomStringConvertible {
     case couldNotFindConfigFile
@@ -173,7 +172,7 @@ public struct PkgConfig {
     }
 
     private static var envSearchPaths: [AbsolutePath] {
-        if let configPath = POSIX.getenv("PKG_CONFIG_PATH") {
+        if let configPath = Process.env["PKG_CONFIG_PATH"] {
             return configPath.split(separator: ":").map({ AbsolutePath(String($0)) })
         }
         return []

Sources/TestSupport/misc.swift

@@ -10,6 +10,7 @@
 
 import func XCTest.XCTFail
 import class Foundation.NSDate
+import class Foundation.Thread
 
 import Basic
 import PackageGraph
@@ -242,7 +243,7 @@ public func loadPackageGraph(
 /// - throws: errors thrown in `body`, POSIX.SystemError.setenv and
 ///           POSIX.SystemError.unsetenv
 public func withCustomEnv(_ env: [String: String], body: () throws -> Void) throws {
-    let state = Array(env.keys).map({ ($0, getenv($0)) })
+    let state = Array(env.keys).map({ ($0, Process.env[$0]) })
     let restore = {
         for (key, value) in state {
             if let value = value {
@@ -270,7 +271,7 @@ public func waitForFile(_ path: AbsolutePath) -> Bool {
     let endTime = NSDate().timeIntervalSince1970 + 2
     while NSDate().timeIntervalSince1970 < endTime {
         // Sleep for a bit so we don't burn a lot of CPU.
-        try? usleep(microSeconds: 10000)
+        Thread.sleep(forTimeInterval: 0.01)
         if localFileSystem.exists(path) {
             return true
         }

Sources/Workspace/Destination.swift

@@ -91,7 +91,7 @@ public struct Destination {
       #if os(macOS)
         // Get the SDK.
         let sdkPath: AbsolutePath
-        if let value = lookupExecutablePath(filename: getenv("SDKROOT")) {
+        if let value = lookupExecutablePath(filename: Process.env["SDKROOT"]) {
             sdkPath = value
         } else {
             // No value in env, so search for it.

Sources/Workspace/UserToolchain.swift

@@ -129,7 +129,7 @@ public final class UserToolchain: Toolchain {
     }
 
     private static func lookup(variable: String, searchPaths: [AbsolutePath]) -> AbsolutePath? {
-        return lookupExecutablePath(filename: getenv(variable), searchPaths: searchPaths)
+        return lookupExecutablePath(filename: Process.env[variable], searchPaths: searchPaths)
     }
 
     /// Environment to use when looking up tools.
@@ -198,7 +198,7 @@ public final class UserToolchain: Toolchain {
 
         // Get the search paths from PATH.
         let searchPaths = getEnvSearchPaths(
-            pathString: getenv("PATH"), currentWorkingDirectory: localFileSystem.currentWorkingDirectory)
+            pathString: Process.env["PATH"], currentWorkingDirectory: localFileSystem.currentWorkingDirectory)
 
         self.envSearchPaths = searchPaths
 
@@ -236,7 +236,7 @@ public final class UserToolchain: Toolchain {
         var pdLibDir = binDir.parentDirectory.appending(components: "lib", "swift", "pm")
 
         // Look for an override in the env.
-        if let pdLibDirEnvStr = getenv("SWIFTPM_PD_LIBS") {
+        if let pdLibDirEnvStr = Process.env["SWIFTPM_PD_LIBS"] {
             // We pick the first path which exists in a colon seperated list.
             let paths = pdLibDirEnvStr.split(separator: ":").map(String.init)
             for pathString in paths {

Tests/BasicTests/PathShimTests.swift

@@ -59,12 +59,6 @@ class PathShimTests : XCTestCase {
         // Check that there's no error if we try to create the directory again.
         try! makeDirectories(dirPath)
     }
-
-    func testCurrentWorkingDirectory() {
-        // Test against what POSIX returns, at least for now.
-        let cwd = localFileSystem.currentWorkingDirectory!
-        XCTAssertEqual(cwd, AbsolutePath(getcwd()))
-    }
 }
 
 class WalkTests : XCTestCase {

Tests/BasicTests/XCTestManifests.swift

@@ -258,7 +258,6 @@ extension PathShimTests {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__PathShimTests = [
-        ("testCurrentWorkingDirectory", testCurrentWorkingDirectory),
         ("testRescursiveDirectoryCreation", testRescursiveDirectoryCreation),
         ("testResolvingSymlinks", testResolvingSymlinks),
     ]

Tests/CommandsTests/RunToolTests.swift

@@ -84,8 +84,9 @@ final class RunToolTests: XCTestCase {
     func testFileDeprecation() throws {
         fixture(name: "Miscellaneous/EchoExecutable") { path in
             let filePath = AbsolutePath(path, "Sources/secho/main.swift").pathString
+            let cwd = localFileSystem.currentWorkingDirectory!
             XCTAssertEqual(try execute([filePath, "1", "2"], packagePath: path), """
-                "\(getcwd())" "1" "2"
+                "\(cwd)" "1" "2"
                 warning: 'swift run file.swift' command to interpret swift files is deprecated; use 'swift file.swift' instead
 
                 """)

Tests/FunctionalTests/MiscellaneousTests.swift

@@ -15,6 +15,7 @@ import PackageModel
 import SPMUtility
 import SPMLibc
 import class Foundation.ProcessInfo
+import class Foundation.Thread
 import Workspace
 
 typealias ProcessID = Basic.Process.ProcessID
@@ -125,7 +126,7 @@ class MiscellaneousTestCase: XCTestCase {
 
             // we need to sleep at least one second otherwise
             // llbuild does not realize the file has changed
-            sleep(1)
+            Thread.sleep(forTimeInterval: 1)
 
             try localFileSystem.writeFileContents(prefix.appending(components: "Bar", "Bar.swift"), bytes: "public let bar = \"Goodbye\"\n")
 
@@ -150,7 +151,7 @@ class MiscellaneousTestCase: XCTestCase {
 
             // we need to sleep at least one second otherwise
             // llbuild does not realize the file has changed
-            sleep(1)
+            Thread.sleep(forTimeInterval: 1)
 
             let path = try SwiftPMProduct.packagePath(for: "FisherYates", packageRoot: packageRoot)
             try localFileSystem.chmod(.userWritable, path: path, options: [.recursive])
@@ -177,7 +178,7 @@ class MiscellaneousTestCase: XCTestCase {
 
             // we need to sleep at least one second otherwise
             // llbuild does not realize the file has changed
-            sleep(1)
+            Thread.sleep(forTimeInterval: 1)
 
             let path = try SwiftPMProduct.packagePath(for: "dep1", packageRoot: packageRoot)
             try localFileSystem.chmod(.userWritable, path: path, options: [.recursive])