* fhandler_proc.cc (proc_tab): Add entry for cygdrive symlink.
(format_proc_cygdrive): New function to implement /proc/cygdrive.
This commit is contained in:
		| @@ -1,3 +1,8 @@ | |||||||
|  | 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> | 2014-09-05  Corinna Vinschen  <corinna@vinschen.de> | ||||||
|  |  | ||||||
| 	* exception.h (class exception): Remove unnecessary #ifdef. | 	* exception.h (class exception): Remove unnecessary #ifdef. | ||||||
|   | |||||||
| @@ -17,6 +17,7 @@ details. */ | |||||||
| #include "cygerrno.h" | #include "cygerrno.h" | ||||||
| #include "security.h" | #include "security.h" | ||||||
| #include "path.h" | #include "path.h" | ||||||
|  | #include "shared_info.h" | ||||||
| #include "fhandler.h" | #include "fhandler.h" | ||||||
| #include "fhandler_virtual.h" | #include "fhandler_virtual.h" | ||||||
| #include "pinfo.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_cpuinfo (void *, char *&); | ||||||
| static off_t format_proc_partitions (void *, char *&); | static off_t format_proc_partitions (void *, char *&); | ||||||
| static off_t format_proc_self (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_mounts (void *, char *&); | ||||||
| static off_t format_proc_filesystems (void *, char *&); | static off_t format_proc_filesystems (void *, char *&); | ||||||
| static off_t format_proc_swaps (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 (".."),		 FH_PROC,	virt_directory,	NULL }, |   { _VN (".."),		 FH_PROC,	virt_directory,	NULL }, | ||||||
|   { _VN ("cpuinfo"),	 FH_PROC,	virt_file,	format_proc_cpuinfo }, |   { _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 ("devices"),	 FH_PROC,	virt_file,	format_proc_devices }, | ||||||
|   { _VN ("filesystems"), FH_PROC,	virt_file,	format_proc_filesystems }, |   { _VN ("filesystems"), FH_PROC,	virt_file,	format_proc_filesystems }, | ||||||
|   { _VN ("loadavg"),	 FH_PROC,	virt_file,	format_proc_loadavg }, |   { _VN ("loadavg"),	 FH_PROC,	virt_file,	format_proc_loadavg }, | ||||||
| @@ -1328,6 +1331,15 @@ format_proc_self (void *, char *&destbuf) | |||||||
|   return __small_sprintf (destbuf, "%d", getpid ()); |   return __small_sprintf (destbuf, "%d", getpid ()); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | 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 | static off_t | ||||||
| format_proc_mounts (void *, char *&destbuf) | format_proc_mounts (void *, char *&destbuf) | ||||||
| { | { | ||||||
|   | |||||||
| @@ -5,6 +5,10 @@ What's new: | |||||||
|   to do without /etc/passwd and /etc/group files.  Introduce /etc/nsswitch.conf |   to do without /etc/passwd and /etc/group files.  Introduce /etc/nsswitch.conf | ||||||
|   file to configure passwd/group handling. |   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: | What changed: | ||||||
| ------------- | ------------- | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user