gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 05:32:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Try to support volume information on Linux better as well as using GSRemovableMediaPaths defaults for removable information (compared to nothing at all).

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39363 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2016-02-12 12:09:23 +00:00
parent 14fab35abc
commit 7d7cf59383
2 changed files with 65 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2016-02-12 Riccardo Mottola <rm@gnu.org>
* Source/NSWorkspace.m
Try to support volume information on Linux better as well as using GSRemovableMediaPaths defaults for removable information (compared to nothing at all).
2016-02-03 Riccardo Mottola <rm@gnu.org>
* Headers/AppKit/NSImage.h

66
Source/NSWorkspace.m
View file

@ -2,7 +2,7 @@
<abstract>Workspace class</abstract>
Copyright (C) 1996-2010 Free Software Foundation, Inc.
Copyright (C) 1996-2016 Free Software Foundation, Inc.
Author: Scott Christley <scottc@net-community.com>
Date: 1996
@ -47,6 +47,16 @@
#endif
#endif
#if defined (HAVE_SYS_STATVFS_H)
#include <sys/statvfs.h>
#endif
#if defined (HAVE_SYS_VFS_H)
#include <sys/vfs.h>
#ifdef __linux__
#include <linux/magic.h>
#endif
#endif
#import <Foundation/NSBundle.h>
#import <Foundation/NSData.h>
#import <Foundation/NSDictionary.h>
@ -1149,9 +1159,16 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
description: (NSString **)description
type: (NSString **)fileSystemType
{
#if defined (HAVE_GETMNTINFO)
/* FIXME Check for presence of statfs call explicitly. Not all systems
with getmntinfo do have a statfs calls. In particular, NetBSD offers
NSArray *removables;
/* since we might not be able to get information about removable volumes
we use the information from the preferences which can be set in Systempreferences
*/
removables = [[[NSUserDefaults standardUserDefaults] persistentDomainForName: NSGlobalDomain] objectForKey: @"GSRemovableMediaPaths"];
#if defined (HAVE_SYS_STATVFS_H) || defined (HAVE_SYS_VFS_H)
/* FIXME Check for presence of statfs call explicitly.
In particular, NetBSD offers
only a statvfs calls for compatibility with POSIX. Other BSDs and
Linuxes have statvfs as well, but this returns less information than
the 4.4BSD statfs call. The NetBSD statvfs, on the other hand, is just
@ -1180,15 +1197,51 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
uid = geteuid();
enc = [NSString defaultCStringEncoding];
*removableFlag = NO; // FIXME
*writableFlag = (m.f_flags & MNT_RDONLY) == 0;
if ([removables containsObject: fullPath])
*removableFlag = YES;
*writableFlag = (m.f_flags & ST_RDONLY) == 0;
*unmountableFlag = NO;
#if defined(ST_ROOTFS) // new NetBSD, Linux
*unmountableFlag =
(m.f_flag & ST_ROOTFS) == 0 && (uid == 0 || uid == m.f_owner);
#elsif defined (MNT_ROOTFS)
*unmountableFlag =
(m.f_flags & MNT_ROOTFS) == 0 && (uid == 0 || uid == m.f_owner);
#endif
*description = @"filesystem"; // FIXME
#if defined (__linux__)
if (m.f_type == EXT2_SUPER_MAGIC)
*fileSystemType = @"EXT2";
else if (m.f_type == EXT3_SUPER_MAGIC)
*fileSystemType = @"EXT3";
else if (m.f_type == EXT4_SUPER_MAGIC)
*fileSystemType = @"EXT4";
else if (m.f_type == ISOFS_SUPER_MAGIC)
*fileSystemType = @"ISO9660";
#ifdef JFS_SUPER_MAGIC
else if (m.f_type == JFS_SUPER_MAGIC)
*fileSystemType = @"JFS";
#endif
else if (m.f_type == MSDOS_SUPER_MAGIC)
*fileSystemType = @"MSDOS";
else if (m.f_type == NFS_SUPER_MAGIC)
*fileSystemType = @"NFS";
else
*fileSystemType = @"Other";
#else
*fileSystemType =
[[NSString alloc] initWithCString: m.f_fstypename encoding: enc];
#endif
return YES;
#else
NSLog(@"getFileSystemInfoForPath not supported on your OS");
if ([removables containsObject: fullPath])
*removableFlag = YES;
// FIXME
return NO;
#endif
@ -1971,7 +2024,8 @@ launchIdentifiers: (NSArray **)identifiers
}
}
}
#endif
#endif
return names;
}