diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2019-03-18 11:34:00 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-03-18 11:34:00 +0100 |
| commit | 38322b9bf64bcdee8025edbaacf93a6ba9559b5e (patch) | |
| tree | 0900ef3fb6226342deb6965304caab95fac992bd | |
| parent | df960cb954aa6edbb320cf2b2cb8eb65a2b41a80 (diff) | |
| download | cygnal-38322b9bf64bcdee8025edbaacf93a6ba9559b5e.tar.gz cygnal-38322b9bf64bcdee8025edbaacf93a6ba9559b5e.tar.bz2 cygnal-38322b9bf64bcdee8025edbaacf93a6ba9559b5e.zip | |
Cygwin: proc: fix /proc/version output after uname change
3.0.0 changed uname but missed to align /proc/version
which then used the old uname function on the new uname
struct.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/fhandler_proc.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/release/3.0.5 | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index cda2f72a2..a6a0b683c 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -405,6 +405,8 @@ fhandler_proc::fill_filebuf () return false; } +extern "C" int uname_x (struct utsname *); + static off_t format_proc_version (void *, char *&destbuf) { @@ -413,7 +415,7 @@ format_proc_version (void *, char *&destbuf) char *bufptr = buf; struct utsname uts_name; - uname (&uts_name); + uname_x (&uts_name); bufptr += __small_sprintf (bufptr, "%s version %s (%s@%s) (%s) %s\n", uts_name.sysname, uts_name.release, USERNAME, HOSTNAME, GCC_VERSION, uts_name.version); diff --git a/winsup/cygwin/release/3.0.5 b/winsup/cygwin/release/3.0.5 new file mode 100644 index 000000000..62c8cf5ca --- /dev/null +++ b/winsup/cygwin/release/3.0.5 @@ -0,0 +1,13 @@ +What's new: +----------- + + +What changed: +------------- + + +Bug Fixes +--------- + +- Fix /proc/version after uname change + Addresses: https://cygwin.com/ml/cygwin/2019-03/msg00467.html |