Skip to content

File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamsitnik merged 6 commits into from
May 26, 2022
Merged

File system type fix #69484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1090899
disregard the upper bytes, fixes #61175
adamsitnik May 18, 2022
ca72260
add assert to verify the values
adamsitnik May 18, 2022
cb3017e
address code review feedback: use uint32
adamsitnik May 18, 2022
2b81420
add apple file system (apfs) to the magic numbers list (idenitified b…
adamsitnik May 18, 2022
0771bd5
Apply suggestions from code review
adamsitnik May 26, 2022
9dbfac1
Apply suggestions from code review
adamsitnik May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
/// where this enum must be a subset of the GetDriveType list, with the enum
/// values here exactly matching a string there.
/// </remarks>
internal enum UnixFileSystemTypes : long
internal enum UnixFileSystemTypes : uint
{
adfs = 0xADF5,
affs = 0xADFF,
afs = 0x5346414F,
anoninode = 0x09041934,
apfs = 0x1A,
aufs = 0x61756673,
autofs = 0x0187,
autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
}

[LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
private static partial long GetFileSystemType(SafeFileHandle fd);
private static partial uint GetFileSystemType(SafeFileHandle fd);

internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
{
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
fileSystemType = (UnixFileSystemTypes)fstatfsResult;
return fstatfsResult != -1;
Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
return fstatfsResult != 0;
}
}
}
16 changes: 11 additions & 5 deletions src/native/libs/System.Native/pal_io.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
}
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
int statfsRes;
struct statfs statfsArgs;
// for our needs (get file system type) statfs is always enough and there is no need to use statfs64
// which got deprecated in macOS 10.6, in favor of statfs
while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
if (statfsRes == -1) return 0;

// On Linux, f_type is signed. This causes some filesystem types to be represented as
// negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
uint32_t result = (uint32_t)statfsArgs.f_type;
return result;
#elif !HAVE_NON_LEGACY_STATFS
int statfsRes;
struct statvfs statfsArgs;
while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
if (statfsRes == -1) return (int64_t)-1;
if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

assert(result != -1);
assert(result != 0);
return result;
#else
#error "Platform doesn't support fstatfs or fstatvfs"
Expand Down
4 changes: 2 additions & 2 deletions src/native/libs/System.Native/pal_io.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
File system type fix by adamsitnik · Pull Request #69484 · dotnet/runtime · GitHub
Skip to content
File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

adamsitnik
merged 6 commits into

from

May 26, 2022
 Merged


File system type fix
#69484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1090899

disregard the upper bytes, fixes #61175


adamsitnik May 18, 2022
ca72260

add assert to verify the values


adamsitnik May 18, 2022
cb3017e

address code review feedback: use uint32


adamsitnik May 18, 2022
2b81420

add apple file system (apfs) to the magic numbers list (idenitified b…


adamsitnik May 18, 2022
0771bd5

Apply suggestions from code review


adamsitnik May 26, 2022
9dbfac1

Apply suggestions from code review


adamsitnik May 26, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
 /// where this enum must be a subset of the GetDriveType list, with the enum
 /// values here exactly matching a string there.
 /// </remarks>
 internal enum UnixFileSystemTypes : long
 internal enum UnixFileSystemTypes : uint
 {
 adfs = 0xADF5,
 affs = 0xADFF,
 afs = 0x5346414F,
 anoninode = 0x09041934,
 apfs = 0x1A,
 aufs = 0x61756673,
 autofs = 0x0187,
 autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
 }

 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
 private static partial long GetFileSystemType(SafeFileHandle fd);
 private static partial uint GetFileSystemType(SafeFileHandle fd);

 internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
 {
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
 fileSystemType = (UnixFileSystemTypes)fstatfsResult;
 return fstatfsResult != -1;
 Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
 return fstatfsResult != 0;
 }
 }
}

16 changes: 11 additions & 5 deletions
src/native/libs/System.Native/pal_io.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
 }
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
 int statfsRes;
 struct statfs statfsArgs;
 // for our needs (get file system type) statfs is always enough and there is no need to use statfs64
 // which got deprecated in macOS 10.6, in favor of statfs
 while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
 if (statfsRes == -1) return 0;

 // On Linux, f_type is signed. This causes some filesystem types to be represented as
 // negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
 uint32_t result = (uint32_t)statfsArgs.f_type;
 return result;
#elif !HAVE_NON_LEGACY_STATFS
 int statfsRes;
 struct statvfs statfsArgs;
 while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 if (statfsRes == -1) return (int64_t)-1;
 if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

 if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
 else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
 else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
 else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
 else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
 else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
 else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
 else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
 else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
 else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

 assert(result != -1);
 assert(result != 0);
 return result;
#else
 #error "Platform doesn't support fstatfs or fstatvfs"
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_io.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
File system type fix by adamsitnik · Pull Request #69484 · dotnet/runtime · GitHub
Skip to content
File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

adamsitnik
merged 6 commits into

from

May 26, 2022
 Merged


File system type fix
#69484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1090899

disregard the upper bytes, fixes #61175


adamsitnik May 18, 2022
ca72260

add assert to verify the values


adamsitnik May 18, 2022
cb3017e

address code review feedback: use uint32


adamsitnik May 18, 2022
2b81420

add apple file system (apfs) to the magic numbers list (idenitified b…


adamsitnik May 18, 2022
0771bd5

Apply suggestions from code review


adamsitnik May 26, 2022
9dbfac1

Apply suggestions from code review


adamsitnik May 26, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
 /// where this enum must be a subset of the GetDriveType list, with the enum
 /// values here exactly matching a string there.
 /// </remarks>
 internal enum UnixFileSystemTypes : long
 internal enum UnixFileSystemTypes : uint
 {
 adfs = 0xADF5,
 affs = 0xADFF,
 afs = 0x5346414F,
 anoninode = 0x09041934,
 apfs = 0x1A,
 aufs = 0x61756673,
 autofs = 0x0187,
 autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
 }

 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
 private static partial long GetFileSystemType(SafeFileHandle fd);
 private static partial uint GetFileSystemType(SafeFileHandle fd);

 internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
 {
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
 fileSystemType = (UnixFileSystemTypes)fstatfsResult;
 return fstatfsResult != -1;
 Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
 return fstatfsResult != 0;
 }
 }
}

16 changes: 11 additions & 5 deletions
src/native/libs/System.Native/pal_io.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
 }
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
 int statfsRes;
 struct statfs statfsArgs;
 // for our needs (get file system type) statfs is always enough and there is no need to use statfs64
 // which got deprecated in macOS 10.6, in favor of statfs
 while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
 if (statfsRes == -1) return 0;

 // On Linux, f_type is signed. This causes some filesystem types to be represented as
 // negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
 uint32_t result = (uint32_t)statfsArgs.f_type;
 return result;
#elif !HAVE_NON_LEGACY_STATFS
 int statfsRes;
 struct statvfs statfsArgs;
 while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 if (statfsRes == -1) return (int64_t)-1;
 if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

 if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
 else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
 else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
 else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
 else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
 else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
 else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
 else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
 else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
 else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

 assert(result != -1);
 assert(result != 0);
 return result;
#else
 #error "Platform doesn't support fstatfs or fstatvfs"
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_io.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
File system type fix by adamsitnik · Pull Request #69484 · dotnet/runtime · GitHub
Skip to content
File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

adamsitnik
merged 6 commits into

from

May 26, 2022
 Merged


File system type fix
#69484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1090899

disregard the upper bytes, fixes #61175


adamsitnik May 18, 2022
ca72260

add assert to verify the values


adamsitnik May 18, 2022
cb3017e

address code review feedback: use uint32


adamsitnik May 18, 2022
2b81420

add apple file system (apfs) to the magic numbers list (idenitified b…


adamsitnik May 18, 2022
0771bd5

Apply suggestions from code review


adamsitnik May 26, 2022
9dbfac1

Apply suggestions from code review


adamsitnik May 26, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
 /// where this enum must be a subset of the GetDriveType list, with the enum
 /// values here exactly matching a string there.
 /// </remarks>
 internal enum UnixFileSystemTypes : long
 internal enum UnixFileSystemTypes : uint
 {
 adfs = 0xADF5,
 affs = 0xADFF,
 afs = 0x5346414F,
 anoninode = 0x09041934,
 apfs = 0x1A,
 aufs = 0x61756673,
 autofs = 0x0187,
 autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
 }

 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
 private static partial long GetFileSystemType(SafeFileHandle fd);
 private static partial uint GetFileSystemType(SafeFileHandle fd);

 internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
 {
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
 fileSystemType = (UnixFileSystemTypes)fstatfsResult;
 return fstatfsResult != -1;
 Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
 return fstatfsResult != 0;
 }
 }
}

16 changes: 11 additions & 5 deletions
src/native/libs/System.Native/pal_io.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
 }
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
 int statfsRes;
 struct statfs statfsArgs;
 // for our needs (get file system type) statfs is always enough and there is no need to use statfs64
 // which got deprecated in macOS 10.6, in favor of statfs
 while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
 if (statfsRes == -1) return 0;

 // On Linux, f_type is signed. This causes some filesystem types to be represented as
 // negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
 uint32_t result = (uint32_t)statfsArgs.f_type;
 return result;
#elif !HAVE_NON_LEGACY_STATFS
 int statfsRes;
 struct statvfs statfsArgs;
 while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 if (statfsRes == -1) return (int64_t)-1;
 if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

 if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
 else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
 else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
 else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
 else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
 else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
 else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
 else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
 else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
 else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

 assert(result != -1);
 assert(result != 0);
 return result;
#else
 #error "Platform doesn't support fstatfs or fstatvfs"
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_io.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
File system type fix by adamsitnik · Pull Request #69484 · dotnet/runtime · GitHub
Skip to content
File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

adamsitnik
merged 6 commits into

from

May 26, 2022
 Merged


File system type fix
#69484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1090899

disregard the upper bytes, fixes #61175


adamsitnik May 18, 2022
ca72260

add assert to verify the values


adamsitnik May 18, 2022
cb3017e

address code review feedback: use uint32


adamsitnik May 18, 2022
2b81420

add apple file system (apfs) to the magic numbers list (idenitified b…


adamsitnik May 18, 2022
0771bd5

Apply suggestions from code review


adamsitnik May 26, 2022
9dbfac1

Apply suggestions from code review


adamsitnik May 26, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
 /// where this enum must be a subset of the GetDriveType list, with the enum
 /// values here exactly matching a string there.
 /// </remarks>
 internal enum UnixFileSystemTypes : long
 internal enum UnixFileSystemTypes : uint
 {
 adfs = 0xADF5,
 affs = 0xADFF,
 afs = 0x5346414F,
 anoninode = 0x09041934,
 apfs = 0x1A,
 aufs = 0x61756673,
 autofs = 0x0187,
 autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
 }

 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
 private static partial long GetFileSystemType(SafeFileHandle fd);
 private static partial uint GetFileSystemType(SafeFileHandle fd);

 internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
 {
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
 fileSystemType = (UnixFileSystemTypes)fstatfsResult;
 return fstatfsResult != -1;
 Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
 return fstatfsResult != 0;
 }
 }
}

16 changes: 11 additions & 5 deletions
src/native/libs/System.Native/pal_io.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
 }
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
 int statfsRes;
 struct statfs statfsArgs;
 // for our needs (get file system type) statfs is always enough and there is no need to use statfs64
 // which got deprecated in macOS 10.6, in favor of statfs
 while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
 if (statfsRes == -1) return 0;

 // On Linux, f_type is signed. This causes some filesystem types to be represented as
 // negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
 uint32_t result = (uint32_t)statfsArgs.f_type;
 return result;
#elif !HAVE_NON_LEGACY_STATFS
 int statfsRes;
 struct statvfs statfsArgs;
 while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 if (statfsRes == -1) return (int64_t)-1;
 if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

 if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
 else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
 else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
 else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
 else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
 else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
 else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
 else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
 else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
 else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

 assert(result != -1);
 assert(result != 0);
 return result;
#else
 #error "Platform doesn't support fstatfs or fstatvfs"
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_io.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
File system type fix by adamsitnik · Pull Request #69484 · dotnet/runtime · GitHub
Skip to content
File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

adamsitnik
merged 6 commits into

from

May 26, 2022
 Merged


File system type fix
#69484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1090899

disregard the upper bytes, fixes #61175


adamsitnik May 18, 2022
ca72260

add assert to verify the values


adamsitnik May 18, 2022
cb3017e

address code review feedback: use uint32


adamsitnik May 18, 2022
2b81420

add apple file system (apfs) to the magic numbers list (idenitified b…


adamsitnik May 18, 2022
0771bd5

Apply suggestions from code review


adamsitnik May 26, 2022
9dbfac1

Apply suggestions from code review


adamsitnik May 26, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
 /// where this enum must be a subset of the GetDriveType list, with the enum
 /// values here exactly matching a string there.
 /// </remarks>
 internal enum UnixFileSystemTypes : long
 internal enum UnixFileSystemTypes : uint
 {
 adfs = 0xADF5,
 affs = 0xADFF,
 afs = 0x5346414F,
 anoninode = 0x09041934,
 apfs = 0x1A,
 aufs = 0x61756673,
 autofs = 0x0187,
 autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
 }

 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
 private static partial long GetFileSystemType(SafeFileHandle fd);
 private static partial uint GetFileSystemType(SafeFileHandle fd);

 internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
 {
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
 fileSystemType = (UnixFileSystemTypes)fstatfsResult;
 return fstatfsResult != -1;
 Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
 return fstatfsResult != 0;
 }
 }
}

16 changes: 11 additions & 5 deletions
src/native/libs/System.Native/pal_io.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
 }
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
 int statfsRes;
 struct statfs statfsArgs;
 // for our needs (get file system type) statfs is always enough and there is no need to use statfs64
 // which got deprecated in macOS 10.6, in favor of statfs
 while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
 if (statfsRes == -1) return 0;

 // On Linux, f_type is signed. This causes some filesystem types to be represented as
 // negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
 uint32_t result = (uint32_t)statfsArgs.f_type;
 return result;
#elif !HAVE_NON_LEGACY_STATFS
 int statfsRes;
 struct statvfs statfsArgs;
 while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 if (statfsRes == -1) return (int64_t)-1;
 if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

 if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
 else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
 else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
 else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
 else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
 else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
 else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
 else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
 else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
 else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

 assert(result != -1);
 assert(result != 0);
 return result;
#else
 #error "Platform doesn't support fstatfs or fstatvfs"
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_io.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
File system type fix by adamsitnik · Pull Request #69484 · dotnet/runtime · GitHub
Skip to content
File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

adamsitnik
merged 6 commits into

from

May 26, 2022
 Merged


File system type fix
#69484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1090899

disregard the upper bytes, fixes #61175


adamsitnik May 18, 2022
ca72260

add assert to verify the values


adamsitnik May 18, 2022
cb3017e

address code review feedback: use uint32


adamsitnik May 18, 2022
2b81420

add apple file system (apfs) to the magic numbers list (idenitified b…


adamsitnik May 18, 2022
0771bd5

Apply suggestions from code review


adamsitnik May 26, 2022
9dbfac1

Apply suggestions from code review


adamsitnik May 26, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
 /// where this enum must be a subset of the GetDriveType list, with the enum
 /// values here exactly matching a string there.
 /// </remarks>
 internal enum UnixFileSystemTypes : long
 internal enum UnixFileSystemTypes : uint
 {
 adfs = 0xADF5,
 affs = 0xADFF,
 afs = 0x5346414F,
 anoninode = 0x09041934,
 apfs = 0x1A,
 aufs = 0x61756673,
 autofs = 0x0187,
 autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
 }

 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
 private static partial long GetFileSystemType(SafeFileHandle fd);
 private static partial uint GetFileSystemType(SafeFileHandle fd);

 internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
 {
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
 fileSystemType = (UnixFileSystemTypes)fstatfsResult;
 return fstatfsResult != -1;
 Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
 return fstatfsResult != 0;
 }
 }
}

16 changes: 11 additions & 5 deletions
src/native/libs/System.Native/pal_io.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
 }
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
 int statfsRes;
 struct statfs statfsArgs;
 // for our needs (get file system type) statfs is always enough and there is no need to use statfs64
 // which got deprecated in macOS 10.6, in favor of statfs
 while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
 if (statfsRes == -1) return 0;

 // On Linux, f_type is signed. This causes some filesystem types to be represented as
 // negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
 uint32_t result = (uint32_t)statfsArgs.f_type;
 return result;
#elif !HAVE_NON_LEGACY_STATFS
 int statfsRes;
 struct statvfs statfsArgs;
 while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 if (statfsRes == -1) return (int64_t)-1;
 if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

 if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
 else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
 else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
 else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
 else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
 else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
 else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
 else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
 else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
 else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

 assert(result != -1);
 assert(result != 0);
 return result;
#else
 #error "Platform doesn't support fstatfs or fstatvfs"
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_io.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
File system type fix by adamsitnik · Pull Request #69484 · dotnet/runtime · GitHub
Skip to content
File system type fix#69484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

adamsitnik
merged 6 commits into

from

May 26, 2022
 Merged


File system type fix
#69484
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1090899

disregard the upper bytes, fixes #61175


adamsitnik May 18, 2022
ca72260

add assert to verify the values


adamsitnik May 18, 2022
cb3017e

address code review feedback: use uint32


adamsitnik May 18, 2022
2b81420

add apple file system (apfs) to the magic numbers list (idenitified b…


adamsitnik May 18, 2022
0771bd5

Apply suggestions from code review


adamsitnik May 26, 2022
9dbfac1

Apply suggestions from code review


adamsitnik May 26, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 8 additions & 4 deletions
src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

Expand All@@ -16,12 +18,13 @@ internal static partial class Sys
 /// where this enum must be a subset of the GetDriveType list, with the enum
 /// values here exactly matching a string there.
 /// </remarks>
 internal enum UnixFileSystemTypes : long
 internal enum UnixFileSystemTypes : uint
 {
 adfs = 0xADF5,
 affs = 0xADFF,
 afs = 0x5346414F,
 anoninode = 0x09041934,
 apfs = 0x1A,
 aufs = 0x61756673,
 autofs = 0x0187,
 autofs4 = 0x6D4A556D,
Expand DownExpand Up@@ -146,13 +149,14 @@ internal enum UnixFileSystemTypes : long
 }

 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetFileSystemType")]
 private static partial long GetFileSystemType(SafeFileHandle fd);
 private static partial uint GetFileSystemType(SafeFileHandle fd);

 internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemTypes fileSystemType)
 {
long fstatfsResult = GetFileSystemType(fd);
uint fstatfsResult = GetFileSystemType(fd);
 fileSystemType = (UnixFileSystemTypes)fstatfsResult;
 return fstatfsResult != -1;
 Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
 return fstatfsResult != 0;
 }
 }
}

16 changes: 11 additions & 5 deletions
src/native/libs/System.Native/pal_io.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1472,27 +1472,33 @@ static int16_t ConvertLockType(int16_t managedLockType)
 }
}

int64_t SystemNative_GetFileSystemType(intptr_t fd)
uint32_t SystemNative_GetFileSystemType(intptr_t fd)
{
#if HAVE_STATFS_VFS || HAVE_STATFS_MOUNT
 int statfsRes;
 struct statfs statfsArgs;
 // for our needs (get file system type) statfs is always enough and there is no need to use statfs64
 // which got deprecated in macOS 10.6, in favor of statfs
 while ((statfsRes = fstatfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 return statfsRes == -1 ? (int64_t)-1 : (int64_t)statfsArgs.f_type;
 if (statfsRes == -1) return 0;

 // On Linux, f_type is signed. This causes some filesystem types to be represented as
 // negative numbers on 32-bit platforms. We cast to uint32_t to make them positive.
 uint32_t result = (uint32_t)statfsArgs.f_type;
 return result;
#elif !HAVE_NON_LEGACY_STATFS
 int statfsRes;
 struct statvfs statfsArgs;
 while ((statfsRes = fstatvfs(ToFileDescriptor(fd), &statfsArgs)) == -1 && errno == EINTR) ;
 if (statfsRes == -1) return (int64_t)-1;
 if (statfsRes == -1) return 0;

int64_t result = -1;
uint32_t result = 0;

 if (strcmp(statfsArgs.f_basetype, "adfs") == 0) result = 0xADF5;
 else if (strcmp(statfsArgs.f_basetype, "affs") == 0) result = 0xADFF;
 else if (strcmp(statfsArgs.f_basetype, "afs") == 0) result = 0x5346414F;
 else if (strcmp(statfsArgs.f_basetype, "anoninode") == 0) result = 0x09041934;
 else if (strcmp(statfsArgs.f_basetype, "apfs") == 0) result = 0x1A;
 else if (strcmp(statfsArgs.f_basetype, "aufs") == 0) result = 0x61756673;
 else if (strcmp(statfsArgs.f_basetype, "autofs") == 0) result = 0x0187;
 else if (strcmp(statfsArgs.f_basetype, "autofs4") == 0) result = 0x6D4A556D;
Expand DownExpand Up@@ -1613,7 +1619,7 @@ int64_t SystemNative_GetFileSystemType(intptr_t fd)
 else if (strcmp(statfsArgs.f_basetype, "udev") == 0) result = 0x01021994;
 else if (strcmp(statfsArgs.f_basetype, "zfs") == 0) result = 0x2FC12FC1;

 assert(result != -1);
 assert(result != 0);
 return result;
#else
 #error "Platform doesn't support fstatfs or fstatvfs"
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_io.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -739,9 +739,9 @@ PALEXPORT char* SystemNative_RealPath(const char* path);
PALEXPORT int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* euid);

/**
* Returns file system type on success, or -1 on error.
* Returns file system type on success, or 0 on error.
*/
PALEXPORT int64_t SystemNative_GetFileSystemType(intptr_t fd);
PALEXPORT uint32_t SystemNative_GetFileSystemType(intptr_t fd);

/**
* Attempts to lock/unlock the region of the file "fd" specified by the offset and length. lockType
Expand Down