svn commit: r296401 - head/contrib/ofed/libsdp/src

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar  4 22:37:25 2016
New Revision: 296401
URL: https://svnweb.freebsd.org/changeset/base/296401

Log:
  Fix missing symbol program_invocation_short_name.
  
  This fixes runtime when logging is enabled.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/contrib/ofed/libsdp/src/port.c

Modified: head/contrib/ofed/libsdp/src/port.c
==============================================================================
--- head/contrib/ofed/libsdp/src/port.c	Fri Mar  4 22:37:21 2016	(r296400)
+++ head/contrib/ofed/libsdp/src/port.c	Fri Mar  4 22:37:25 2016	(r296401)
@@ -40,6 +40,9 @@
 #define FASYNC 0
 #include <libgen.h>
 #endif
+#ifdef __FreeBSD__
+#include <libgen.h>
+#endif
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
@@ -217,7 +220,7 @@ volatile static int init_status = 0;	/* 
 
 /* glibc provides these symbols - for Solaris builds we fake them
  * until _init is called, at which point we quiz libdl.. */
-#ifdef SOLARIS_BUILD
+#if defined(SOLARIS_BUILD) || defined(__FreeBSD__)
 char *program_invocation_name = "[progname]", *program_invocation_short_name =
 	"[short_progname]";
 #else
@@ -2583,6 +2586,10 @@ void __sdp_init(void)
 		program_invocation_short_name = basename(args_info.dla_argv[0]);
 	}
 #endif
+#ifdef __FreeBSD__
+	program_invocation_short_name = (char *)getprogname();
+	program_invocation_name = program_invocation_short_name;
+#endif
 
 	if (getenv("SIMPLE_LIBSDP") != NULL) {
 		simple_sdp_library = 1;