diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-09-07 21:32:07 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-09-07 21:32:07 +0000 |
| commit | 1ff9f4b9373620aa923412d7aa90b8d04d940199 (patch) | |
| tree | 878c4a44487d2fe17137a6d6088a327ada14247b /winsup/cygwin/dir.cc | |
| parent | b2d319cb3eaf0c1a139ee1586fa43d5250d5a058 (diff) | |
| download | cygnal-1ff9f4b9373620aa923412d7aa90b8d04d940199.tar.gz cygnal-1ff9f4b9373620aa923412d7aa90b8d04d940199.tar.bz2 cygnal-1ff9f4b9373620aa923412d7aa90b8d04d940199.zip | |
* cygheap.h (init_cygheap): Move heap pointers here.
* include/sys/cygwin.h (perprocess): Remove heap pointers.
* dcrt0.cc (__cygwin_user_data): Reflect obsolete perprocess stuff.
(_dll_crt0): Don't initialize heap pointers.
(cygwin_dll_init): Ditto.
(release_upto): Use heap pointers from cygheap.
* heap.h: Ditto.
* fork.cc (fork_parent): Ditto. Don't set heap pointers in ch.
(fork_child): Remove obsolete sigproc_fixup_after_fork.
* shared.cc (memory_init): Reorganize so that cygheap initialization is called
prior to regular heap since regular heap uses cygheap now.
* sigproc.cc (proc_subproc): Eliminate zombies allocation.
(sigproc_init): Move zombies alloation here. Don't free up array on fork, just
reuse it.
(sigproc_fixup_after_fork): Eliminate.
* sigproc.h: Ditto.
* include/cygwin/version.h: Reflect change to perprocess structure.
Diffstat (limited to 'winsup/cygwin/dir.cc')
| -rw-r--r-- | winsup/cygwin/dir.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index f716f23ba..9174d04cf 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -201,14 +201,14 @@ readdir (DIR * dir) char *c = dir->__d_dirent->d_name; int len = strlen (c); if (strcasematch (c + len - 4, ".lnk")) - { + { char fbuf[MAX_PATH + 1]; strcpy (fbuf, dir->__d_dirname); strcpy (fbuf + strlen (fbuf) - 1, dir->__d_dirent->d_name); path_conv fpath (fbuf, PC_SYM_NOFOLLOW); if (fpath.issymlink ()) - c[len - 4] = '\0'; - } + c[len - 4] = '\0'; + } } /* Compute d_ino by combining filename hash with the directory hash @@ -387,7 +387,7 @@ rmdir (const char *dir) /* Even own directories can't be removed if R/O attribute is set. */ if (real_dir.file_attributes () & FILE_ATTRIBUTE_READONLY) SetFileAttributes (real_dir.get_win32 (), real_dir.file_attributes () & - ~FILE_ATTRIBUTE_READONLY); + ~FILE_ATTRIBUTE_READONLY); if (RemoveDirectoryA (real_dir.get_win32 ())) { @@ -402,7 +402,7 @@ rmdir (const char *dir) else { if (GetLastError() == ERROR_ACCESS_DENIED) - { + { /* On 9X ERROR_ACCESS_DENIED is returned if you try to remove a non-empty directory. */ if (!iswinnt) |