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

Cygwin: introduce virt_fdsymlink to simplify /proc/PID/fd symlink handling

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

1
winsup/cygwin/fhandler.h
View File

@ -126,6 +126,7 @@ enum del_lock_called_from {
}; };
enum virtual_ftype_t { enum virtual_ftype_t {
virt_fdsymlink = -8, /* Fd symlink (e.g. /proc/<PID>/fd/0) */
virt_blk = -7, /* Block special */ virt_blk = -7, /* Block special */
virt_chr = -6, /* Character special */ virt_chr = -6, /* Character special */
virt_fsfile = -5, /* FS-based file via /proc/sys */ virt_fsfile = -5, /* FS-based file via /proc/sys */

3
winsup/cygwin/fhandler_process.cc
View File

@ -175,6 +175,7 @@ fhandler_process::fstat (struct stat *buf)
buf->st_nlink = 3; buf->st_nlink = 3;
return 0; return 0;
case virt_symlink: case virt_symlink:
case virt_fdsymlink:
buf->st_uid = p->uid; buf->st_uid = p->uid;
buf->st_gid = p->gid; buf->st_gid = p->gid;
buf->st_mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO; buf->st_mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO;
@ -397,7 +398,7 @@ format_process_fd (void *data, char *&destbuf)
return 0; return 0;
} }
if (*e == '\0') if (*e == '\0')
*((process_fd_t *) data)->fd_type = virt_symlink; *((process_fd_t *) data)->fd_type = virt_fdsymlink;
else /* trailing path */ else /* trailing path */
{ {
char *newbuf = (char *) cmalloc_abort (HEAP_STR, strlen (destbuf) char *newbuf = (char *) cmalloc_abort (HEAP_STR, strlen (destbuf)

4
winsup/cygwin/path.cc
View File

@ -801,7 +801,8 @@ path_conv::check (const char *src, unsigned opt,
else else
{ {
file_type = fh->exists (); file_type = fh->exists ();
if (file_type == virt_symlink) if (file_type == virt_symlink
|| file_type == virt_fdsymlink)
{ {
fh->fill_filebuf (); fh->fill_filebuf ();
symlen = sym.set (fh->get_filebuf ()); symlen = sym.set (fh->get_filebuf ());
@ -842,6 +843,7 @@ path_conv::check (const char *src, unsigned opt,
if (component == 0) if (component == 0)
fileattr = 0; fileattr = 0;
break; break;
case virt_fdsymlink:
case virt_symlink: case virt_symlink:
goto is_virtual_symlink; goto is_virtual_symlink;
case virt_pipe: case virt_pipe: