Changeset 23516

Timestamp:

Mar 25, 2009, 11:15:28 AM (17 years ago)

Author:

eugene

Message:

add gprint_syserror function, gprintv

Location:

branches/eam_branches/eam_branch_20090322/Ohana/src/opihi

Files:

• include/shell.h (modified) (1 diff)
• lib.shell/gprint.c (modified) (3 diffs)

branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/include/shell.h

@@ -166 +166 @@
 int           gprint                    PROTO((gpDest dest, char *format, ...));
 int           gwrite                    PROTO((char *buffer, int size, int N, gpDest dest));
+int           gprint_syserror           PROTO((gpDest dest, int myError, char *format, ...));
+int           gprintv                   PROTO((gpDest dest, char *format, va_list argp));
 
 /* socket functions */

branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/lib.shell/gprint.c

@@ -287 +287 @@
 
   int status;
-  gpStream *stream;
   va_list argp;  
 
+  va_start (argp, format);
+  status = gprintv (dest, format, argp);
+  va_end (argp);
+  return (status);
+}
+
+int gprintv (gpDest dest, char *format, va_list argp) {
+
+  int status;
+  gpStream *stream;
+
   // this thread only writes to its own stream
   stream = gprintGetStream (dest);
-
-  va_start (argp, format);
 
   if (stream[0].mode == GP_FILE) {
@@ -303 +311 @@
     vPrintIOBuffer (stream[0].buffer, format, argp);
   }
-  va_end (argp);
   return (TRUE);
 }
@@ -332 +339 @@
 }
 
-/* I'm going to need to have different output targets for different threads
-   we can do this with these functions:
-
-   pthread_t pthread_self(void);
-   int pthread_equal(pthread_t thread1, pthread_t thread2);
-   // returns TRUE if equal, FALSE if not
-   
-*/
-
+# define MAX_ERROR_LENGTH 256           // Maximum length string for error messages
+
+// print an error (based on errno values) to gprint destination
+int gprint_syserror (gpDest dest, int myError, char *format, ...) {
+
+  char errorBuf[MAX_ERROR_LENGTH];
+  char *errorMsg;
+  va_list argp;  
+
+  // there are two strerror_r implementations; choose the right one:
+#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
+  errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
+#else
+  strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
+  errorMsg = errorBuf;
+#endif
+
+  va_start (argp, format);
+  gprintv (dest, format, argp);
+  va_end (argp);
+
+  gprintv (dest, "%s\n", errorMsg);
+  return TRUE;
+}