am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK."

* commit '595ae39f7f484eb5d2d9e21feeff7e97114b744a':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.