Rename FilesystemUtils to NativePosixFiles.

This helps avoid confusion with File*S*ystemUtils, which differs in only the case of a character but is a completely different class.

--
MOS_MIGRATED_REVID=113054116

4 files changed, 38 insertions, 38 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
index 132b457365..b15744955d 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
@@ -38,7 +38,7 @@ import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.rules.fileset.FilesetActionContext;
 import com.google.devtools.build.lib.rules.test.TestRunnerAction;
 import com.google.devtools.build.lib.standalone.StandaloneSpawnStrategy;
-import com.google.devtools.build.lib.unix.FilesystemUtils;
+import com.google.devtools.build.lib.unix.NativePosixFiles;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.util.io.FileOutErr;
 import com.google.devtools.build.lib.vfs.FileSystem;
@@ -300,13 +300,13 @@ public class LinuxSandboxedStrategy implements SpawnActionContext {
     mounts.put(fs.getPath("/bin"), fs.getPath("/bin"));
     mounts.put(fs.getPath("/sbin"), fs.getPath("/sbin"));
     mounts.put(fs.getPath("/etc"), fs.getPath("/etc"));
-    for (String entry : FilesystemUtils.readdir("/")) {
+    for (String entry : NativePosixFiles.readdir("/")) {
       if (entry.startsWith("lib")) {
         Path libDir = fs.getRootDirectory().getRelative(entry);
         mounts.put(libDir, libDir);
       }
     }
-    for (String entry : FilesystemUtils.readdir("/usr")) {
+    for (String entry : NativePosixFiles.readdir("/usr")) {
       if (!entry.equals("local")) {
         Path usrDir = fs.getPath("/usr").getRelative(entry);
         mounts.put(usrDir, usrDir);
diff --git a/src/main/java/com/google/devtools/build/lib/server/RPCServer.java b/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
index c929118e7a..36119c60f5 100644
--- a/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
+++ b/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
@@ -21,10 +21,10 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
 import com.google.devtools.build.lib.server.RPCService.UnknownCommandException;
 import com.google.devtools.build.lib.server.signal.InterruptSignalHandler;
-import com.google.devtools.build.lib.unix.FilesystemUtils;
 import com.google.devtools.build.lib.unix.LocalClientSocket;
 import com.google.devtools.build.lib.unix.LocalServerSocket;
 import com.google.devtools.build.lib.unix.LocalSocketAddress;
+import com.google.devtools.build.lib.unix.NativePosixFiles;
 import com.google.devtools.build.lib.util.Clock;
 import com.google.devtools.build.lib.util.OsUtils;
 import com.google.devtools.build.lib.util.ThreadUtils;
@@ -381,7 +381,7 @@ public final class RPCServer {
 
     LocalServerSocket serverSocket = new LocalServerSocket();
     serverSocket.bind(new LocalSocketAddress(socketFile.getPathFile()));
-    FilesystemUtils.chmod(socketFile.getPathFile(), 0600);  // Lock it down.
+    NativePosixFiles.chmod(socketFile.getPathFile(), 0600);  // Lock it down.
     serverSocket.listen(/*backlog=*/50);
     return serverSocket;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/unix/FilesystemUtils.java b/src/main/java/com/google/devtools/build/lib/unix/NativePosixFiles.java
index 55653e5227..215be3b044 100644
--- a/src/main/java/com/google/devtools/build/lib/unix/FilesystemUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/unix/NativePosixFiles.java
@@ -30,9 +30,9 @@ import java.util.logging.Logger;
  * SDK. Exception messages are selected to be consistent with those generated
  * by the java.io package where appropriate--see package javadoc for details.
  */
-public final class FilesystemUtils {
+public final class NativePosixFiles {
 
-  private FilesystemUtils() {}
+  private NativePosixFiles() {}
 
   /**
    * Returns true iff the file identified by 'path' is a symbolic link. Has
@@ -107,10 +107,10 @@ public final class FilesystemUtils {
    * @throws IOException if the chmod() syscall failed.
    */
   public static void chmod(File path, int mode) throws IOException {
-    int mask = FileStatus.S_ISUID |
-               FileStatus.S_ISGID |
-               FileStatus.S_ISVTX |
-               FileStatus.S_IRWXA;
+    int mask = FileStatus.S_ISUID
+               | FileStatus.S_ISGID
+               | FileStatus.S_ISVTX
+               | FileStatus.S_IRWXA;
     chmod(path.toString(), mode & mask);
   }
 
@@ -128,9 +128,9 @@ public final class FilesystemUtils {
           // wait (if necessary) until the logging system is initialized
           synchronized (LogManager.getLogManager()) {}
           Logger.getLogger("com.google.devtools.build.lib.unix.FilesystemUtils").log(Level.FINE,
-              "WARNING: Default character set is not latin1; java.io.File and " +
-              "com.google.devtools.build.lib.unix.FilesystemUtils will represent some filenames " +
-              "differently.");
+              "WARNING: Default character set is not latin1; java.io.File and "
+              + "com.google.devtools.build.lib.unix.FilesystemUtils will represent some filenames "
+              + "differently.");
         }
       }.start();
     }
diff --git a/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java b/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java
index bc27e2b72e..c8854dbd81 100644
--- a/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java
+++ b/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java
@@ -21,9 +21,9 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.ProfilerTask;
 import com.google.devtools.build.lib.unix.ErrnoFileStatus;
-import com.google.devtools.build.lib.unix.FilesystemUtils;
-import com.google.devtools.build.lib.unix.FilesystemUtils.Dirents;
-import com.google.devtools.build.lib.unix.FilesystemUtils.ReadTypes;
+import com.google.devtools.build.lib.unix.NativePosixFiles;
+import com.google.devtools.build.lib.unix.NativePosixFiles.Dirents;
+import com.google.devtools.build.lib.unix.NativePosixFiles.ReadTypes;
 import com.google.devtools.build.lib.util.Preconditions;
 
 import java.io.IOException;
@@ -160,7 +160,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     String[] entries;
     long startTime = Profiler.nanoTimeMaybe();
     try {
-      entries = FilesystemUtils.readdir(name);
+      entries = NativePosixFiles.readdir(name);
     } finally {
       profiler.logSimpleTask(startTime, ProfilerTask.VFS_DIR, name);
     }
@@ -181,7 +181,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
   }
 
   /**
-   * Converts from {@link com.google.devtools.build.lib.unix.FilesystemUtils.Dirents.Type} to
+   * Converts from {@link NativePosixFiles.Dirents.Type} to
    * {@link com.google.devtools.build.lib.vfs.Dirent.Type}.
    */
   private static Dirent.Type convertToDirentType(Dirents.Type type) {
@@ -204,7 +204,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     String name = path.getPathString();
     long startTime = Profiler.nanoTimeMaybe();
     try {
-      Dirents unixDirents = FilesystemUtils.readdir(name,
+      Dirents unixDirents = NativePosixFiles.readdir(name,
           followSymlinks ? ReadTypes.FOLLOW : ReadTypes.NOFOLLOW);
       Preconditions.checkState(unixDirents.hasTypes());
       List<Dirent> dirents = Lists.newArrayListWithCapacity(unixDirents.size());
@@ -229,8 +229,8 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     long startTime = Profiler.nanoTimeMaybe();
     try {
       return new UnixFileStatus(followSymlinks
-                                      ? FilesystemUtils.stat(name)
-                                      : FilesystemUtils.lstat(name));
+                                      ? NativePosixFiles.stat(name)
+                                      : NativePosixFiles.lstat(name));
     } finally {
       profiler.logSimpleTask(startTime, ProfilerTask.VFS_STAT, name);
     }
@@ -245,8 +245,8 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     long startTime = Profiler.nanoTimeMaybe();
     try {
       ErrnoFileStatus stat = followSymlinks
-          ? FilesystemUtils.errnoStat(name)
-          : FilesystemUtils.errnoLstat(name);
+          ? NativePosixFiles.errnoStat(name)
+          : NativePosixFiles.errnoLstat(name);
       return stat.hasError() ? null : new UnixFileStatus(stat);
     } finally {
       profiler.logSimpleTask(startTime, ProfilerTask.VFS_STAT, name);
@@ -268,8 +268,8 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     long startTime = Profiler.nanoTimeMaybe();
     try {
       ErrnoFileStatus stat = followSymlinks
-          ? FilesystemUtils.errnoStat(name)
-          : FilesystemUtils.errnoLstat(name);
+          ? NativePosixFiles.errnoStat(name)
+          : NativePosixFiles.errnoLstat(name);
       if (!stat.hasError()) {
         return new UnixFileStatus(stat);
       }
@@ -315,7 +315,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     synchronized (path) {
       int oldMode = statInternal(path, true).getPermissions();
       int newMode = add ? (oldMode | permissionBits) : (oldMode & ~permissionBits);
-      FilesystemUtils.chmod(path.toString(), newMode);
+      NativePosixFiles.chmod(path.toString(), newMode);
     }
   }
 
@@ -337,7 +337,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
   @Override
   protected void chmod(Path path, int mode) throws IOException {
     synchronized (path) {
-      FilesystemUtils.chmod(path.toString(), mode);
+      NativePosixFiles.chmod(path.toString(), mode);
     }
   }
 
@@ -356,7 +356,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     synchronized (path) {
       // Note: UNIX mkdir(2), FilesystemUtils.mkdir() and createDirectory all
       // have different ways of representing failure!
-      if (FilesystemUtils.mkdir(path.toString(), 0777)) {
+      if (NativePosixFiles.mkdir(path.toString(), 0777)) {
         return true; // successfully created
       }
 
@@ -375,13 +375,13 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     SymlinkImplementation strategy = computeSymlinkImplementation(linkPath, targetFragment);
     switch (strategy) {
       case HARDLINK:
-        FilesystemUtils.link(targetFragment.toString(), linkPath.toString());
+        NativePosixFiles.link(targetFragment.toString(), linkPath.toString());
         break;
 
       case JUNCTION:  // Junctions are emulated on Linux with symlinks, fall through
       case SYMLINK:
         synchronized (linkPath) {
-          FilesystemUtils.symlink(targetFragment.toString(), linkPath.toString());
+          NativePosixFiles.symlink(targetFragment.toString(), linkPath.toString());
         }
         break;
 
@@ -506,7 +506,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     String name = path.toString();
     long startTime = Profiler.nanoTimeMaybe();
     try {
-      return new PathFragment(FilesystemUtils.readlink(name));
+      return new PathFragment(NativePosixFiles.readlink(name));
     } catch (IOException e) {
       // EINVAL => not a symbolic link.  Anything else is a real error.
       throw e.getMessage().endsWith("(Invalid argument)") ? new NotASymlinkException(path) : e;
@@ -518,7 +518,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
   @Override
   protected void renameTo(Path sourcePath, Path targetPath) throws IOException {
     synchronized (sourcePath) {
-      FilesystemUtils.rename(sourcePath.toString(), targetPath.toString());
+      NativePosixFiles.rename(sourcePath.toString(), targetPath.toString());
     }
   }
 
@@ -533,7 +533,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     long startTime = Profiler.nanoTimeMaybe();
     synchronized (path) {
       try {
-        return FilesystemUtils.remove(name);
+        return NativePosixFiles.remove(name);
       } finally {
         profiler.logSimpleTask(startTime, ProfilerTask.VFS_DELETE, name);
       }
@@ -549,11 +549,11 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
   protected void setLastModifiedTime(Path path, long newTime) throws IOException {
     synchronized (path) {
       if (newTime == -1L) { // "now"
-        FilesystemUtils.utime(path.toString(), true, 0);
+        NativePosixFiles.utime(path.toString(), true, 0);
       } else {
         // newTime > MAX_INT => -ve unixTime
         int unixTime = (int) (newTime / 1000);
-        FilesystemUtils.utime(path.toString(), false, unixTime);
+        NativePosixFiles.utime(path.toString(), false, unixTime);
       }
     }
   }
@@ -563,7 +563,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     String pathName = path.toString();
     long startTime = Profiler.nanoTimeMaybe();
     try {
-      return FilesystemUtils.getxattr(pathName, name);
+      return NativePosixFiles.getxattr(pathName, name);
     } catch (UnsupportedOperationException e) {
       // getxattr() syscall is not supported by the underlying filesystem (it returned ENOTSUP).
       // Per method contract, treat this as ENODATA.
@@ -578,7 +578,7 @@ public class UnixFileSystem extends AbstractFileSystemWithCustomStat {
     String name = path.toString();
     long startTime = Profiler.nanoTimeMaybe();
     try {
-      return FilesystemUtils.md5sum(name).asBytes();
+      return NativePosixFiles.md5sum(name).asBytes();
     } finally {
       profiler.logSimpleTask(startTime, ProfilerTask.VFS_MD5, name);
     }