mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-15 07:56:36 +00:00
net/freerdp: fix build on FreeBSD 11.x
Apparently this hadn't been caught in my test matrix -- it seems that later versions of FreeBSD have a getmntent() definition that masked this error. mntent_compat.c has been adopted from devel/fam, though a better solution should be sought out going into the future. Approved by: koobs (mentor, implicit, just-fix-it) MFH: 2020Q2 (blanket: build fix)
This commit is contained in:
parent
83a4f86581
commit
6e99cb1aa7
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=538329
@ -171,5 +171,6 @@ post-patch:
|
||||
|
||||
pre-configure:
|
||||
${CP} ${FILESDIR}/mntent.h ${WRKSRC}/rdtk/include
|
||||
${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
174
net/freerdp/files/mntent_compat.c
Normal file
174
net/freerdp/files/mntent_compat.c
Normal file
@ -0,0 +1,174 @@
|
||||
/*
|
||||
* Copyright (c) 1980, 1989, 1993, 1994
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 2001
|
||||
* David Rufino <daverufino@btinternet.com>
|
||||
* Copyright (c) 2006
|
||||
* Stanislav Sedov <ssedov@mbsd.msk.ru>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* most of this was ripped from the mount(3) source */
|
||||
|
||||
#include "config.h"
|
||||
#include "mntent.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/ucred.h>
|
||||
#include <sys/mount.h>
|
||||
|
||||
static int pos = -1;
|
||||
static int mntsize = -1;
|
||||
static struct mntent _mntent;
|
||||
|
||||
struct {
|
||||
int m_flag;
|
||||
const char *m_option;
|
||||
} mntoptions[] = {
|
||||
{ MNT_ASYNC, "async" },
|
||||
{ MNT_NOATIME, "noatime"},
|
||||
{ MNT_NOEXEC, "noexec"},
|
||||
{ MNT_NOSUID, "nosuid"},
|
||||
{ MNT_NOSYMFOLLOW, "nosymfollow"},
|
||||
{ MNT_SYNCHRONOUS, "sync"},
|
||||
{ MNT_UNION, "union"},
|
||||
{ MNT_NOCLUSTERR, "noclusterr"},
|
||||
{ MNT_NOCLUSTERW, "noclusterw"},
|
||||
{ MNT_SUIDDIR, "suiddir"},
|
||||
#ifdef MNT_SNAPSHOT
|
||||
{ MNT_SNAPSHOT, "snapshot"},
|
||||
#endif
|
||||
#ifdef MNT_MULTILABEL
|
||||
{ MNT_MULTILABEL, "multilabel"},
|
||||
#endif
|
||||
#ifdef MNT_ACLS
|
||||
{ MNT_ACLS, "acls"},
|
||||
#endif
|
||||
#ifdef MNT_NODEV
|
||||
{ MNT_NODEV, "nodev"},
|
||||
#endif
|
||||
};
|
||||
|
||||
#define N_OPTS (sizeof(mntoptions) / sizeof(*mntoptions))
|
||||
|
||||
char *
|
||||
hasmntopt (const struct mntent *mnt, const char *option)
|
||||
{
|
||||
int found;
|
||||
char *opt, *optbuf;
|
||||
|
||||
optbuf = strdup(mnt->mnt_opts);
|
||||
found = 0;
|
||||
for (opt = optbuf; (opt = strtok(opt, " ")) != NULL; opt = NULL) {
|
||||
if (!strcasecmp(opt, option)) {
|
||||
opt = opt - optbuf + mnt->mnt_opts;
|
||||
free (optbuf);
|
||||
return (opt);
|
||||
}
|
||||
}
|
||||
free (optbuf);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
static char *
|
||||
catopt (char *s0, const char *s1)
|
||||
{
|
||||
size_t newlen;
|
||||
char *cp;
|
||||
|
||||
if (s1 == NULL || *s1 == '\0')
|
||||
return s0;
|
||||
|
||||
if (s0 != NULL) {
|
||||
newlen = strlen(s0) + strlen(s1) + 1 + 1;
|
||||
if ((cp = (char *)realloc(s0, newlen)) == NULL)
|
||||
return (NULL);
|
||||
|
||||
(void)strcat(cp, " ");
|
||||
(void)strcat(cp, s1);
|
||||
} else
|
||||
cp = strdup(s1);
|
||||
|
||||
return (cp);
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
flags2opts (int flags)
|
||||
{
|
||||
char *res = NULL;
|
||||
int i;
|
||||
|
||||
res = catopt(res, (flags & MNT_RDONLY) ? "ro" : "rw");
|
||||
|
||||
for (i = 0; i < N_OPTS; i++)
|
||||
if (flags & mntoptions[i].m_flag)
|
||||
res = catopt(res, mntoptions[i].m_option);
|
||||
return res;
|
||||
}
|
||||
|
||||
static struct mntent *
|
||||
statfs_to_mntent (struct statfs *mntbuf)
|
||||
{
|
||||
static char opts_buf[40], *tmp;
|
||||
|
||||
_mntent.mnt_fsname = mntbuf->f_mntfromname;
|
||||
_mntent.mnt_dir = mntbuf->f_mntonname;
|
||||
_mntent.mnt_type = mntbuf->f_fstypename;
|
||||
tmp = flags2opts (mntbuf->f_flags);
|
||||
if (tmp) {
|
||||
opts_buf[sizeof(opts_buf) - 1] = '\0';
|
||||
strncpy (opts_buf, tmp, sizeof(opts_buf)-1);
|
||||
free (tmp);
|
||||
} else {
|
||||
*opts_buf = '\0';
|
||||
}
|
||||
_mntent.mnt_opts = opts_buf;
|
||||
_mntent.mnt_freq = _mntent.mnt_passno = 0;
|
||||
return (&_mntent);
|
||||
}
|
||||
|
||||
struct mntent *
|
||||
getmntent (FILE *fp)
|
||||
{
|
||||
struct statfs *mntbuf;
|
||||
|
||||
if (pos == -1 || mntsize == -1)
|
||||
mntsize = getmntinfo (&mntbuf, MNT_NOWAIT);
|
||||
|
||||
++pos;
|
||||
if (pos == mntsize) {
|
||||
pos = mntsize = -1;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
return (statfs_to_mntent (&mntbuf[pos]));
|
||||
}
|
10
net/freerdp/files/patch-channels_rdpdr_client_CMakeLists.txt
Normal file
10
net/freerdp/files/patch-channels_rdpdr_client_CMakeLists.txt
Normal file
@ -0,0 +1,10 @@
|
||||
--- channels/rdpdr/client/CMakeLists.txt.orig 2020-06-09 02:02:41 UTC
|
||||
+++ channels/rdpdr/client/CMakeLists.txt
|
||||
@@ -24,6 +24,7 @@ set(${MODULE_PREFIX}_SRCS
|
||||
irp.h
|
||||
devman.c
|
||||
devman.h
|
||||
+ mntent_compat.c
|
||||
rdpdr_main.c
|
||||
rdpdr_main.h
|
||||
rdpdr_capabilities.c
|
Loading…
Reference in New Issue
Block a user