mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-23 12:56:51 +03:00
* direntry.c (vfs_s_read): Move MEDATA->linear_start() ...
* (vfs_s_open): ... here.
This commit is contained in:
parent
a876d1a17d
commit
a844c07aac
@ -1,3 +1,8 @@
|
|||||||
|
2002-05-17 Andrew V. Samoilov <kai@cmail.ru>
|
||||||
|
|
||||||
|
* direntry.c (vfs_s_read): Move MEDATA->linear_start() ...
|
||||||
|
* (vfs_s_open): ... here.
|
||||||
|
|
||||||
2002-05-14 Andrew V. Samoilov <kai@cmail.ru>
|
2002-05-14 Andrew V. Samoilov <kai@cmail.ru>
|
||||||
|
|
||||||
* Makefile.am (noinst_LIBRARIES): Add samba/libsamba.a
|
* Makefile.am (noinst_LIBRARIES): Add samba/libsamba.a
|
||||||
|
@ -787,7 +787,13 @@ vfs_s_open (vfs *me, char *file, int flags, int mode)
|
|||||||
fh->linear = 0;
|
fh->linear = 0;
|
||||||
|
|
||||||
if (IS_LINEAR(flags)) {
|
if (IS_LINEAR(flags)) {
|
||||||
fh->linear = LS_LINEAR_CLOSED;
|
if (MEDATA->linear_start) {
|
||||||
|
print_vfs_message (_("Starting linear transfer..."));
|
||||||
|
if (!MEDATA->linear_start (me, fh, 0)){
|
||||||
|
g_free(fh);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
} else if ((MEDATA->fh_open) && (MEDATA->fh_open (me, fh, flags, mode))){
|
} else if ((MEDATA->fh_open) && (MEDATA->fh_open (me, fh, flags, mode))){
|
||||||
g_free(fh);
|
g_free(fh);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -814,12 +820,6 @@ vfs_s_read (void *fh, char *buffer, int count)
|
|||||||
int n;
|
int n;
|
||||||
vfs *me = FH_SUPER->me;
|
vfs *me = FH_SUPER->me;
|
||||||
|
|
||||||
if (FH->linear == LS_LINEAR_CLOSED){
|
|
||||||
print_vfs_message (_("Starting linear transfer..."));
|
|
||||||
if (!MEDATA->linear_start (me, FH, 0))
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FH->linear == LS_LINEAR_CLOSED)
|
if (FH->linear == LS_LINEAR_CLOSED)
|
||||||
vfs_die ("linear_start() did not set linear_state!");
|
vfs_die ("linear_start() did not set linear_state!");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user