JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: return correct FH_PROCESSFD for files under /proc/PID/fd subdir

Browse Source 
This allows easier handling of fd symlinks.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2019-01-05 21:36:34 +01:00
parent 36ff506ddc
commit f72191ac01
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/fhandler_proc.cc
View File

@ -134,14 +134,22 @@ fhandler_proc::get_proc_fhandler (const char *path)
if (entry) if (entry)
return entry->fhandler; return entry->fhandler;
int pid = atoi (path); char *e;
pid_t pid = strtoul (path, &e, 10);
if (*e != '/' && *e != '\0')
return FH_NADA;
pinfo p (pid); pinfo p (pid);
/* If p->pid != pid, then pid is actually the Windows PID for an execed /* If p->pid != pid, then pid is actually the Windows PID for an execed
Cygwin process, and the pinfo entry is the additional entry created Cygwin process, and the pinfo entry is the additional entry created
at exec time. We don't want to enable the user to access a process at exec time. We don't want to enable the user to access a process
entry by using the Win32 PID, though. */ entry by using the Win32 PID, though. */
if (p && p->pid == pid) if (p && p->pid == pid)
return FH_PROCESS; {
/* Check for entry in fd subdir */
if (!strncmp (++e, "fd/", 3) && e[3] != '\0')
return FH_PROCESSFD;
return FH_PROCESS;
}
bool has_subdir = false; bool has_subdir = false;
while (*path) while (*path)

2
winsup/cygwin/path.cc
View File

@ -806,7 +806,7 @@ path_conv::check (const char *src, unsigned opt,
fh->fill_filebuf (); fh->fill_filebuf ();
symlen = sym.set (fh->get_filebuf ()); symlen = sym.set (fh->get_filebuf ());
} }
else if (file_type == virt_fsdir && dev == FH_PROCESS) else if (file_type == virt_fsdir && dev == FH_PROCESSFD)
{ {
/* FIXME: This is YA bad hack to workaround that /* FIXME: This is YA bad hack to workaround that
we're checking for isvirtual_dev at this point. we're checking for isvirtual_dev at this point.