archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5: File Browser on Unix

Browse Source 
* Attempt to better filter file systems, it displayed all kinds
  of devices which are not interesting to the user. The trick
  used is now to use mounts starting with "/dev".
* Add / at the end to properly highlight directories in the list.
* Fix for non-linux unixes, this now falls back to showing / again.
This commit is contained in:
Brecht Van Lommel
2009-07-29 21:35:03 +00:00
parent 992382ddb3
commit 80015c8867
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/editors/space_file/fsmenu.c
View File

@@ -307,8 +307,6 @@ void fsmenu_read_file(struct FSMenu* fsmenu, const char *filename)
char dir[FILE_MAXDIR]; char dir[FILE_MAXDIR];
char *home= BLI_gethome(); char *home= BLI_gethome();
// fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, "/", 1, 0);
if(home) { if(home) {
BLI_snprintf(dir, FILE_MAXDIR, "%s/", home); BLI_snprintf(dir, FILE_MAXDIR, "%s/", home);
fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, dir, 1, 0); fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, dir, 1, 0);
@@ -317,30 +315,42 @@ void fsmenu_read_file(struct FSMenu* fsmenu, const char *filename)
} }
{ {
int found= 0;
#ifdef __linux__
/* loop over mount points */ /* loop over mount points */
struct mntent *mnt; struct mntent *mnt;
FILE *fp; FILE *fp;
int len;
fp = setmntent (MOUNTED, "r"); fp = setmntent (MOUNTED, "r");
if (fp == NULL) { if (fp == NULL) {
fprintf(stderr, "could not get a list of mounted filesystemts\n"); fprintf(stderr, "could not get a list of mounted filesystemts\n");
} }
else { else {
while ((mnt = getmntent (fp))) { while ((mnt = getmntent (fp))) {
/* printf("%s %s %s %s %s %s\n", mnt->mnt_fsname, mnt->mnt_dir, mnt->mnt_type, mnt->mnt_opts, mnt->mnt_freq, mnt->mnt_passno); */ /* not sure if this is right, but seems to give the relevant mnts */
if(strncmp(mnt->mnt_fsname, "/dev", 4))
/* probably need to add more here */
if( (strcmp (mnt->mnt_fsname, "none")==0) || /* /sys, /dev/pts */
(strcmp (mnt->mnt_type, "ramfs")==0) /* /dev */
) {
continue; continue;
}
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, mnt->mnt_dir, 1, 0); len= strlen(mnt->mnt_dir);
if(len && mnt->mnt_dir[len-1] != '/') {
BLI_snprintf(dir, FILE_MAXDIR, "%s/", mnt->mnt_dir);
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, dir, 1, 0);
}
else
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, mnt->mnt_dir, 1, 0);
found= 1;
} }
if (endmntent (fp) == 0) { if (endmntent (fp) == 0) {
fprintf(stderr, "could not close the list of mounted filesystemts\n"); fprintf(stderr, "could not close the list of mounted filesystemts\n");
} }
} }
#endif
/* fallback */
if(!found)
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, "/", 1, 0);
} }
} }
#endif #endif