diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-09-05 23:11:01 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-09-05 23:11:01 +0400 |
| commit | f207699a539ac11f2966631e0f1b107849b34ef4 (patch) | |
| tree | dcbc6644275b95dccdd52e97abdba868f9d0c05d | |
| parent | c8a01afd974007a09f64a1830056ed11d5ebeec8 (diff) | |
* fhandler_proc.cc (proc_tab): Add entry for cygdrive symlink.
(format_proc_cygdrive): New function to implement /proc/cygdrive.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_proc.cc | 12 | ||||
| -rw-r--r-- | winsup/cygwin/release/1.7.33 | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2d682a9ac..3d7c077f8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2014-09-05 Corinna Vinschen <corinna@vinschen.de> + * fhandler_proc.cc (proc_tab): Add entry for cygdrive symlink. + (format_proc_cygdrive): New function to implement /proc/cygdrive. + +2014-09-05 Corinna Vinschen <corinna@vinschen.de> + * exception.h (class exception): Remove unnecessary #ifdef. * uinfo.cc (client_request_pwdgrp::client_request_pwdgrp): Fix length counter to include trailing NUL. diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 5db8ea2c5..0ae6ab0c9 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -17,6 +17,7 @@ details. */ #include "cygerrno.h" #include "security.h" #include "path.h" +#include "shared_info.h" #include "fhandler.h" #include "fhandler_virtual.h" #include "pinfo.h" @@ -44,6 +45,7 @@ static off_t format_proc_uptime (void *, char *&); static off_t format_proc_cpuinfo (void *, char *&); static off_t format_proc_partitions (void *, char *&); static off_t format_proc_self (void *, char *&); +static off_t format_proc_cygdrive (void *, char *&); static off_t format_proc_mounts (void *, char *&); static off_t format_proc_filesystems (void *, char *&); static off_t format_proc_swaps (void *, char *&); @@ -55,6 +57,7 @@ static const virt_tab_t proc_tab[] = { { _VN ("."), FH_PROC, virt_directory, NULL }, { _VN (".."), FH_PROC, virt_directory, NULL }, { _VN ("cpuinfo"), FH_PROC, virt_file, format_proc_cpuinfo }, + { _VN ("cygdrive"), FH_PROC, virt_symlink, format_proc_cygdrive }, { _VN ("devices"), FH_PROC, virt_file, format_proc_devices }, { _VN ("filesystems"), FH_PROC, virt_file, format_proc_filesystems }, { _VN ("loadavg"), FH_PROC, virt_file, format_proc_loadavg }, @@ -1329,6 +1332,15 @@ format_proc_self (void *, char *&destbuf) } static off_t +format_proc_cygdrive (void *, char *&destbuf) +{ + destbuf = (char *) crealloc_abort (destbuf, mount_table->cygdrive_len + 1); + char *dend = stpcpy (destbuf, mount_table->cygdrive); + *--dend = '\0'; + return dend - destbuf; +} + +static off_t format_proc_mounts (void *, char *&destbuf) { destbuf = (char *) crealloc_abort (destbuf, sizeof ("self/mounts")); diff --git a/winsup/cygwin/release/1.7.33 b/winsup/cygwin/release/1.7.33 index 1f4342e7c..a6b590735 100644 --- a/winsup/cygwin/release/1.7.33 +++ b/winsup/cygwin/release/1.7.33 @@ -5,6 +5,10 @@ What's new: to do without /etc/passwd and /etc/group files. Introduce /etc/nsswitch.conf file to configure passwd/group handling. +- /proc/cygdrive as a symlink pointing to the current cygdrive prefix. This + can be utilized in scripts to access paths via cygdrive prefix, even if the + cygdrive prefix has been changed by the user. + What changed: ------------- |