mirror of
https://git.freebsd.org/ports.git
synced 2025-06-15 17:50:31 -04:00
f2b1b51d41
* Make sure that linux/kFreeBSD code isn't run on FreeBSD itself.
* Pass the correct value back via the argument of the calling function. [1]
* Fix white space to match the rest of the file, so upstream can't complain
about that.
* Drop freedesktop-sound-theme it isn't used by default. Add line to
pkg-message to mention that it needs to be installed if enabled in
default.pa.
* Don't use ETCDIR in pkg-message.in, it gets expanded to
${LOCALBASE}/etc/pulseaudio which isn't correct since pulseaudio uses
etc/pulse/
[1] I have no idea what I did to break this in the first version, while
it worked at the time localy.
46 lines
1.2 KiB
C
46 lines
1.2 KiB
C
--- src/pulse/util.c.orig 2015-02-12 09:10:35.000000000 -0500
|
|
+++ src/pulse/util.c 2015-06-13 17:15:14.603153000 -0400
|
|
@@ -30,6 +30,10 @@
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
+#ifdef __FreeBSD__
|
|
+#include <sys/sysctl.h>
|
|
+#include <sys/user.h>
|
|
+#endif
|
|
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
@@ -200,7 +204,7 @@ char *pa_get_binary_name(char *s, size_t
|
|
}
|
|
#endif
|
|
|
|
-#if defined(__linux__) || defined(__FreeBSD_kernel__)
|
|
+#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__))
|
|
{
|
|
char *rp;
|
|
/* This works on Linux and Debian/kFreeBSD */
|
|
@@ -215,13 +219,17 @@ char *pa_get_binary_name(char *s, size_t
|
|
|
|
#ifdef __FreeBSD__
|
|
{
|
|
- char *rp;
|
|
-
|
|
- if ((rp = pa_readlink("/proc/curproc/file"))) {
|
|
- pa_strlcpy(s, pa_path_get_filename(rp), l);
|
|
- pa_xfree(rp);
|
|
- return s;
|
|
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()};
|
|
+ struct kinfo_proc kp;
|
|
+ size_t sz = sizeof(kp);
|
|
+
|
|
+ if (sysctl(mib, 4, &kp, &sz, NULL, 0) == 0)
|
|
+ {
|
|
+ pa_strlcpy(s, kp.ki_comm, l);
|
|
+ return kp.ki_comm;
|
|
}
|
|
+ else
|
|
+ return NULL;
|
|
}
|
|
#endif
|
|
|