netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=03af127cf5ef2b130459130ae926196e64e332ff
commit 03af127cf5ef2b130459130ae926196e64e332ff Author: Alastair Poole <[email protected]> Date: Wed Dec 2 14:33:34 2020 +0000 disks: remove this. That stuff wasn't very nice. Make this filesystem stuff better if needed. --- src/bin/system/disks.c | 220 ------------------------------------------- src/bin/system/disks.h | 12 --- src/bin/system/filesystems.c | 156 ++---------------------------- src/bin/system/filesystems.h | 10 -- src/bin/system/meson.build | 2 - 5 files changed, 8 insertions(+), 392 deletions(-) diff --git a/src/bin/system/disks.c b/src/bin/system/disks.c deleted file mode 100644 index e278211..0000000 --- a/src/bin/system/disks.c +++ /dev/null @@ -1,220 +0,0 @@ -#define _DEFAULT_SOURCE - -#include "disks.h" -#include <Ecore.h> -#include <Ecore_File.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#if defined(__linux__) - #include <sys/vfs.h> -#endif - -#if defined(__APPLE__) && defined(__MACH__) -# define __MacOS__ -#endif - -#if defined (__MacOS__) || defined(__FreeBSD__) || defined(__DragonFly__) -# include <sys/types.h> -# include <sys/sysctl.h> -# include <sys/param.h> -# include <sys/ucred.h> -# include <sys/mount.h> -#endif - -#if defined(__OpenBSD__) || defined(__NetBSD__) -# include <sys/param.h> -# include <sys/sysctl.h> -# include <sys/mount.h> -#endif - -char * -disk_mount_point_get(const char *path) -{ -#if defined(__MacOS__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) - struct statfs *mounts; - int i, count; - - count = getmntinfo(&mounts, MNT_WAIT); - for (i = 0; i < count; i++) - { - if (!strcmp(path, mounts[i].f_mntfromname)) - { - return strdup(mounts[i].f_mntonname); - } - } -#elif defined(__linux__) - char buf[4096]; - char *start, *end; - FILE *f = fopen("/proc/mounts", "r"); - - if (!f) - return NULL; - - while ((fgets(buf, sizeof(buf), f)) != NULL) - { - start = &buf[0]; - end = strchr(start, ' '); - if (!end) continue; - *end = '\0'; - - if (!strcmp(path, start)) - { - start = end + 1; - if (!start) continue; - end = strchr(start, ' '); - if (!end) continue; - *end = '\0'; - fclose(f); - return strdup(start); - } - } - - fclose(f); -#endif - return NULL; -} - -static int -_cmp_cb(const void *p1, const void *p2) -{ - const char *s1, *s2; - - s1 = p1; s2 = p2; - - return strcmp(s1, s2); -} - -Eina_List * -disks_get(void) -{ - Eina_List *list = NULL; -#if defined(__FreeBSD__) || defined(__DragonFly__) - struct statfs *mounts; - char *drives, *dev, *end; - int count; - size_t len; - - if ((sysctlbyname("kern.disks", NULL, &len, NULL, 0)) == -1) - return NULL; - - drives = malloc(len + 1); - - if ((sysctlbyname("kern.disks", drives, &len, NULL, 0)) == -1) - { - free(drives); - return NULL; - } - - dev = drives; - while (dev) - { - end = strchr(dev, ' '); - if (!end) - break; - *end = '\0'; - - list = eina_list_append(list, strdup(eina_slstr_printf("/dev/%s", dev))); - - dev = end + 1; - } - - free(drives); - - count = getmntinfo(&mounts, MNT_WAIT); - for (int i = 0; i < count; i++) - { - list = eina_list_append(list, strdup(mounts[i].f_mntfromname)); - } -#elif defined(__OpenBSD__) || defined(__NetBSD__) - static const int mib[] = { CTL_HW, HW_DISKNAMES }; - static const unsigned int miblen = 2; - struct statfs *mounts; - char *drives, *dev, *end; - size_t len; - int count; - - if ((sysctl(mib, miblen, NULL, &len, NULL, 0)) == -1) - return NULL; - - drives = malloc(len + 1); - - if ((sysctl(mib, miblen, drives, &len, NULL, 0)) == -1) - { - free(drives); - return NULL; - } - - dev = drives; - while (dev) - { - end = strchr(dev, ':'); - if (!end) break; - - *end = '\0'; - - if (dev[0] == ',') - dev++; - - list = eina_list_append(list, strdup(eina_slstr_printf("/dev/%s", dev))); - - end++; - dev = strchr(end, ','); - if (!dev) break; - } - - free(drives); - - count = getmntinfo(&mounts, MNT_WAIT); - for (int i = 0; i < count; i++) - { - list = eina_list_append(list, strdup(mounts[i].f_mntfromname)); - } -#elif defined(__MacOS__) - Eina_List *devs; - char *name; - - devs = ecore_file_ls("/dev"); - EINA_LIST_FREE(devs, name) - { - if (!strncmp(name, "disk", 4)) - { - list = eina_list_append(list, strdup(eina_slstr_printf("/dev/%s", name))); - } - free(name); - } -#elif defined(__linux__) - Eina_List *devs; - char *name; - const char *disk_search = "/dev/disk/by-uuid"; - - devs = ecore_file_ls(disk_search); - if (!devs) - { - disk_search = "/dev/disk/by-path"; - devs = ecore_file_ls(disk_search); - } - - EINA_LIST_FREE(devs, name) - { - char *real = realpath(eina_slstr_printf("%s/%s", disk_search, name), NULL); - if (real) - { - list = eina_list_append(list, real); - } - free(name); - } - - devs = ecore_file_ls("/dev/mapper"); - EINA_LIST_FREE(devs, name) - { - list = eina_list_append(list, strdup(eina_slstr_printf("/dev/mapper/%s", name))); - free(name); - } -#endif - - return eina_list_sort(list, eina_list_count(list), _cmp_cb); -} - diff --git a/src/bin/system/disks.h b/src/bin/system/disks.h deleted file mode 100644 index 0a8ff05..0000000 --- a/src/bin/system/disks.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __DISKS_H__ -#define __DISKS_H__ - -#include "filesystems.h" - -char * -disk_mount_point_get(const char *path); - -Eina_List * -disks_get(void); - -#endif diff --git a/src/bin/system/filesystems.c b/src/bin/system/filesystems.c index dcf12b9..e350e6d 100644 --- a/src/bin/system/filesystems.c +++ b/src/bin/system/filesystems.c @@ -28,108 +28,6 @@ # include <sys/mount.h> #endif -typedef struct { - unsigned int magic; - const char *name; -} _magic; - -/* These values are reliable though some variants may be ambiguous. We use - * these superblock constants to detect unusual file systems such as ZFS. - */ -static _magic _magique[] = { - { .magic = 0xdf5, .name = "adfs" }, - { .magic = 0xadff, .name = "affs" }, - { .magic = 0x5346414f, .name = "afs" }, - { .magic = 0x0187, .name = "autofs" }, - { .magic = 0x73757245, .name = "coda" }, - { .magic = 0x28cd3d45, .name = "cramfs" }, - { .magic = 0x453dcd28, .name = "cramfs" }, - { .magic = 0x64626720, .name = "debugfs" }, - { .magic = 0x73636673, .name = "securityfs" }, - { .magic = 0xf97cff8c, .name = "selinux" }, - { .magic = 0x43415d53, .name = "smac" }, - { .magic = 0x858458f6, .name = "ramfs" }, - { .magic = 0x01021994, .name = "tmpfs" }, - { .magic = 0x958458f6, .name = "hugetlbfs" }, - { .magic = 0x73717368, .name = "squashfs" }, - { .magic = 0xf15f, .name = "ecryptfs" }, - { .magic = 0x414a53, .name = "efs" }, - { .magic = 0xe0f5e1e2, .name = "erofs" }, - { .magic = 0xef53, .name = "ext2/3/4" }, - { .magic = 0xef53, .name = "ext2/3/4" }, - { .magic = 0xef53, .name = "ext2/3/4" }, - { .magic = 0xabba1974, .name = "xenfs" }, - { .magic = 0x9123683e, .name = "btrfs" }, - { .magic = 0x3434, .name = "nilfs" }, - { .magic = 0xf2f52010, .name = "f2fs" }, - { .magic = 0xf995e849, .name = "hpfs" }, - { .magic = 0x9660, .name = "isofs" }, - { .magic = 0x72b6, .name = "jffs2" }, - { .magic = 0x58465342, .name = "xfs" }, - { .magic = 0x6165676c, .name = "pstorefs" }, - { .magic = 0xde5e81e4, .name = "efivarfs" }, - { .magic = 0x00c0ffee, .name = "hostfs" }, - { .magic = 0x794c7630, .name = "overlayfs" }, - { .magic = 0x137f, .name = "minix" }, - { .magic = 0x138f, .name = "minix" }, - { .magic = 0x2468, .name = "minix2" }, - { .magic = 0x2478, .name = "minix2" }, - { .magic = 0x4d5a, .name = "minix3" }, - { .magic = 0x4d44, .name = "msdos" }, - { .magic = 0x564c, .name = "ncp" }, - { .magic = 0x6969, .name = "nfs" }, - { .magic = 0x7461636f, .name = "ocfs2" }, - { .magic = 0x9fa1, .name = "openprom" }, - { .magic = 0x002f, .name = "qnx4" }, - { .magic = 0x68191122, .name = "qnx6" }, - { .magic = 0x6b414653, .name = "afs fs" }, - { .magic = 0x52654973, .name = "reiserfs" }, - { .magic = 0x517b, .name = "smb" }, - { .magic = 0x27e0eb, .name = "cgroup" }, - { .magic = 0x63677270, .name = "cgroup2" }, - { .magic = 0x7655821, .name = "rdtgroup" }, - { .magic = 0x74726163, .name = "tracefs" }, - { .magic = 0x01021997, .name = "v9fs" }, - { .magic = 0x62646576, .name = "bdevfs" }, - { .magic = 0x64646178, .name = "daxfs" }, - { .magic = 0x42494e4d, .name = "binfmtfs" }, - { .magic = 0x1cd1, .name = "devpts" }, - { .magic = 0x6c6f6f70, .name = "binderfs" }, - { .magic = 0x50495045, .name = "pipefs" }, - { .magic = 0x62656572, .name = "sysfs" }, - { .magic = 0x6e736673, .name = "nsfs" }, - { .magic = 0xcafe4a11, .name = "bpf fs" }, - { .magic = 0x5a3c69f0, .name = "aafs" }, - { .magic = 0x5a4f4653, .name = "zonefs" }, - { .magic = 0x15013346, .name = "udf" }, - { .magic = 0x2fc12fc1, .name = "zfs" }, - { .magic = 0x482b, .name = "hfsplus" }, -}; - -unsigned int -file_system_id_by_name(const char *name) -{ - size_t n = sizeof(_magique) / sizeof(_magic); - for (int i = 0; i < n; i++) - { - if (!strcasecmp(name, _magique[i].name)) - return _magique[i].magic; - } - return 0; -} - -const char * -file_system_name_by_id(unsigned int id) -{ - size_t n = sizeof(_magique) / sizeof(_magic); - for (int i = 0; i < n; i++) - { - if (_magique[i].magic == id) - return _magique[i].name; - } - return NULL; -} - #if defined(__linux__) static char * file_system_type_name(const char *mountpoint) @@ -234,40 +132,6 @@ file_system_info_all_get(void) return list; } -File_System * -file_system_info_get(const char *path) -{ - File_System *fs; - char *mountpoint; - struct statfs stats; - - mountpoint = disk_mount_point_get(path); - if (!mountpoint) return NULL; - - if (statfs(mountpoint, &stats) < 0) - return NULL; - - fs = calloc(1, sizeof(File_System)); - fs->mount = mountpoint; - fs->path = strdup(path); - -#if defined(__OpenBSD__) -#else - fs->type = stats.f_type; -#endif - -#if defined(__linux__) - fs->type_name = file_system_type_name(fs->mount); -#else - fs->type_name = strdup(stats.f_fstypename); -#endif - - fs->usage.total = stats.f_bsize * stats.f_blocks; - fs->usage.used = fs->usage.total - (stats.f_bsize * stats.f_bfree); - - return fs; -} - void file_system_info_free(File_System *fs) { @@ -281,23 +145,19 @@ file_system_info_free(File_System *fs) Eina_Bool file_system_in_use(const char *name) { - Eina_List *disks; - char *path; + Eina_List *list; + File_System *fs; Eina_Bool mounted = EINA_FALSE; + if (!name) return EINA_FALSE; - disks = disks_get(); - EINA_LIST_FREE(disks, path) + list = file_system_info_all_get(); + EINA_LIST_FREE(list, fs) { - File_System *fs = file_system_info_get(path); - if (fs) - { - if (fs->type == file_system_id_by_name(name)) - mounted = EINA_TRUE; + if (fs->type_name && (!strcasecmp(fs->type_name, name))) + mounted = EINA_TRUE; - file_system_info_free(fs); - } - free(path); + file_system_info_free(fs); } return mounted; diff --git a/src/bin/system/filesystems.h b/src/bin/system/filesystems.h index 056206a..897c10b 100644 --- a/src/bin/system/filesystems.h +++ b/src/bin/system/filesystems.h @@ -2,7 +2,6 @@ #define __FILESYSTEMS_H__ #include <Eina.h> -#include "disks.h" typedef struct { unsigned long long total; @@ -17,18 +16,9 @@ typedef struct _File_System { _Usage usage; } File_System; -const char * -file_system_name_by_id(unsigned int id); - -unsigned int -file_system_id_by_name(const char *name); - Eina_List * file_system_info_all_get(void); -File_System * -file_system_info_get(const char *path); - void file_system_info_free(File_System *fs); diff --git a/src/bin/system/meson.build b/src/bin/system/meson.build index 2312185..1f15b04 100644 --- a/src/bin/system/meson.build +++ b/src/bin/system/meson.build @@ -1,6 +1,4 @@ src += files([ - 'disks.c', - 'disks.h', 'process.c', 'process.h', 'machine.c', --
