summaryrefslogtreecommitdiff
path: root/multimedia/libmpeg3/patches/patch-ae
blob: 106856e6de06d43621892a8cf313bdcd3b1484a8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
$NetBSD: patch-ae,v 1.6 2005/12/06 17:47:56 joerg Exp $

--- mpeg3io.c.orig	2001-05-20 13:05:26.000000000 +1000
+++ mpeg3io.c
@@ -1,8 +1,21 @@
 #include "mpeg3private.h"
 #include "mpeg3protos.h"
 
-#include <mntent.h>
-#include <sys/stat.h>
+#if defined(__NetBSD__) || defined(__DragonFly__)
+# include <sys/param.h>
+# include <sys/mount.h>
+
+# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900   /* 2.99.9 */
+#  define statfs statvfs
+# endif
+
+# include <sys/types.h>
+# include <sys/stat.h>
+#else
+# include <mntent.h>
+# include <sys/stat.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -88,16 +101,25 @@ int mpeg3io_read_data(unsigned char *buf
 
 int mpeg3io_device(char *path, char *device)
 {
+#if defined(__NetBSD__) || defined(__DragonFly__)
+	struct statfs file_st;
+
+	if (statfs(path, &file_st) < 0)
+#else
 	struct stat file_st, device_st;
     struct mntent *mnt;
 	FILE *fp;
 
 	if(stat(path, &file_st) < 0)
+#endif
 	{
 		perror("mpeg3io_device");
 		return 1;
 	}
 
+#if defined(__NetBSD__) || defined(__DragonFly__)
+	strncpy(device, file_st.f_mntfromname, MPEG3_STRLEN);
+#else
 	fp = setmntent(MOUNTED, "r");
     while(fp && (mnt = getmntent(fp)))
 	{
@@ -109,6 +131,7 @@ int mpeg3io_device(char *path, char *dev
 		}
 	}
 	endmntent(fp);
+#endif
 
 	return 0;
 }