[patch icedtea/openjdk] print more accurate information about the distribution

[Andrew John Hughes]

On 11/03/2008, Matthias Klose <doko at ubuntu.com> wrote:
> Ubuntu doesn't use (and therefore doesn't change) /etc/debian_version, but uses
>  lsb_release for more accurate information about the running distribution.  Allow
>  to read /etc/lsb-release (which has a list of key/value pairs before trying to
>  read /etc/debian_version.
>
>  However the file /etc/lsb-release is not standardized, forwarded this to
>  lsb-discuss at lists.linux-foundation.org.
>
>  ok to checkin?
>
>
>   Matthias
>
> --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp~       2007-12-14 08:57:02.000000000 +0100
>  +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp        2008-01-19 16:20:24.206979233 +0100
>  @@ -1757,6 +1757,37 @@
>    return true;
>   }
>
>  +bool _print_debian_lsb_file(const char* filename, outputStream* st) {
>  +  int fd = open(filename, O_RDONLY);
>  +  if (fd == -1) {
>  +     return false;
>  +  }
>  +
>  +  char buf[512], *d_i, *d_r, *d_c;
>  +  int bytes;
>  +
>  +  if ((bytes = read(fd, buf, sizeof(buf)-1)) == sizeof(buf)-1) {
>  +     close(fd);
>  +     return false;
>  +  }
>  +  close(fd);
>  +
>  +  buf[bytes] = '\n';
>  +  buf[bytes+1] = '\0';
>  +  d_i = strstr(buf, "DISTRIB_ID=");
>  +  d_r = strstr(buf, "DISTRIB_RELEASE=");
>  +  d_c = strstr(buf, "DISTRIB_CODENAME=");
>  +  if (!d_i || !d_r || !d_c) {
>  +     return false;
>  +  }
>  +  d_i = strchr(d_i, '=') + 1;  *strchrnul(d_i, '\n') = '\0';
>  +  d_r = strchr(d_r, '=') + 1;  *strchrnul(d_r, '\n') = '\0';
>  +  d_c = strchr(d_c, '=') + 1;  *strchrnul(d_c, '\n') = '\0';
>  +  st->print("%s %s (%s)", d_i, d_r, d_c);
>  +
>  +  return true;
>  +}
>  +
>   void os::print_dll_info(outputStream *st) {
>     st->print_cr("Dynamic libraries:");
>
>  @@ -1785,6 +1816,7 @@
>        !_print_ascii_file("/etc/SuSE-release", st) &&
>        !_print_ascii_file("/etc/turbolinux-release", st) &&
>        !_print_ascii_file("/etc/gentoo-release", st) &&
>  +      !_print_debian_lsb_file("/etc/lsb-release", st) &&
>        !_print_ascii_file("/etc/debian_version", st)) {
>        st->print("Linux");
>    }
>
>

Presumably this is meant to be a patch for IcedTea's patch
subdirectory with appropriate editions to the build as HotSpot files
are not part of IcedTea itself?
-- 
Andrew :-)

Document Freedom Day - March 26th
http://documentfreedom.org

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8