Attachment 3112 Details for Bug 2818 – FreeMiNT patch

[patch] FreeMiNT patch

openssh-7.6p1-mint.patch (text/plain), 1.50 KB, created by Alan Hourihane on 2018-01-09 19:59:11 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Hourihane

Created: 2018-01-09 19:59:11 AEDT

Size: 1.50 KB

patch

obsolete

>diff -u a/openbsd-compat/bsd-statvfs.c b/openbsd-compat/bsd-statvfs.c
>--- a/openbsd-compat/bsd-statvfs.c	2017-10-02 20:34:26.000000000 +0000
>+++ b/openbsd-compat/bsd-statvfs.c	2018-01-04 23:28:17.000000000 +0000
>@@ -25,6 +25,8 @@
> 
> #include <errno.h>
> 
>+#if ((!defined(HAVE_STATVFS) && defined(HAVE_STATFS)) || \
>+     (!defined(HAVE_FSTATVFS) && defined(HAVE_FSTATFS)))
> static void
> copy_statfs_to_statvfs(struct statvfs *to, struct statfs *from)
> {
>@@ -40,6 +42,7 @@
> 	to->f_flag = from->f_flags;
> 	to->f_namemax = MNAMELEN;
> }
>+#endif
> 
> # ifndef HAVE_STATVFS
> int statvfs(const char *path, struct statvfs *buf)
>diff -u a/openbsd-compat/bsd-statvfs.h b/openbsd-compat/bsd-statvfs.h
>--- a/openbsd-compat/bsd-statvfs.h	2017-10-02 20:34:26.000000000 +0000
>+++ b/openbsd-compat/bsd-statvfs.h	2018-01-05 11:28:03.000000000 +0000
>@@ -26,6 +26,9 @@
> #ifdef HAVE_SYS_STATFS_H
> #include <sys/statfs.h>
> #endif
>+#ifdef HAVE_SYS_STATVFS_H
>+#include <sys/statvfs.h>
>+#endif
>
> #ifndef HAVE_FSBLKCNT_T
> typedef unsigned long fsblkcnt_t;
>@@ -42,6 +45,8 @@
> #endif
>
> 	/* as defined in IEEE Std 1003.1, 2004 Edition */
>+#if ((!defined(HAVE_STATVFS) && defined(HAVE_STATFS)) || \
>+     (!defined(HAVE_FSTATVFS) && defined(HAVE_FSTATFS)))
> struct statvfs {
> 	unsigned long f_bsize;	/* File system block size. */
> 	unsigned long f_frsize;	/* Fundamental file system block size. */
>@@ -59,6 +64,7 @@
> 	unsigned long f_namemax;/*  Maximum filename length. */
> };
> #endif
>+#endif
>
> #ifndef HAVE_STATVFS
> int statvfs(const char *, struct statvfs *);

Actions: View | Diff

Attachments on bug 2818: 3112