* autoload.cc (GetModuleFileNameExA): Add.

	(GetModuleInformation): Add.
	(QueryWorkingSet): Add.
	* fhandler.h (fhandler_virtual::get_filebuf): New method.
	* fhandler_proc.cc (PROC_SELF): Define.
	(proc_fhandlers): Change type of self to FH_PROC.
	(fhandler_proc::exists): Return -3 if self.
	(fhandler_proc::fstat): Handle self as symlink.
	(fhandler_proc::fill_filebuf): Handle self.
	* fhandler_process.cc: Include psapi.h.
	(PROCESS_EXENAME): Remove.
	(PROCESS_MAPS): Define.
	(PROCESS_ROOT): Define.
	(PROCESS_EXE): Define.
	(PROCESS_CWD): Define.
	(process_listing): Remove "exename", add "maps, "root", "exe" and
	"cwd" elements.
	(fhandler_process::exists): Return -2 for symlinks.
	(fhandler_process::fstat): Handle symlinks.
	(fill_filebuf): Evaluate pid if pid is 0.  Use exename handling for
	exe.  Handle maps, root and cwd.
	(format_process_maps): New function evaluating "maps".
	* path.cc (symlink_info::set): New method to fill symlink_info
	with data matching virtual symlinks.
	(path_conv::check): Handle virtual symlinks.
	* pinfo.cc (_pinfo::commune_recv): Add PICOM_CWD and PICOM_ROOT
	handling.
	(_pinfo::commune_send): Ditto.
	(_pinfo::root): New function.
	(_pinfo::cwd): New function.
	* pinfo.h (enum picom): Add PICOM_CWD and PICOM_ROOT.
	(_pinfo::root): Declare.
	(_pinfo::cwd): Declare.

1 files changed, 42 insertions, 1 deletions

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index a9d6292d7..0d2637537 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -95,6 +95,7 @@ struct symlink_info
   _minor_t minor;
   _mode_t mode;
   int check (char *path, const suffix_info *suffixes, unsigned opt);
+  int set (char *path, int type);
   bool parse_device (const char *);
   bool case_check (char *path);
 };
@@ -616,6 +617,11 @@ path_conv::check (const char *src, unsigned opt,
 	      /* FIXME: Calling build_fhandler here is not the right way to handle this. */
 	      fhandler_virtual *fh = (fhandler_virtual *) build_fh_dev (dev, path_copy);
 	      int file_type = fh->exists ();
+	      if (file_type == -2 || file_type == -3)
+	        {
+		  fh->fill_filebuf ();
+		  symlen = sym.set (fh->get_filebuf (), file_type);
+		}
 	      delete fh;
 	      switch (file_type)
 		{
@@ -626,9 +632,12 @@ path_conv::check (const char *src, unsigned opt,
 		  case -1:
 		    fileattr = 0;
 		    break;
+		  case -2:	/* /proc/<pid>/symlinks */
+		  case -3:	/* /proc/self */
+		    goto is_virtual_symlink;
 		  default:
 		    fileattr = INVALID_FILE_ATTRIBUTES;
-		    break;
+		    goto virtual_component_retry;
 		}
 	      goto out;
 	    }
@@ -657,6 +666,8 @@ path_conv::check (const char *src, unsigned opt,
 
 	  symlen = sym.check (full_path, suff, opt | fs.has_ea ());
 
+is_virtual_symlink:
+
 	  if (sym.minor || sym.major)
 	    {
 	      dev.parse (sym.major, sym.minor);
@@ -740,6 +751,8 @@ path_conv::check (const char *src, unsigned opt,
 	      /* No existing file found. */
 	    }
 
+virtual_component_retry:
+
 	  /* Find the new "tail" of the path, e.g. in '/for/bar/baz',
 	     /baz is the tail. */
 	  if (tail != path_end)
@@ -3117,6 +3130,34 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt)
   return res;
 }
 
+/* "path" is the path in a virtual symlink.  Set a symlink_info struct from
+   that and proceed with further path checking afterwards. */
+int
+symlink_info::set (char *path, int type)
+{
+  extern suffix_info stat_suffixes[];
+
+  strcpy (contents, path);
+  pflags = PATH_SYMLINK;
+  if (type == -3) /* /proc/self */
+    {
+      fileattr = FILE_ATTRIBUTE_DIRECTORY;
+      error = 0;
+    }
+  else
+    {
+      /* That's save since a virtual symlink doesn't point to itself. */
+      path_conv pc (contents, PC_SYM_NOFOLLOW | PC_FULL, stat_suffixes);
+      fileattr = pc;
+      error = pc.error;
+    }
+  is_symlink = true;
+  ext_tacked_on = case_clash = false;
+  ext_here = NULL;
+  extn = major = minor = mode = 0;
+  return strlen (path);
+}
+
 /* Check the correct case of the last path component (given in DOS style).
    Adjust the case in this->path if pcheck_case == PCHECK_ADJUST or return
    false if pcheck_case == PCHECK_STRICT.