Commit ba420d50 authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch...

Merge branch '1965-bin-named-unix-os-c-warning-s-directive-output-may-be-truncated-on-openindiana-v9_11' into 'v9_11'

Resize unamebuf[] to avoid warnings about snprintf() not having

See merge request !3745
parents b8fbd0a1 003d9d55
Pipeline #45191 passed with stages
in 3 minutes and 39 seconds
......@@ -73,7 +73,7 @@ ns_os_tzset(void);
void
ns_os_started(void);
char *
const char *
ns_os_uname(void);
#endif /* NS_OS_H */
......@@ -1089,8 +1089,12 @@ ns_os_tzset(void) {
#endif
}
static char unamebuf[BUFSIZ];
static char *unamep = NULL;
#ifdef HAVE_UNAME
static char unamebuf[sizeof(struct utsname)];
#else
static const char unamebuf[] = { "unknown architecture" };
#endif
static const char *unamep = NULL;
static void
getuname(void) {
......@@ -1103,18 +1107,16 @@ getuname(void) {
return;
}
snprintf(unamebuf, sizeof(unamebuf),
"%s %s %s %s",
uts.sysname, uts.machine, uts.release, uts.version);
#else
snprintf(unamebuf, sizeof(unamebuf), "unknown architecture");
#endif
snprintf(unamebuf, sizeof(unamebuf), "%s %s %s %s", uts.sysname,
uts.machine, uts.release, uts.version);
#endif /* ifdef HAVE_UNAME */
unamep = unamebuf;
}
char *
const char *
ns_os_uname(void) {
if (unamep == NULL)
if (unamep == NULL) {
getuname();
}
return (unamep);
}
......@@ -70,7 +70,7 @@ ns_os_tzset(void);
void
ns_os_started(void);
char *
const char *
ns_os_uname(void);
#endif /* NS_OS_H */
......@@ -392,7 +392,7 @@ ns_os_started(void) {
}
static char unamebuf[BUFSIZ];
static char *unamep = NULL;
static const char *unamep = NULL;
static void
getuname(void) {
......@@ -461,9 +461,10 @@ getuname(void) {
* GetVersionEx() returns 6.2 (aka Windows 8.1) since it was obsoleted
* so we had to switch to the recommended way to get the Windows version.
*/
char *
const char *
ns_os_uname(void) {
if (unamep == NULL)
if (unamep == NULL) {
getuname();
}
return (unamep);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment