tools/hv: Parse /etc/os-release
PATCH 1/1 tools/hv: Parse /etc/os-release
From: Ben Hutchings <[email protected]>
There is a new convention, used by systemd and supported by most distributions, to put basic OS release information in /etc/os-release. Added some additional error checking on strdup()
Signed-off-by Ben Hutchings <[email protected]>
Signed-off-by K. Y. Srinivasan <[email protected]>
--- tools/hv/hv_kvp_daemon.c | 59 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 4 deletions(-)
tools/hv/hv_kvp_daemon.c +55 -4
@@ -454,6 +454,7 @@ void kvp_get_os_info(void)uname (&uts_buf); os_build = uts_buf.release; + os_name = uts_buf.sysname; processor_arch = uts_buf.machine;/*
@@ -465,20 +466,70 @@ void kvp_get_os_info(void)if (p) *p ='\0' ; +/* +* Parse the /etc/os-release file if present: +* http://www.freedesktop.org/software/systemd/man/os-release.html +*/ + file =fopen ("/etc/os-release" ,"r" ); +if (file !=NULL ) { +while (fgets (buf,sizeof (buf), file)) { +char *value, *q; + +/* Ignore comments */ +if (buf[0 ] =='#' ) +continue ; + +/* Split into name=value */ + p =strchr (buf,'=' ); +if (!p) +continue ; + *p++ =0 ; + +/* Remove quotes and newline; un-escape */ + value = p; + q = p; +while (*p) { +if (*p =='\\' ) { + ++p; +if (!*p) +break ; + *q++ = *p++; + }else if (*p =='\'' || *p =='"' || + *p =='\n' ) { + ++p; + }else { + *q++ = *p++; + } + } + *q =0 ; + +if (!strcmp (buf,"NAME" )) { + p =strdup (value); +if (!p) +break ; + os_name = p; + }else if (!strcmp (buf,"VERSION_ID" )) { + p =strdup (value); +if (!p) +break ; + os_major = p; + } + } +fclose (file); +return ; + } + +/* Fallback for older RH/SUSE releases */ file =fopen ("/etc/SuSE-release" ,"r" );if (file !=NULL ) goto kvp_osinfo_found; file =fopen ("/etc/redhat-release" ,"r" );if (file !=NULL ) goto kvp_osinfo_found; -/* -* Add code for other supported platforms. -*/ /* * We don't have information about the os. */ - os_name = uts_buf.sysname;return ; kvp_osinfo_found:
Signature · 1 line
1.7.4.1