1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

ftp/pftpd: Add DragonFly support

Bring in fix from dports (port is not maintained)
This commit is contained in:
John Marino 2015-03-26 14:18:50 +00:00
parent d361a1631c
commit 0ef457ae80
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=382318
2 changed files with 30 additions and 4 deletions

View File

@ -1,12 +1,27 @@
--- plib/dirlist.c.orig Tue Feb 1 10:43:35 2005
+++ plib/dirlist.c Mon May 23 18:35:47 2005
@@ -80,7 +80,9 @@
len = strlen(name);
--- plib/dirlist.c.orig 2013-07-04 11:10:49 UTC
+++ plib/dirlist.c
@@ -66,7 +66,11 @@ dirent_dup(const struct dirent *dep)
n_dep = a_malloc(len, "struct dirent");
memcpy(n_dep, dep, len);
#else
+# ifdef __DragonFly__
+ n_dep = a_malloc(len = _DIRENT_RECLEN(dep->d_namlen), "struct dirent");
+# else
n_dep = a_malloc(len = dep->d_reclen, "struct dirent");
+# endif
#endif
memcpy(n_dep, dep, len);
@@ -91,8 +95,12 @@ dirent_alloc(ino_t ino, const char *name
dp = a_malloc(sizeof(*dp)+len, "struct dirent");
dp->d_ino = ino;
+#ifdef linux
dp->d_off = 0;
+#endif /* linux */
+#ifndef __DragonFly__
dp->d_reclen = len;
+#endif
strcpy(dp->d_name, name);
return dp;

View File

@ -0,0 +1,11 @@
--- plib/safeio.c.orig 2013-07-04 11:10:49 UTC
+++ plib/safeio.c
@@ -448,7 +448,7 @@
{
int err;
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__DragonFly__)
off_t sbytes;
while ((err = sendfile(to_fd, from_fd, *start, len,
NULL, &sbytes, 0)) == -1) {