mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1712_vfs_fix_for_mc'

Browse Source 
* 1712_vfs_fix_for_mc:
  Ticket #1712: VFS fix for mc.
This commit is contained in:
Slava Zanko 2009-10-15 09:39:41 +03:00
commit 5f3447a66c
1 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vfs/vfs.c
View File

@ -676,6 +676,9 @@ mc_ctl (int handle, int ctlop, void *arg)
{ {
struct vfs_class *vfs = vfs_op (handle); struct vfs_class *vfs = vfs_op (handle);
if (vfs == NULL)
return 0;
return vfs->ctl ? (*vfs->ctl)(vfs_info (handle), ctlop, arg) : 0; return vfs->ctl ? (*vfs->ctl)(vfs_info (handle), ctlop, arg) : 0;
} }
@ -708,6 +711,9 @@ mc_close (int handle)
return -1; return -1;
vfs = vfs_op (handle); vfs = vfs_op (handle);
if (vfs == NULL)
return -1;
if (handle < 3) if (handle < 3)
return close (handle); return close (handle);
@ -797,7 +803,11 @@ mc_readdir (DIR *dirp)
return NULL; return NULL;
} }
handle = *(int *) dirp; handle = *(int *) dirp;
vfs = vfs_op (handle); vfs = vfs_op (handle);
if (vfs == NULL)
return NULL;
dirinfo = vfs_info (handle); dirinfo = vfs_info (handle);
if (vfs->readdir) { if (vfs->readdir) {
entry = (*vfs->readdir) (dirinfo->info); entry = (*vfs->readdir) (dirinfo->info);
@ -820,6 +830,9 @@ mc_closedir (DIR *dirp)
int result; int result;
struct vfs_dirinfo *dirinfo; struct vfs_dirinfo *dirinfo;
if (vfs == NULL)
return -1;
dirinfo = vfs_info (handle); dirinfo = vfs_info (handle);
if (dirinfo->converter != str_cnv_from_term) str_close_conv (dirinfo->converter); if (dirinfo->converter != str_cnv_from_term) str_close_conv (dirinfo->converter);
@ -837,9 +850,16 @@ int mc_stat (const char *filename, struct stat *buf) {
path = vfs_canon_and_translate (filename); path = vfs_canon_and_translate (filename);
if (path != NULL) { if (path == NULL)
return -1;
vfs = vfs_get_class (path); vfs = vfs_get_class (path);
if (vfs == NULL) {
g_free (path);
return -1;
}
result = vfs->stat ? (*vfs->stat) (vfs, path, buf) : -1; result = vfs->stat ? (*vfs->stat) (vfs, path, buf) : -1;
g_free (path); g_free (path);
@ -847,7 +867,6 @@ int mc_stat (const char *filename, struct stat *buf) {
if (result == -1) if (result == -1)
errno = vfs->name ? ferrno (vfs) : E_NOTSUPP; errno = vfs->name ? ferrno (vfs) : E_NOTSUPP;
return result; return result;
} else return -1;
} }
int mc_lstat (const char *filename, struct stat *buf) { int mc_lstat (const char *filename, struct stat *buf) {
@ -857,14 +876,20 @@ int mc_lstat (const char *filename, struct stat *buf) {
path = vfs_canon_and_translate (filename); path = vfs_canon_and_translate (filename);
if (path != NULL) { if (path == NULL)
return -1;
vfs = vfs_get_class (path); vfs = vfs_get_class (path);
if (vfs == NULL) {
g_free (path);
return -1;
}
result = vfs->lstat ? (*vfs->lstat) (vfs, path, buf) : -1; result = vfs->lstat ? (*vfs->lstat) (vfs, path, buf) : -1;
g_free (path); g_free (path);
if (result == -1) if (result == -1)
errno = vfs->name ? ferrno (vfs) : E_NOTSUPP; errno = vfs->name ? ferrno (vfs) : E_NOTSUPP;
return result; return result;
} else return -1;
} }
int mc_fstat (int handle, struct stat *buf) { int mc_fstat (int handle, struct stat *buf) {
@ -873,7 +898,11 @@ int mc_fstat (int handle, struct stat *buf) {
if (handle == -1) if (handle == -1)
return -1; return -1;
vfs = vfs_op (handle); vfs = vfs_op (handle);
if (vfs == NULL)
return -1;
result = vfs->fstat ? (*vfs->fstat) (vfs_info (handle), buf) : -1; result = vfs->fstat ? (*vfs->fstat) (vfs_info (handle), buf) : -1;
if (result == -1) if (result == -1)
errno = vfs->name ? ferrno (vfs) : E_NOTSUPP; errno = vfs->name ? ferrno (vfs) : E_NOTSUPP;
@ -967,6 +996,9 @@ off_t mc_lseek (int fd, off_t offset, int whence)
return -1; return -1;
vfs = vfs_op (fd); vfs = vfs_op (fd);
if (vfs == NULL)
return -1;
result = vfs->lseek ? (*vfs->lseek)(vfs_info (fd), offset, whence) : -1; result = vfs->lseek ? (*vfs->lseek)(vfs_info (fd), offset, whence) : -1;
if (result == -1) if (result == -1)
errno = vfs->lseek ? ferrno (vfs) : E_NOTSUPP; errno = vfs->lseek ? ferrno (vfs) : E_NOTSUPP;