From a565beb2d909fef2c0f15fb945e332a55ec3e468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 3 Jan 2005 15:27:18 +0000
Subject: [PATCH] report error correctly (*len = 0) when read()ing a dir; some
 comments; don't tell BEOS:TYPE changed for folders since they don't have it.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10572 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/file_systems/dos/dosfs.h |  2 +-
 src/add-ons/kernel/file_systems/dos/file.c  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/dos/dosfs.h b/src/add-ons/kernel/file_systems/dos/dosfs.h
index 5def75b212..8dcba9b644 100644
--- a/src/add-ons/kernel/file_systems/dos/dosfs.h
+++ b/src/add-ons/kernel/file_systems/dos/dosfs.h
@@ -158,7 +158,7 @@ typedef struct _nspace
 
 	int		fs_flags;				// flags for this mount
 
-	lock	vlock;
+	lock	vlock;					// volume lock
 
 	// vcache state
 	struct {
diff --git a/src/add-ons/kernel/file_systems/dos/file.c b/src/add-ons/kernel/file_systems/dos/file.c
index b86821633e..f25b967d53 100644
--- a/src/add-ons/kernel/file_systems/dos/file.c
+++ b/src/add-ons/kernel/file_systems/dos/file.c
@@ -278,6 +278,7 @@ int dosfs_open(void *_vol, void *_node, int omode, void **_cookie)
 		(node->mode & FAT_READ_ONLY) ||
 		(node->disk_image != 0) ||
 		// allow opening directories for ioctl() calls
+		// and to let BVolume to work
 		(node->mode & FAT_SUBDIR)) {
 		omode = (omode & ~O_RWMASK) | O_RDONLY;
 	}
@@ -337,12 +338,14 @@ int dosfs_read(void *_vol, void *_node, void *_cookie, off_t pos,
 	if (check_nspace_magic((nspace *)vol, "dosfs_read") ||
 		check_vnode_magic(node, "dosfs_read") ||
 		check_filecookie_magic(cookie, "dosfs_read")) {
+		*len = 0;
 		UNLOCK_VOL(vol);
 		return EINVAL;
 	}
 
 	if (node->mode & FAT_SUBDIR) {
 		DPRINTF(0, ("dosfs_read called on subdirectory %Lx\n", node->vnid));
+		*len = 0;
 		UNLOCK_VOL(vol);
 		return EISDIR;
 	}
@@ -1205,12 +1208,12 @@ int dosfs_rename(void *_vol, void *_odir, const char *oldname,
 	if (file->filename) strcpy(file->filename, newname);
 #endif
 
-	// update MIME information
-	if(!(file->mode & FAT_SUBDIR))
-		set_mime_type(file, newname);
-
 	notify_listener(B_ENTRY_MOVED, vol->id, odir->vnid, ndir->vnid, file->vnid, newname);
-	notify_listener(B_ATTR_CHANGED, vol->id, 0, 0, file->vnid, "BEOS:TYPE");
+	// update MIME information
+	if(!(file->mode & FAT_SUBDIR)) {
+		set_mime_type(file, newname);
+		notify_listener(B_ATTR_CHANGED, vol->id, 0, 0, file->vnid, "BEOS:TYPE");
+	}
 
 	result = 0;