From owner-svn-src-head@freebsd.org  Fri Mar  4 22:37:27 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E48C9DA484;
 Fri,  4 Mar 2016 22:37:27 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CC6842BD;
 Fri,  4 Mar 2016 22:37:26 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u24MbP5P052977;
 Fri, 4 Mar 2016 22:37:25 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u24MbPHY052976;
 Fri, 4 Mar 2016 22:37:25 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603042237.u24MbPHY052976@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 4 Mar 2016 22:37:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296401 - head/contrib/ofed/libsdp/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Mar 2016 22:37:27 -0000

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;