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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
$FreeBSD$
--- libnautilus-private/nautilus-volume-monitor.c.orig Wed Oct 10 03:16:39 2001
+++ libnautilus-private/nautilus-volume-monitor.c Wed Dec 5 23:58:45 2001
@@ -60,6 +60,18 @@
#include <sys/types.h>
#include <unistd.h>
+#ifdef __FreeBSD__
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+
+#define HAVE_GETMNTINFO
+#define HAVE_SETFSENT
+#define HAVE_FSTAB_H
+#define FREEBSD_MNT
+#define setmntent(f,m) setfsent()
+#endif
+
#ifdef HAVE_SYS_VFSTAB_H
#include <sys/vfstab.h>
#else
@@ -104,7 +116,7 @@
#define MNTOPT_RO "ro"
#endif
-#ifndef HAVE_SETMNTENT
+#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT)
#define setmntent(f,m) fopen(f,m)
#endif
@@ -495,6 +507,11 @@
return TRUE;
}
#endif
+#ifdef __FreeBSD__
+ if (eel_str_has_prefix (ent->f_mntonname, "/mnt/")) {
+ return TRUE;
+ }
+#endif
return FALSE;
}
@@ -510,35 +527,42 @@
static GList *
get_removable_volumes (NautilusVolumeMonitor *monitor)
{
+#ifndef HAVE_SETFSENT
FILE *file;
- GList *volumes;
- MountTableEntry *ent;
- NautilusVolume *volume;
+#else
+ int file;
+ struct fstab *fsent;
+#endif
+ GList *volumes = NULL;
+ MountTableEntry *ent = NULL;
+ NautilusVolume *volume = NULL;
#ifdef HAVE_SYS_MNTTAB_H
MountTableEntry ent_storage;
#endif
- ent = NULL;
- volume = NULL;
- volumes = NULL;
#ifdef HAVE_GETMNTINFO
int count, index;
+ /*{static int b = 1; while (b);}*/
count = getmntinfo (&ent, MNT_WAIT);
/* getmentinfo returns a pointer to static data. Do not free. */
for (index = 0; index < count; index++) {
- if (has_removable_mntent_options (ent + 1)) {
+ if (has_removable_mntent_options (ent + index)) {
volume = create_volume (ent[index].f_mntfromname,
- ent[index].f_mntoname);
+ ent[index].f_mntonname);
volume->is_removable = TRUE;
volumes = finish_creating_volume_and_prepend
- (monitor, volume, ent[index].f_fstyename, volumes);
+ (monitor, volume, ent[index].f_fstypename, volumes);
}
}
#endif
file = setmntent (MOUNT_TABLE_PATH, "r");
+#ifndef HAVE_SETFSENT
if (file == NULL) {
+#else
+ if (file == 0) {
+#endif
return NULL;
}
@@ -560,9 +584,21 @@
(monitor, volume, ent->mnt_type, volumes);
}
}
+#elif defined (HAVE_SETFSENT)
+ while ((fsent = getfsent ()) != NULL) {
+ if (strstr (fsent->fs_mntops, "noauto") == 0) {
+ volume = create_volume (fsent->fs_spec, fsent->fs_file);
+ volumes = finish_creating_volume_and_prepend
+ (monitor, volume, fsent->fs_vfstype, volumes);
+ }
+ }
#endif
+#ifndef HAVE_SETFSENT
fclose (file);
+#else
+ endfsent();
+#endif
#ifdef HAVE_CDDA
volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
@@ -575,7 +611,7 @@
return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort);
}
-#ifndef SOLARIS_MNT
+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
static gboolean
volume_is_removable (const NautilusVolume *volume)
@@ -907,23 +943,34 @@
-#ifdef SOLARIS_MNT
+#if defined(SOLARIS_MNT) || defined(FREEBSD_MNT)
static GList *
get_mount_list (NautilusVolumeMonitor *monitor)
{
- FILE *fh;
GList *volumes;
+#ifndef HAVE_SETFSENT
+ FILE *fh;
MountTableEntry ent;
+#else
+ int fh;
+ struct fstab *ent;
+#endif
NautilusVolume *volume;
+ /*{static int b = 1; while (b);}*/
volumes = NULL;
fh = setmntent (MOUNT_TABLE_PATH, "r");
+#ifndef HAVE_SETFSENT
if (fh == NULL) {
+#else
+ if (fh == 0) {
+#endif
return NULL;
}
+#ifndef HAVE_SETFSENT
while (! getmntent(fh, &ent)) {
volume = create_volume (ent.mnt_special, ent.mnt_mountp);
volume->is_removable = has_removable_mntent_options (&ent);
@@ -932,6 +979,23 @@
}
fclose (fh);
+#else
+ while ((ent = getfsent ()) != NULL) {
+ {static int b = 1; while (b);}
+ if (strcmp(ent->fs_vfstype, "swap") == 0)
+ continue;
+ volume = create_volume (ent->fs_spec, ent->fs_file);
+ if (strstr (ent->fs_mntops, "noauto") == 0)
+ volume->is_removable = TRUE;
+ else
+ volume->is_removable = FALSE;
+ volumes = finish_creating_volume_and_prepend
+ (monitor, volume, ent->fs_vfstype, volumes);
+ }
+
+ endfsent();
+#endif
+
return volumes;
}
@@ -1668,7 +1732,7 @@
for (node = volume_list; node != NULL; node = node->next) {
volume = node->data;
-#ifndef SOLARIS_MNT
+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
/* These are set up by get_current_mount_list for Solaris. */
volume->is_removable = volume_is_removable (volume);
#endif
|
