Browse Source
Provide a common interface for getting basic filesystem information including filesystem type and whether the filesystem is remote. Refactor existing code for getting basic filesystem info and detecting remote file systems to the new interface. Refactor filesystem checks to leverage new interface. For macOS, error-out if the Unix Domain socket (UDS) file is on a remote filesystem. Signed-off-by: Eric DeCosta <edecosta@mathworks.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
Eric DeCosta
2 years ago
committed by
Junio C Hamano
8 changed files with 272 additions and 219 deletions
@ -0,0 +1,43 @@
@@ -0,0 +1,43 @@
|
||||
#include "fsmonitor.h" |
||||
#include "fsmonitor-path-utils.h" |
||||
#include <sys/param.h> |
||||
#include <sys/mount.h> |
||||
|
||||
int fsmonitor__get_fs_info(const char *path, struct fs_info *fs_info) |
||||
{ |
||||
struct statfs fs; |
||||
if (statfs(path, &fs) == -1) { |
||||
int saved_errno = errno; |
||||
trace_printf_key(&trace_fsmonitor, "statfs('%s') failed: %s", |
||||
path, strerror(saved_errno)); |
||||
errno = saved_errno; |
||||
return -1; |
||||
} |
||||
|
||||
trace_printf_key(&trace_fsmonitor, |
||||
"statfs('%s') [type 0x%08x][flags 0x%08x] '%s'", |
||||
path, fs.f_type, fs.f_flags, fs.f_fstypename); |
||||
|
||||
if (!(fs.f_flags & MNT_LOCAL)) |
||||
fs_info->is_remote = 1; |
||||
else |
||||
fs_info->is_remote = 0; |
||||
|
||||
fs_info->typename = xstrdup(fs.f_fstypename); |
||||
|
||||
trace_printf_key(&trace_fsmonitor, |
||||
"'%s' is_remote: %d", |
||||
path, fs_info->is_remote); |
||||
return 0; |
||||
} |
||||
|
||||
int fsmonitor__is_fs_remote(const char *path) |
||||
{ |
||||
struct fs_info fs; |
||||
if (fsmonitor__get_fs_info(path, &fs)) |
||||
return -1; |
||||
|
||||
free(fs.typename); |
||||
|
||||
return fs.is_remote; |
||||
} |
||||
@ -0,0 +1,128 @@
@@ -0,0 +1,128 @@
|
||||
#include "cache.h" |
||||
#include "fsmonitor.h" |
||||
#include "fsmonitor-path-utils.h" |
||||
|
||||
/* |
||||
* Check remote working directory protocol. |
||||
* |
||||
* Return -1 if client machine cannot get remote protocol information. |
||||
*/ |
||||
static int check_remote_protocol(wchar_t *wpath) |
||||
{ |
||||
HANDLE h; |
||||
FILE_REMOTE_PROTOCOL_INFO proto_info; |
||||
|
||||
h = CreateFileW(wpath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, |
||||
FILE_FLAG_BACKUP_SEMANTICS, NULL); |
||||
|
||||
if (h == INVALID_HANDLE_VALUE) { |
||||
error(_("[GLE %ld] unable to open for read '%ls'"), |
||||
GetLastError(), wpath); |
||||
return -1; |
||||
} |
||||
|
||||
if (!GetFileInformationByHandleEx(h, FileRemoteProtocolInfo, |
||||
&proto_info, sizeof(proto_info))) { |
||||
error(_("[GLE %ld] unable to get protocol information for '%ls'"), |
||||
GetLastError(), wpath); |
||||
CloseHandle(h); |
||||
return -1; |
||||
} |
||||
|
||||
CloseHandle(h); |
||||
|
||||
trace_printf_key(&trace_fsmonitor, |
||||
"check_remote_protocol('%ls') remote protocol %#8.8lx", |
||||
wpath, proto_info.Protocol); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
/* |
||||
* Notes for testing: |
||||
* |
||||
* (a) Windows allows a network share to be mapped to a drive letter. |
||||
* (This is the normal method to access it.) |
||||
* |
||||
* $ NET USE Z: \\server\share |
||||
* $ git -C Z:/repo status |
||||
* |
||||
* (b) Windows allows a network share to be referenced WITHOUT mapping |
||||
* it to drive letter. |
||||
* |
||||
* $ NET USE \\server\share\dir |
||||
* $ git -C //server/share/repo status |
||||
* |
||||
* (c) Windows allows "SUBST" to create a fake drive mapping to an |
||||
* arbitrary path (which may be remote) |
||||
* |
||||
* $ SUBST Q: Z:\repo |
||||
* $ git -C Q:/ status |
||||
* |
||||
* (d) Windows allows a directory symlink to be created on a local |
||||
* file system that points to a remote repo. |
||||
* |
||||
* $ mklink /d ./link //server/share/repo |
||||
* $ git -C ./link status |
||||
*/ |
||||
int fsmonitor__get_fs_info(const char *path, struct fs_info *fs_info) |
||||
{ |
||||
wchar_t wpath[MAX_PATH]; |
||||
wchar_t wfullpath[MAX_PATH]; |
||||
size_t wlen; |
||||
UINT driveType; |
||||
|
||||
/* |
||||
* Do everything in wide chars because the drive letter might be |
||||
* a multi-byte sequence. See win32_has_dos_drive_prefix(). |
||||
*/ |
||||
if (xutftowcs_path(wpath, path) < 0) { |
||||
return -1; |
||||
} |
||||
|
||||
/* |
||||
* GetDriveTypeW() requires a final slash. We assume that the |
||||
* worktree pathname points to an actual directory. |
||||
*/ |
||||
wlen = wcslen(wpath); |
||||
if (wpath[wlen - 1] != L'\\' && wpath[wlen - 1] != L'/') { |
||||
wpath[wlen++] = L'\\'; |
||||
wpath[wlen] = 0; |
||||
} |
||||
|
||||
/* |
||||
* Normalize the path. If nothing else, this converts forward |
||||
* slashes to backslashes. This is essential to get GetDriveTypeW() |
||||
* correctly handle some UNC "\\server\share\..." paths. |
||||
*/ |
||||
if (!GetFullPathNameW(wpath, MAX_PATH, wfullpath, NULL)) { |
||||
return -1; |
||||
} |
||||
|
||||
driveType = GetDriveTypeW(wfullpath); |
||||
trace_printf_key(&trace_fsmonitor, |
||||
"DriveType '%s' L'%ls' (%u)", |
||||
path, wfullpath, driveType); |
||||
|
||||
if (driveType == DRIVE_REMOTE) { |
||||
fs_info->is_remote = 1; |
||||
if (check_remote_protocol(wfullpath) < 0) |
||||
return -1; |
||||
} else { |
||||
fs_info->is_remote = 0; |
||||
} |
||||
|
||||
trace_printf_key(&trace_fsmonitor, |
||||
"'%s' is_remote: %d", |
||||
path, fs_info->is_remote); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int fsmonitor__is_fs_remote(const char *path) |
||||
{ |
||||
struct fs_info fs; |
||||
if (fsmonitor__get_fs_info(path, &fs)) |
||||
return -1; |
||||
return fs.is_remote; |
||||
} |
||||
@ -0,0 +1,26 @@
@@ -0,0 +1,26 @@
|
||||
#ifndef FSM_PATH_UTILS_H |
||||
#define FSM_PATH_UTILS_H |
||||
|
||||
struct fs_info { |
||||
int is_remote; |
||||
char *typename; |
||||
}; |
||||
|
||||
/* |
||||
* Get some basic filesystem informtion for the given path |
||||
* |
||||
* The caller owns the storage that is occupied by fs_info and |
||||
* is responsible for releasing it. |
||||
* |
||||
* Returns -1 on error, zero otherwise. |
||||
*/ |
||||
int fsmonitor__get_fs_info(const char *path, struct fs_info *fs_info); |
||||
|
||||
/* |
||||
* Determines if the filesystem that path resides on is remote. |
||||
* |
||||
* Returns -1 on error, 0 if not remote, 1 if remote. |
||||
*/ |
||||
int fsmonitor__is_fs_remote(const char *path); |
||||
|
||||
#endif |
||||
Loading…
Reference in new issue