diff --git a/src/detection/disk/disk_bsd.c b/src/detection/disk/disk_bsd.c index 04168484b..b6c656e8b 100644 --- a/src/detection/disk/disk_bsd.c +++ b/src/detection/disk/disk_bsd.c @@ -56,7 +56,7 @@ const char* ffDetectDisksImpl(FFlist* disks) ffStrbufInitS(&disk->filesystem, fs->f_fstypename); detectFsInfo(fs, disk); - if(fs->f_flags & MNT_EXRDONLY) + if(fs->f_flags & MNT_RDONLY) disk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT; } diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 7d8460163..202d8e1a8 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -79,12 +79,22 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk) if(disk->filesystem.length) ffStrbufAppendF(&str, "- %s ", disk->filesystem.chars); + ffStrbufAppendC(&str, '['); if(disk->type & FF_DISK_VOLUME_TYPE_EXTERNAL_BIT) - ffStrbufAppendS(&str, "[External]"); - else if(disk->type & FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT) - ffStrbufAppendS(&str, "[Subvolume]"); - else if(disk->type & FF_DISK_VOLUME_TYPE_HIDDEN_BIT) - ffStrbufAppendS(&str, "[Hidden]"); + ffStrbufAppendS(&str, "External, "); + if(disk->type & FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT) + ffStrbufAppendS(&str, "Subvolume, "); + if(disk->type & FF_DISK_VOLUME_TYPE_HIDDEN_BIT) + ffStrbufAppendS(&str, "Hidden, "); + if(disk->type & FF_DISK_VOLUME_TYPE_READONLY_BIT) + ffStrbufAppendS(&str, "Read-only, "); + if (str.chars[str.length - 1] == '[') + ffStrbufSubstrBefore(&str, str.length - 1); + else + { + ffStrbufTrimRight(&str, ' '); + str.chars[str.length - 1] = ']'; + } } ffStrbufTrimRight(&str, ' ');