store the operating system name obtained from uname(3) in the adequate

struct together with similar state date rather than in a function-scope
static variable, such that it can be free(3)d in roff_man_free();
no functional change

diff --git a/mdoc_validate.c b/mdoc_validate.c
index e1cd3ae1edcbff150170a061868c3013146f511b..a92d407773dd2166c73a2aeb01303c32c0aae6f2 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,6 +1,6 @@
-/* $Id: mdoc_validate.c,v 1.389 2021/07/18 11:41:23 schwarze Exp $ */
+/* $Id: mdoc_validate.c,v 1.390 2021/10/04 14:19:14 schwarze Exp $ */
 /*
- * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2021 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
@@ -2872,7 +2872,6 @@ post_os(POST_ARGS)
 {
 #ifndef OSNAME
        struct utsname    utsname;
-       static char      *defbuf;
 #endif
        struct roff_node *n;
 
@@ -2909,15 +2908,15 @@ post_os(POST_ARGS)
 #ifdef OSNAME
        mdoc->meta.os = mandoc_strdup(OSNAME);
 #else /*!OSNAME */
-       if (defbuf == NULL) {
+       if (mdoc->os_r == NULL) {
                if (uname(&utsname) == -1) {
                        mandoc_msg(MANDOCERR_OS_UNAME, n->line, n->pos, "Os");
-                       defbuf = mandoc_strdup("UNKNOWN");
+                       mdoc->os_r = mandoc_strdup("UNKNOWN");
                } else
-                       mandoc_asprintf(&defbuf, "%s %s",
+                       mandoc_asprintf(&mdoc->os_r, "%s %s",
                            utsname.sysname, utsname.release);
        }
-       mdoc->meta.os = mandoc_strdup(defbuf);
+       mdoc->meta.os = mandoc_strdup(mdoc->os_r);
 #endif /*!OSNAME*/
 
 out:

diff --git a/roff.c b/roff.c
index 2d85e39fad56f60a0ef6f3d7d87738d934176a5a..d60eca9696d94198c6709daf3546d922c306af99 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,6 +1,6 @@
-/* $Id: roff.c,v 1.379 2021/10/04 10:12:27 schwarze Exp $ */
+/* $Id: roff.c,v 1.380 2021/10/04 14:19:14 schwarze Exp $ */
 /*
- * Copyright (c) 2010-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017-2021 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -861,6 +861,7 @@ void
 roff_man_free(struct roff_man *man)
 {
        roff_man_free1(man);
+       free(man->os_r);
        free(man);
 }
 

diff --git a/roff_int.h b/roff_int.h
index e0700a742910bff59c71a5a5da19d4eb361a7d40..f7d688fdec43d36e379493acc895ddab19c86e5c 100644 (file)
--- a/roff_int.h
+++ b/roff_int.h
@@ -35,6 +35,7 @@ struct        roff_man {
        struct ohash     *mdocmac; /* Mdoc macro lookup table. */
        struct ohash     *manmac;  /* Man macro lookup table. */
        const char       *os_s;    /* Default operating system. */
+       char             *os_r;    /* Operating system name at run time. */
        struct roff_node *last;    /* The last node parsed. */
        struct roff_node *last_es; /* The most recent Es node. */
        int               quick;   /* Abort parse early. */