i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10572 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2005-01-03 15:27:18 +00:00
parent 4e876d126e
commit a565beb2d9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/dos/dosfs.h
+1 -1
View File
@@ -158,7 +158,7 @@ typedef struct _nspace
int fs_flags; // flags for this mount int fs_flags; // flags for this mount
lock vlock; lock vlock; // volume lock
// vcache state // vcache state
struct { struct {
src/add-ons/kernel/file_systems/dos/file.c
+8 -5
View File
@@ -278,6 +278,7 @@ int dosfs_open(void *_vol, void *_node, int omode, void **_cookie)
(node->mode & FAT_READ_ONLY) || (node->mode & FAT_READ_ONLY) ||
(node->disk_image != 0) || (node->disk_image != 0) ||
// allow opening directories for ioctl() calls // allow opening directories for ioctl() calls
// and to let BVolume to work
(node->mode & FAT_SUBDIR)) { (node->mode & FAT_SUBDIR)) {
omode = (omode & ~O_RWMASK) | O_RDONLY; 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") || if (check_nspace_magic((nspace *)vol, "dosfs_read") ||
check_vnode_magic(node, "dosfs_read") || check_vnode_magic(node, "dosfs_read") ||
check_filecookie_magic(cookie, "dosfs_read")) { check_filecookie_magic(cookie, "dosfs_read")) {
*len = 0;
UNLOCK_VOL(vol); UNLOCK_VOL(vol);
return EINVAL; return EINVAL;
} }
if (node->mode & FAT_SUBDIR) { if (node->mode & FAT_SUBDIR) {
DPRINTF(0, ("dosfs_read called on subdirectory %Lx\n", node->vnid)); DPRINTF(0, ("dosfs_read called on subdirectory %Lx\n", node->vnid));
*len = 0;
UNLOCK_VOL(vol); UNLOCK_VOL(vol);
return EISDIR; return EISDIR;
} }
@@ -1205,12 +1208,12 @@ int dosfs_rename(void *_vol, void *_odir, const char *oldname,
if (file->filename) strcpy(file->filename, newname); if (file->filename) strcpy(file->filename, newname);
#endif #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_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; result = 0;