Throughout rename _PROC_* to _CH_*. * child_info.h: Include "pinfo.h". (child_info_types): Rename _PROC_* -> _CH_* to avoid confusion with similarly named constants. (_PROC_*): Delete unneeded aliases. (PROC_*): Ditto. (CURR_CHILD_INFO_MAGIC): Ditto. (cchildren): Define using "pinfo_minimal". (child_info::set_saw_ctrl_c): Move to (child_info_spawn::set_saw_ctrl_c): Here. (child_info_spawn::lock): New field. (child_info_spawn::hExeced): Ditto. (child_info_spawn::ev): Ditto. (child_info_spawn::~child_info_spawn): Move to sigproc.cc. (child_info_spawn::child_info_spawn): Ditto. (child_info_spawn::cleanup): Declare new function. (child_info_spawn::set_saw_ctrl_c): Move to this class. Set flag only when execed and return true when we have set the flag. (child_info_spawn::child_info_spawn::signal_myself_exited): New function. (child_info_spawn::wait_for_myself): Ditto. (child_info_spawn::has_execed_cygwin): Ditto. (child_info_spawn::has_execed): Ditto. Replaces "hExeced" test. (child_info_spawn::operator HANDLE&): New operator. (child_info_spawn::worker): Define old "spawn_guts" as class member. (ch_spawn): Declare. (have_execed): Define. (have_execed_cygwin): Ditto. * cygheap.h: Update comment. * dcrt0.cc (get_cygwin_startup_info): Use _CH_* enums. (child_info_spawn::handle_spawn): Ditto. (dll_crt0_0): Ditto. (multiple_cygwin_problem): Ditto. * exceptions.cc (chExeced): Delete obsolete declaration. (ctrl_c_handler): Reference set_saw_ctrl_c via new ch_spawn global. * globals.cc (hExeced): Delete. * pinfo.cc (pinfo::thisproc): Refer to cygheap as ::cygheap for consistency in handle naming when -DDEBUGGING. (pinfo::init): Accommodate case where myself.h is known but h0 is passed in. (pinfo::pinfo): New constructor for setting up a pinfo passed in by previous exec'or. (pinfo::proc_waiter): Don't handle subprocess if we're in the process of exiting due to an exec of a cygwin process. Don't close rd_proc_pipe here. Close it when we actually are finished with the process. Use new ch_spawn.signal_myself_exited function to let exec stub know that subprocess has exited. (pinfo::wait): Clarify debugging output. (pinfo::release): Use "close_h" to close all handles to avoid races. (winpids::add): Assume that elements of the array do not need to be zeroed and are properly initialized or suffer problems on pinfo::release. Don't close hProcess since release does that now. * pinfo.h: Update comment. (pinfo_minimal): Move some elements from pinfo here so that child_info_spawn can use them. (pinfo): Inherit from pinfo_minimal. (pinfo::pinfo): Modify to accommodate new pinfo_minimal. (pinfo::allow_remove): New function. * sigproc.cc (proc_subproc): Use boolean values for true/false. Implement PROC_EXEC_CLEANUP. (proc_terminate): Set ppid = 1 since the procs list will only be iterated when the process has not execed. Don't do any cleanup here since it is now handled in pinfo::release. (sigproc_init): Initialize sync_proc_subproc earlier. (child_info::child_info): Assume that all important fields are properly initialized and avoid memset(). (child_info_spawn::child_info_spawn): Specifically test for execing and then set up appropriate fields in the struct. (child_info_spawn::cleanup): Define new function. (child_info_spawn::record_children): Specifically test for being execed here. Fill in pinfo_minimal part of children array. (child_info_spawn::reattach_children): Use constructor to duplicate information for previous exec'or. Add more debugging output. (remove_proc): Force deletion of thread when exiting due to exec. Rely on pinfo::cleanup in release. * sigproc.h (PROC_EXEC_CLEANUP): New enum. (PROC_DETACHED_CHILD): Delete. * spawn.cc (chExeced): Delete. (child_info_spawn::worker): Rename from spawn_guts. Use elements of child_info_spawn throughout rather than ch.whatever. Use ::cygheap to refer to global rather than element of child_info. Use wait_for_myself() rather than waitpid(). Call child_info_spawn::cleanup on function return. (spawnve): Reflect movement of spawn_guts functionality into child_info_spawn::worker. * syscalls.cc (popen): Ditto. * winsup.h (spawn_guts): Delete declaration.
		
			
				
	
	
		
			279 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			279 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/* fhandler_virtual.cc: base fhandler class for virtual filesystems
 | 
						|
 | 
						|
   Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
 | 
						|
 | 
						|
This file is part of Cygwin.
 | 
						|
 | 
						|
This software is a copyrighted work licensed under the terms of the
 | 
						|
Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 | 
						|
details. */
 | 
						|
 | 
						|
#include "winsup.h"
 | 
						|
#include <sys/acl.h>
 | 
						|
#include <sys/statvfs.h>
 | 
						|
#include "cygerrno.h"
 | 
						|
#include "path.h"
 | 
						|
#include "fhandler.h"
 | 
						|
#include "dtable.h"
 | 
						|
#include "cygheap.h"
 | 
						|
#include "sync.h"
 | 
						|
#include "child_info.h"
 | 
						|
 | 
						|
#include <dirent.h>
 | 
						|
 | 
						|
fhandler_virtual::fhandler_virtual ():
 | 
						|
  fhandler_base (), filebuf (NULL), fileid (-1)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
fhandler_virtual::~fhandler_virtual ()
 | 
						|
{
 | 
						|
  if (filebuf)
 | 
						|
    {
 | 
						|
      cfree (filebuf);
 | 
						|
      filebuf = NULL;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
fhandler_virtual::fixup_after_exec ()
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
DIR *
 | 
						|
fhandler_virtual::opendir (int fd)
 | 
						|
{
 | 
						|
  DIR *dir;
 | 
						|
  DIR *res = NULL;
 | 
						|
  size_t len;
 | 
						|
 | 
						|
  if (exists () <= 0)
 | 
						|
    set_errno (ENOTDIR);
 | 
						|
  else if ((len = strlen (get_name ())) > PATH_MAX - 3)
 | 
						|
    set_errno (ENAMETOOLONG);
 | 
						|
  else if ((dir = (DIR *) malloc (sizeof (DIR))) == NULL)
 | 
						|
    set_errno (ENOMEM);
 | 
						|
  else if ((dir->__d_dirname = (char *) malloc (len + 3)) == NULL)
 | 
						|
    {
 | 
						|
      free (dir);
 | 
						|
      set_errno (ENOMEM);
 | 
						|
    }
 | 
						|
  else if ((dir->__d_dirent =
 | 
						|
      (struct dirent *) malloc (sizeof (struct dirent))) == NULL)
 | 
						|
    {
 | 
						|
      free (dir->__d_dirname);
 | 
						|
      free (dir);
 | 
						|
      set_errno (ENOMEM);
 | 
						|
    }
 | 
						|
  else
 | 
						|
    {
 | 
						|
      strcpy (dir->__d_dirname, get_name ());
 | 
						|
      dir->__d_dirent->__d_version = __DIRENT_VERSION;
 | 
						|
      dir->__d_cookie = __DIRENT_COOKIE;
 | 
						|
      dir->__handle = INVALID_HANDLE_VALUE;
 | 
						|
      dir->__d_position = 0;
 | 
						|
      dir->__flags = 0;
 | 
						|
 | 
						|
      if (fd >= 0)
 | 
						|
	{
 | 
						|
	  dir->__d_fd = fd;
 | 
						|
	  res = dir;
 | 
						|
	  dir->__fh = this;
 | 
						|
	  res = dir;
 | 
						|
	}
 | 
						|
      else
 | 
						|
	{
 | 
						|
	  cygheap_fdnew cfd;
 | 
						|
	  if (cfd >= 0)
 | 
						|
	    {
 | 
						|
	      cfd = this;
 | 
						|
	      cfd->nohandle (true);
 | 
						|
	      dir->__d_fd = cfd;
 | 
						|
	      dir->__fh = this;
 | 
						|
	      res = dir;
 | 
						|
	    }
 | 
						|
	}
 | 
						|
      close_on_exec (true);
 | 
						|
    }
 | 
						|
 | 
						|
  syscall_printf ("%p = opendir (%s)", res, get_name ());
 | 
						|
  return res;
 | 
						|
}
 | 
						|
 | 
						|
long
 | 
						|
fhandler_virtual::telldir (DIR * dir)
 | 
						|
{
 | 
						|
  return dir->__d_position;
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
fhandler_virtual::seekdir (DIR * dir, long loc)
 | 
						|
{
 | 
						|
  dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot;
 | 
						|
  dir->__d_position = loc;
 | 
						|
}
 | 
						|
 | 
						|
void
 | 
						|
fhandler_virtual::rewinddir (DIR * dir)
 | 
						|
{
 | 
						|
  dir->__d_position = 0;
 | 
						|
  dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
fhandler_virtual::closedir (DIR * dir)
 | 
						|
{
 | 
						|
  return 0;
 | 
						|
}
 | 
						|
 | 
						|
_off64_t
 | 
						|
fhandler_virtual::lseek (_off64_t offset, int whence)
 | 
						|
{
 | 
						|
  /*
 | 
						|
   * On Linux, when you lseek within a /proc file,
 | 
						|
   * the contents of the file are updated.
 | 
						|
   */
 | 
						|
  if (!fill_filebuf ())
 | 
						|
    return (_off64_t) -1;
 | 
						|
  switch (whence)
 | 
						|
    {
 | 
						|
    case SEEK_SET:
 | 
						|
      position = offset;
 | 
						|
      break;
 | 
						|
    case SEEK_CUR:
 | 
						|
      position += offset;
 | 
						|
      break;
 | 
						|
    case SEEK_END:
 | 
						|
      position = filesize + offset;
 | 
						|
      break;
 | 
						|
    default:
 | 
						|
      set_errno (EINVAL);
 | 
						|
      return (_off64_t) -1;
 | 
						|
    }
 | 
						|
  return position;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
fhandler_virtual::dup (fhandler_base * child, int flags)
 | 
						|
{
 | 
						|
  int ret = fhandler_base::dup (child, flags);
 | 
						|
 | 
						|
  if (!ret)
 | 
						|
    {
 | 
						|
      fhandler_virtual *fhproc_child = (fhandler_virtual *) child;
 | 
						|
      fhproc_child->filebuf = (char *) cmalloc_abort (HEAP_BUF, filesize);
 | 
						|
      memcpy (fhproc_child->filebuf, filebuf, filesize);
 | 
						|
    }
 | 
						|
  return ret;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
fhandler_virtual::close ()
 | 
						|
{
 | 
						|
  if (!have_execed)
 | 
						|
    {
 | 
						|
      if (filebuf)
 | 
						|
	{
 | 
						|
	  cfree (filebuf);
 | 
						|
	  filebuf = NULL;
 | 
						|
	}
 | 
						|
    }
 | 
						|
  return 0;
 | 
						|
}
 | 
						|
 | 
						|
void __stdcall
 | 
						|
fhandler_virtual::read (void *ptr, size_t& len)
 | 
						|
{
 | 
						|
  if (len == 0)
 | 
						|
    return;
 | 
						|
  if (openflags & O_DIROPEN)
 | 
						|
    {
 | 
						|
      set_errno (EISDIR);
 | 
						|
      len = (size_t) -1;
 | 
						|
      return;
 | 
						|
    }
 | 
						|
  if (!filebuf)
 | 
						|
    {
 | 
						|
      len = (size_t) 0;
 | 
						|
      return;
 | 
						|
    }
 | 
						|
  if ((ssize_t) len > filesize - position)
 | 
						|
    len = (size_t) (filesize - position);
 | 
						|
  if ((ssize_t) len < 0)
 | 
						|
    len = 0;
 | 
						|
  else
 | 
						|
    memcpy (ptr, filebuf + position, len);
 | 
						|
  position += len;
 | 
						|
}
 | 
						|
 | 
						|
ssize_t __stdcall
 | 
						|
fhandler_virtual::write (const void *ptr, size_t len)
 | 
						|
{
 | 
						|
  set_errno (EACCES);
 | 
						|
  return -1;
 | 
						|
}
 | 
						|
 | 
						|
/* low-level open for all proc files */
 | 
						|
int
 | 
						|
fhandler_virtual::open (int flags, mode_t mode)
 | 
						|
{
 | 
						|
  rbinary (true);
 | 
						|
  wbinary (true);
 | 
						|
 | 
						|
  set_flags ((flags & ~O_TEXT) | O_BINARY);
 | 
						|
 | 
						|
  return 1;
 | 
						|
}
 | 
						|
 | 
						|
virtual_ftype_t
 | 
						|
fhandler_virtual::exists ()
 | 
						|
{
 | 
						|
  return virt_none;
 | 
						|
}
 | 
						|
 | 
						|
bool
 | 
						|
fhandler_virtual::fill_filebuf ()
 | 
						|
{
 | 
						|
  return true;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
fhandler_virtual::fchmod (mode_t mode)
 | 
						|
{
 | 
						|
  /* Same as on Linux. */
 | 
						|
  set_errno (EPERM);
 | 
						|
  return -1;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
fhandler_virtual::fchown (__uid32_t uid, __gid32_t gid)
 | 
						|
{
 | 
						|
  /* Same as on Linux. */
 | 
						|
  set_errno (EPERM);
 | 
						|
  return -1;
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
fhandler_virtual::facl (int cmd, int nentries, __aclent32_t *aclbufp)
 | 
						|
{
 | 
						|
  int res = fhandler_base::facl (cmd, nentries, aclbufp);
 | 
						|
  if (res >= 0 && cmd == GETACL)
 | 
						|
    {
 | 
						|
      aclbufp[0].a_perm = (S_IRUSR | (pc.isdir () ? S_IXUSR : 0)) >> 6;
 | 
						|
      aclbufp[1].a_perm = (S_IRGRP | (pc.isdir () ? S_IXGRP : 0)) >> 3;
 | 
						|
      aclbufp[2].a_perm = S_IROTH | (pc.isdir () ? S_IXOTH : 0);
 | 
						|
    }
 | 
						|
  return res;
 | 
						|
}
 | 
						|
 | 
						|
int __stdcall
 | 
						|
fhandler_virtual::fstatvfs (struct statvfs *sfs)
 | 
						|
{
 | 
						|
  /* Virtual file system.  Just return an empty buffer with a few values
 | 
						|
     set to something useful.  Just as on Linux. */
 | 
						|
  memset (sfs, 0, sizeof (*sfs));
 | 
						|
  sfs->f_bsize = sfs->f_frsize = 4096;
 | 
						|
  sfs->f_namemax = NAME_MAX;
 | 
						|
  return 0;
 | 
						|
}
 |