84c7d40932
the changes below. Redefine process structure to avoid a fixed size table. Redefine pinfo/_pinfo classes. Use these throughout. * dcrt0.cc (dll_crt0_1): Accomodate set_myself argument change. (__api_fatal): Accomodate _pinfo::record_death argument change. * exceptions.cc (really_exit): Ditto. (sig_handle_tty_stop): Use pinfo constructor to access process info. (events_init): Don't create pinfo_mutex since it is no longer required. * external.cc (fillout_pinfo): Use winpids class to iterate over all system pids. (cygwin_internal): lock_pinfo_for_update and unlock_pinfo are now noops. * fhandler_termios.cc (fhandler_termios::set_ctty): Use pinfo constructor to access process info. * fork.cc (fork): Reorganize to initialize child info after the child has started since that is when we know the child's winpid, which is necessary to allocate the pinfo shared memory. * mmap.cc (recreate_mmaps_after_fork): Change arg type to _pinfo. * pinfo.cc: Rename pinfo methods to _pinfo throughout. Eliminate pinfo_list stuff. (set_myself): Accept a pid argument now. Call pinfo initializer to initialize myself. Detect when this is an "execed" process and create an "indirect" pid block. (pinfo_init): Accomodate set_myself arg change. (procinfo): Remove. (pinfo::lock_pinfo): Remove. (pinfo::unlock_pinfo): Remove. (pinfo::init): New method. Allocates shared memory space for process pinfo structure. (pinfo::record_death): Don't call locking functions. (cygwin_winpid_to_pid): Simplify by using new pinfo constructor. (EnumProcessesW95): New function for iterating over processes on Windows 95. (winpids::winpids): New constructor for winpids class. Sets up a list of process ids. (enum_init): Initialize w95/wnt pid enumerators. * shared.cc (shared-info::initialize): Remove pid initialization. * shared.h: Move pinfo stuff into pinfo.h. (class shared_info): Remove pinfo_list element. * signal.cc (kill_worker): Use pinfo constructor to access process info. (kill_pgrp): Ditto. Use winpids methods to access list of processes. * sigproc.cc: Throughout, modify to use _pinfo where appropriate. (proc_exists (pid_t)): New function. Determines if a process exists based on the pid. (proc_exists (_pinfo *p): Use new proc_exists function above. (proc_subproc): Copy pinfo stuff around rather than _pinfo pointers. Try to be careful about releasing shared memory when we don't need it anymore. Remove pinfo locks. (remove_zombies): Remove pinfo memory when zombie is going away. * sigproc.h: Reflect _pinfo/pinfo changes in sigproc.cc. * spawn.cc (spawn_guts): Eliminate pinfo *child argument. Reorganize to only initialize child pinfo after process has been started and we know the windows pid. (_spawnve): Reflect spawn_guts changes. * syscalls.cc (setpgid): Use pinfo constructor to access process info. (getpgid): Ditto. (internal_getlogin): Use _pinfo. * winsup.h: Eliminate pinfo_mutex. Eliminate spawn_guts declaration since it is static now. Reflect set_myself argument change. * include/sys/cygwin.h: Add some PID_* enums to accomodate new pinfo stuff. * include/cygwin/version.h: Update minor version for cygdrive changes below.
101 lines
1.9 KiB
C++
101 lines
1.9 KiB
C++
/* scandir.cc
|
|
|
|
Copyright 1998 Cygnus Solutions.
|
|
|
|
Written by Corinna Vinschen <corinna.vinschen@cityweb.de>
|
|
|
|
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 <dirent.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include "winsup.h"
|
|
|
|
extern "C"
|
|
int
|
|
scandir (const char *dir,
|
|
struct dirent ***namelist,
|
|
int (*select) (const struct dirent *),
|
|
int (*compar) (const struct dirent **, const struct dirent **))
|
|
{
|
|
DIR *dirp;
|
|
struct dirent *ent, *etmp, **nl = NULL, **ntmp;
|
|
int count = 0;
|
|
int allocated = 0;
|
|
|
|
if (!(dirp = opendir (dir)))
|
|
return -1;
|
|
|
|
int prior_errno = get_errno ();
|
|
set_errno (0);
|
|
|
|
while ((ent = readdir (dirp)))
|
|
{
|
|
if (!select || select (ent))
|
|
{
|
|
|
|
/* Ignore error from readdir/select. See POSIX specs. */
|
|
set_errno (0);
|
|
|
|
if (count == allocated)
|
|
{
|
|
|
|
if (allocated == 0)
|
|
allocated = 10;
|
|
else
|
|
allocated *= 2;
|
|
|
|
ntmp = (struct dirent **) realloc (nl, allocated * sizeof *nl);
|
|
if (!ntmp)
|
|
{
|
|
set_errno (ENOMEM);
|
|
break;
|
|
}
|
|
nl = ntmp;
|
|
}
|
|
|
|
if (!(etmp = (struct dirent *) malloc (sizeof *ent)))
|
|
{
|
|
set_errno (ENOMEM);
|
|
break;
|
|
}
|
|
*etmp = *ent;
|
|
nl[count++] = etmp;
|
|
}
|
|
}
|
|
|
|
if ((prior_errno = get_errno ()) != 0)
|
|
{
|
|
closedir (dirp);
|
|
if (nl)
|
|
{
|
|
while (count > 0)
|
|
free (nl[--count]);
|
|
free (nl);
|
|
}
|
|
/* Ignore errors from closedir() and what not else. */
|
|
set_errno (prior_errno);
|
|
return -1;
|
|
}
|
|
|
|
closedir (dirp);
|
|
set_errno (prior_errno);
|
|
|
|
qsort (nl, count, sizeof *nl, (int (*)(const void *, const void *)) compar);
|
|
if (namelist)
|
|
*namelist = nl;
|
|
return count;
|
|
}
|
|
|
|
extern "C"
|
|
int
|
|
alphasort (const struct dirent **a, const struct dirent **b)
|
|
{
|
|
return strcoll ((*a)->d_name, (*b)->d_name);
|
|
}
|
|
|