sstrerror_r now calls the POSIX version of strerror_r

The CASTOR/SHIFT function sstrerror_r() should call the "standard"
function strerror_r().  Before this modification the "standard"
strerror() function was being called which is not guranteed to be
thread safe.

Compiling the CASTOR/SHIFT function sstrerror_r() code as C++ code
as opposed to C code makes the GNU compiler check the return type
of the "standard" function strerror_r().

The return type of the "standard" function strerror_r() is char *
for the GNU version and int for the POSIX version.

The following two conditions must be true in order to use the
POSIX version of strerror_r():

1. _GNU_SOURCE must NOT be defined
2. Either _XOPEN_SOURCE should be defined as 600 or
   _POSIX_C_SOURCE should be defined as 200112L

common/CMakeLists.txt

@@ -26,7 +26,7 @@ set (COMMON_LIB_SRC_FILES
   compat.c getacct.c getacctent.c getconfent.cpp
   getifnam.c getuser.c log.c marshall.c
   readc.c remote.c
-  serror.c socket.c solveln.c trace.c
+  serror.cpp socket.c solveln.c trace.c
   ypgetacct.c ypgetacctent.c
   Cthread.c Cglobals.c Cgrp.c Cmutex.c Cuuid.c
   Cdomainname.c Cnetdb.c Cpool.c Cpwd.c Cstrerror.c

common/serror.c → common/serror.cpp

@@ -3,22 +3,26 @@
  * All rights reserved
  */
 
+/*
+ * Undefine _GNU_SOURCE and set _XOPEN_SOURCE to 600 so that the POSIX
+ * version of strerror_r() will be used
+ */
+#undef _GNU_SOURCE
+#define _XOPEN_SOURCE 600
+
 /* serror.c     Global error reporting routines                         */
+#include "h/serrno.h"   /* special error numbers and codes              */
+#include "h/Cglobals.h"
 
 #include <stdio.h>      /* standard input/output                        */
 #include <errno.h>      /* error numbers and codes                      */
 
-#include <serrno.h>     /* special error numbers and codes              */
-#include <log.h>        /* logger functions                             */
-#include <Cglobals.h>
 #include <string.h>
 
 #if !defined(linux) && !defined(__APPLE__) 
 extern int      sys_nerr;       /* number of system error messages      */
 #endif
 
-#include <net.h>                /*     networking specifics             */
-
 char    *sys_serrlist[SEMAXERR-SEBASEOFF+2]=
   {"Error 0",
    "Host not known",
@@ -489,6 +493,7 @@ char *sys_secerrlist[ESECMAXERR-ESECBASEOFF+2] =
 
 char * sstrerror_r(const int n, char *const buf, const size_t buflen) {
   char *tmpstr;
+  char strerror_r_buf[100];
   if ( buf == NULL || buflen <= 0 ) return(NULL);
   memset(buf,'\0',buflen);
   tmpstr = NULL;
@@ -580,8 +585,19 @@ char * sstrerror_r(const int n, char *const buf, const size_t buflen) {
              ) {
     /*
      * SYSTEM error messages
+     *
+     * Note: Explicitly store the result of strerror_r into an integer in order
+     * to make sure the XSI-compliant version is being used.  The GNU version
+     * returns a pointer to char.
      */
-    tmpstr = (char *) strerror(n);
+    const int strerror_r_rc =
+      strerror_r(n, strerror_r_buf, sizeof(strerror_r_buf));
+    if(strerror_r_rc) {
+      tmpstr = "Unknown error because call to strerror_r failed";
+    } else {
+      tmpstr = strerror_r_buf;
+    }
+    
   }
 
   if ( tmpstr != NULL ) {