Add a patch (based on one from FreeBSD) to display removable media

(and network mounts) automatically.

2 files changed, 319 insertions, 6 deletions

diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index ae6a88dee3e..7ef635fb916 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2003/12/14 23:09:02 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2003/12/31 01:41:35 xtraeme Exp $
 
 SHA1 (nautilus-2.4.1.tar.bz2) = b8670ab9499eaff54c265cabb6736a742691084b
 Size (nautilus-2.4.1.tar.bz2) = 5573224 bytes
 SHA1 (patch-aa) = 334a3c4b4fe5b93c817f04c2de1f130ad7b17592
 SHA1 (patch-ab) = 38390bb0d8b705f561f8e2d30a323b78a982a777
 SHA1 (patch-ac) = ee6b0d6df93fa3aa44ab86754322067f586dd0e2
-SHA1 (patch-ad) = bd54cbe0abb49ce52288e9f5bea51ddea9ff5481
+SHA1 (patch-ad) = 3a41dc22f3b0f76dc0efbc8efb71605be73a547a
 SHA1 (patch-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124
 SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057
diff --git a/sysutils/nautilus/patches/patch-ad b/sysutils/nautilus/patches/patch-ad
index 095faa20907..55a406e26aa 100644
--- a/sysutils/nautilus/patches/patch-ad
+++ b/sysutils/nautilus/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2003/12/14 23:09:02 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2003/12/31 01:41:35 xtraeme Exp $
 
---- libnautilus-private/nautilus-volume-monitor.c.orig	2003-10-26 05:00:57.000000000 +0000
-+++ libnautilus-private/nautilus-volume-monitor.c	2003-10-26 05:04:17.000000000 +0000
-@@ -55,6 +55,7 @@
+--- libnautilus-private/nautilus-volume-monitor.c.orig	1997-01-04 04:26:43.000000000 +0100
++++ libnautilus-private/nautilus-volume-monitor.c	2003-12-31 02:31:12.000000000 +0100
+@@ -55,11 +55,21 @@
  #include <pthread.h>
  #include <stdio.h>
  #include <stdlib.h>
@@ -10,3 +10,316 @@ $NetBSD: patch-ad,v 1.2 2003/12/14 23:09:02 xtraeme Exp $
  #include <sys/ioctl.h>
  #include <sys/stat.h>
  #include <sys/types.h>
+ #include <unistd.h>
+ 
++#ifdef BSD
++#include <sys/ucred.h>
++#include <sys/mount.h>
++
++#define HAVE_SETFSENT
++#define BSD_MNT
++#define setmntent(f,m) setfsent()
++#endif
++
+ #ifdef HAVE_SYS_VFSTAB_H
+ #include <sys/vfstab.h>
+ #elif HAVE_FSTAB_H
+@@ -121,7 +131,7 @@
+ #define MNTOPT_RO "ro"
+ #endif
+ 
+-#ifndef HAVE_SETMNTENT
++#if !defined(HAVE_SETMNTENT) &&  !defined(HAVE_SETFSENT)
+ #define setmntent(f,m) fopen(f,m)
+ #endif
+ #ifndef HAVE_ENDMNTENT
+@@ -589,6 +599,9 @@
+ static gboolean
+ has_removable_mntent_options (MountTableEntry *ent)
+ {
++#ifdef BSD
++    	struct fstab *fsent;
++#endif
+ #ifdef HAVE_HASMNTOPT
+ 	/* Use "owner" or "user" or "users" as our way of determining a removable volume */
+ 	if (hasmntopt (ent, "user") != NULL
+@@ -598,6 +611,12 @@
+ 		return TRUE;
+ 	}
+ #endif
++#ifdef BSD
++	fsent = getfsspec(ent->f_mntfromname);
++	if (fsent != NULL && strstr (fsent->fs_mntops, "noauto")) {
++	    	return TRUE;
++	}
++#endif
+ 
+ #ifdef SOLARIS_MNT
+ 	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
+@@ -737,10 +756,15 @@
+ 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;
+ 	char * fs_opt;
+ #if defined(HAVE_SYS_MNTTAB_H) || defined(AIX_MNT)
+         MountTableEntry ent_storage;
+@@ -748,15 +772,12 @@
+ #ifdef HAVE_GETMNTINFO
+ 	int count, index;
+ #endif
+-	ent = NULL;
+-	volume = NULL;
+-	volumes = NULL;
+ 
+ #ifdef HAVE_GETMNTINFO
+ 	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[index])) {
++		if (has_removable_mntent_options (ent + index)) {
+ 			volume = create_volume (ent[index].f_mntfromname,
+ 						ent[index].f_mntonname);
+ 			volume->is_removable = TRUE;
+@@ -767,7 +788,11 @@
+ #endif
+ 	
+ 	file = setmntent (MOUNT_TABLE_PATH, "r");
++#ifndef HAVE_SETFSENT
+ 	if (file == NULL) {
++#else
++	if (file == 0) {
++#endif
+ 		return NULL;
+ 	}
+ 	
+@@ -812,9 +837,21 @@
+ 				(monitor, volume, ent->mnt_type, volumes);
+ 		}
+ 	}
++#elif defined (HAVE_SETFSENT)
++	while ((fsent = getfsent ()) != NULL) {
++	    if (strstr (fsent->fs_mntops, "noauto") != NULL) {
++		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
+ 	endmntent (file);
++#else
++	endfsent();
++#endif
+ 	
+ #ifdef HAVE_CDDA
+ 	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
+@@ -844,7 +881,7 @@
+       return result;
+ }
+ 
+-#ifndef SOLARIS_MNT
++#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
+ 
+ static gboolean
+ volume_is_removable (const NautilusVolume *volume)
+@@ -1156,7 +1193,11 @@
+ 	char *command;	
+ 	
+ 	if (path != NULL) {
++#ifdef __FreeBSD__
++		command = g_strdup_printf ("/usr/sbin/cdcontrol -f %s eject", path);
++#else
+ 		command = g_strdup_printf ("eject %s", path);	
++#endif
+ 		eel_gnome_shell_execute (command);
+ 		g_free (command);
+ 	}
+@@ -1313,23 +1354,34 @@
+         return volumes;
+ }
+ 
+-#elif defined(SOLARIS_MNT)
++#elif defined(SOLARIS_MNT) || defined(BSD_MNT)
+ 
+ static GList *
+ get_mount_list (NautilusVolumeMonitor *monitor) 
+ {
+-        FILE *fh;
+         GList *volumes;
+-        MountTableEntry ent;
+         NautilusVolume *volume;
++#ifndef HAVE_SETFSENT
++        MountTableEntry ent;
++	FILE *fh;
++#else
++	MountTableEntry *ent;
++	int fh, index;
++#endif
+ 
+ 	volumes = NULL;
+         
++#ifndef HAVE_SETFSENT
+ 	fh = setmntent (MOUNT_TABLE_PATH, "r");
+ 	if (fh == NULL) {
++#else
++	fh = getmntinfo (&ent, MNT_WAIT);
++	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);
+@@ -1338,6 +1390,16 @@
+         }
+ 
+ 	endmntent (fh);
++#else
++	/* getmentinfo returns a pointer to static data. Do not free. */
++	for (index = 0; index < fh; index++) {
++	    volume = create_volume (ent[index].f_mntfromname,
++		    ent[index].f_mntonname);
++	    volume->is_removable = has_removable_mntent_options (ent + index);
++	    volumes = finish_creating_volume_and_prepend
++		(monitor, volume, ent[index].f_fstypename, volumes);
++	}
++#endif
+ 
+         return volumes;
+ }
+@@ -1564,7 +1626,7 @@
+ static int
+ get_cdrom_type (const char *vol_dev_path, int* fd)
+ {
+-#ifdef SOLARIS_MNT	
++#if defined(SOLARIS_MNT)
+ 	GString *new_dev_path;
+ 	struct cdrom_tocentry entry;
+ 	struct cdrom_tochdr header;
+@@ -1603,6 +1665,38 @@
+ 	return type;
+ #elif defined(AIX_MNT)
+ 	return CDS_NO_INFO;
++#elif defined(BSD_MNT)
++	struct ioc_toc_header header;
++	struct ioc_read_toc_entry entry;
++	int type;
++
++	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
++	if (*fd < 0) {
++	    return CDS_DATA_1;
++	}
++
++	if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) {
++	    return CDS_DATA_1;
++	}
++
++	type = CDS_DATA_1;
++	for (entry.starting_track = header.starting_track;
++		entry.starting_track <= header.ending_track;
++		entry.starting_track++) {
++	    entry.address_format = CD_LBA_FORMAT;
++#ifdef __FreeBSD__
++	    if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
++#else
++	    if (ioctl (*fd, CDIOREADTOCENTRYS, &entry) == 0) {
++#endif
++		if (entry.data->control & CDROM_DATA_TRACK) {
++		    type = CDS_AUDIO;
++		    break;
++		}
++	    }
++	}
++
++	return type;
+ #else
+ 	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
+ 	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
+@@ -2160,7 +2254,7 @@
+ 	for (node = volume_list; node != NULL; node = node->next) {
+ 		volume = node->data;
+ 		
+-#if !defined(SOLARIS_MNT) && !defined(AIX_MNT)
++#if !defined(SOLARIS_MNT) && !defined(AIX_MNT) && !defined(BSD_MNT)
+ 		/* These are set up by get_current_mount_list for Solaris&AIX.*/
+ 		volume->is_removable = volume_is_removable (volume);
+ #endif
+@@ -2189,7 +2283,7 @@
+ 		ok = mount_volume_auto_add (volume);
+ 	} else if (strcmp (file_system_type_name, "cdda") == 0) {
+ 		ok = mount_volume_cdda_add (volume);
+-	} else if (strcmp (file_system_type_name, "iso9660") == 0) {
++	} else if (strcmp (file_system_type_name, "cd9660") == 0) {
+ 		ok = mount_volume_iso9660_add (volume);
+ 	} else if (strcmp (file_system_type_name, "nfs") == 0) {
+ 		ok = mount_volume_nfs_add (volume);
+@@ -2224,9 +2318,18 @@
+ 	} else if (eel_str_has_prefix (volume->device_path, "/dev/floppy")) { 
+                 volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
+                 volume->is_removable = TRUE;
++	} else if (eel_str_has_prefix (volume->device_path, "/dev/fd")) {
++		volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
++		volume->is_removable = TRUE;
+ 	} else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) {
+                 volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
+                 volume->is_removable = TRUE;
++	} else if (eel_str_has_prefix (volume->device_path, "/dev/acd")) {
++		volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
++		volume->is_removable = TRUE;
++	} else if (eel_str_has_prefix (volume->device_path, "/dev/cd")) {
++		volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
++		volume->is_removable = TRUE;
+ 	} else if (eel_str_has_prefix (volume->mount_path, "/mnt/")) {		
+ 		name = volume->mount_path + strlen ("/mnt/");
+ 		
+@@ -2287,6 +2390,35 @@
+ 			} else {
+ 				volume->is_removable = FALSE;
+ 			}
++	} else if (eel_str_has_prefix (volume->mount_path, "/")) {		
++		name = volume->mount_path + strlen ("/");
++		
++		if (eel_str_has_prefix (name, "cdrom")
++				|| eel_str_has_prefix (name, "burn")) {
++			volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
++			volume->is_removable = TRUE;
++		} else if (eel_str_has_prefix (name, "floppy")) {
++			volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
++				volume->is_removable = TRUE;
++		} else if (eel_str_has_prefix (name, "zip")) {
++			volume->device_type = NAUTILUS_DEVICE_ZIP_DRIVE;
++			volume->is_removable = TRUE;
++		} else if (eel_str_has_prefix (name, "jaz")) {
++			volume->device_type = NAUTILUS_DEVICE_JAZ_DRIVE;
++			volume->is_removable = TRUE;
++		} else if (eel_str_has_prefix (name, "camera")) {
++			volume->device_type = NAUTILUS_DEVICE_CAMERA;
++			volume->is_removable = TRUE;
++		} else if (eel_str_has_prefix (name, "memstick")
++				|| eel_str_has_prefix (name, "ram")) {
++			volume->device_type = NAUTILUS_DEVICE_MEMORY_STICK;
++			volume->is_removable = TRUE;
++		} else if (eel_str_has_prefix (name, "ipod")) {
++			volume->device_type = NAUTILUS_DEVICE_APPLE;
++			volume->is_removable = TRUE;
++		} else {
++			volume->is_removable = FALSE;
++		}
+ 		}
+ 
+ 	return TRUE;