mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

extfs: refactoring of open and read archive.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-06-07 11:05:20 +03:00
parent 445b427d37
commit 58d2f1be35
1 changed files with 117 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/vfs/extfs/extfs.c
View File

@ -507,30 +507,18 @@ extfs_open_archive (int fstype, const char *name, extfs_super_t ** pparc)
*/
static int
extfs_read_archive (int fstype, const char *name, extfs_super_t ** pparc)
extfs_read_archive (FILE * extfsd, extfs_super_t * current_archive)
{
FILE *extfsd;
const extfs_plugin_info_t *info;
int ret = 0;
char *buffer;
extfs_super_t *current_archive;
char *current_file_name, *current_link_name;
info = &g_array_index (extfs_plugins, extfs_plugin_info_t, fstype);
extfsd = extfs_open_archive (fstype, name, &current_archive);
if (extfsd == NULL)
{
message (D_ERROR, MSG_ERROR, _("Cannot open %s archive\n%s"), info->prefix, name);
return -1;
}
buffer = g_malloc (BUF_4K);
while (fgets (buffer, BUF_4K, extfsd) != NULL)
{
struct stat hstat;
char *current_file_name = NULL, *current_link_name = NULL;
current_link_name = NULL;
if (vfs_parse_ls_lga (buffer, &hstat, &current_file_name, &current_link_name, NULL))
{
extfs_entry_t *entry, *pent;
@ -555,17 +543,16 @@ extfs_read_archive (int fstype, const char *name, extfs_super_t ** pparc)
*(p++) = '\0';
q = cfn;
}
if (S_ISDIR (hstat.st_mode) && (DIR_IS_DOT (p) || DIR_IS_DOTDOT (p)))
goto read_extfs_continue;
if (!S_ISDIR (hstat.st_mode) || !(DIR_IS_DOT (p) || DIR_IS_DOTDOT (p)))
{
pent = extfs_find_entry (current_archive->root_entry, q, FL_MKDIR);
if (pent == NULL)
{
/* FIXME: Should clean everything one day */
g_free (buffer);
pclose (extfsd);
close_error_pipe (D_ERROR, _("Inconsistent extfs archive"));
return -1;
ret = -1;
break;
}
entry = g_new (extfs_entry_t, 1);
entry->name = g_strdup (p);
entry->next_in_dir = NULL;
@ -578,14 +565,12 @@ extfs_read_archive (int fstype, const char *name, extfs_super_t ** pparc)
if (!S_ISLNK (hstat.st_mode) && (current_link_name != NULL))
{
pent =
extfs_find_entry (current_archive->root_entry, current_link_name, FL_NONE);
extfs_find_entry (current_archive->root_entry, current_link_name,
FL_NONE);
if (pent == NULL)
{
/* FIXME: Should clean everything one day */
g_free (buffer);
pclose (extfsd);
close_error_pipe (D_ERROR, _("Inconsistent extfs archive"));
return -1;
ret = -1;
break;
}
entry->ino = pent->ino;
@ -629,24 +614,16 @@ extfs_read_archive (int fstype, const char *name, extfs_super_t ** pparc)
extfs_make_dots (entry);
}
}
read_extfs_continue:
}
g_free (current_file_name);
g_free (current_link_name);
}
}
g_free (buffer);
/* Check if extfs 'list' returned 0 */
if (pclose (extfsd) != 0)
{
extfs_free (current_archive);
close_error_pipe (D_ERROR, _("Inconsistent extfs archive"));
return -1;
}
close_error_pipe (D_ERROR, NULL);
*pparc = current_archive;
return 0;
return ret;
}
/* --------------------------------------------------------------------------------------------- */
@ -674,6 +651,44 @@ extfs_which (struct vfs_class *me, const char *path)
return -1;
}
/* --------------------------------------------------------------------------------------------- */
static int
extfs_open_and_read_archive (int fstype, const char *name, extfs_super_t ** archive)
{
int result = -1;
FILE *extfsd;
extfs_super_t *a;
extfsd = extfs_open_archive (fstype, name, archive);
a = *archive;
if (extfsd == NULL)
{
const extfs_plugin_info_t *info;
info = &g_array_index (extfs_plugins, extfs_plugin_info_t, fstype);
message (D_ERROR, MSG_ERROR, _("Cannot open %s archive\n%s"), info->prefix, name);
}
else if (extfs_read_archive (extfsd, a) != 0)
{
pclose (extfsd);
close_error_pipe (D_ERROR, _("Inconsistent extfs archive"));
}
else if (pclose (extfsd) != 0)
{
extfs_free (a);
close_error_pipe (D_ERROR, _("Inconsistent extfs archive"));
}
else
{
close_error_pipe (D_ERROR, NULL);
result = 0;
}
return result;
}
/* --------------------------------------------------------------------------------------------- */
/**
* Dissect the path and create corresponding superblock.
@ -696,28 +711,28 @@ extfs_get_path (const vfs_path_t * vpath, extfs_super_t ** archive, int flags)
archive_name = vfs_path_to_str_elements_count (vpath, -1);
/*
* All filesystems should have some local archive, at least
* it can be PATH_SEP ('/').
*/
/* All filesystems should have some local archive, at least it can be PATH_SEP ('/'). */
parc = g_slist_find_custom (first_archive, archive_name, extfs_cmp_archive);
if (parc != NULL)
{
a = EXTFS_SUPER (parc->data);
vfs_stamp (&vfs_extfs_ops, (vfsid) a);
g_free (archive_name);
goto return_success;
}
else
{
if ((flags & FL_NO_OPEN) == 0)
result = extfs_open_and_read_archive (fstype, archive_name, &a);
result = (flags & FL_NO_OPEN) != 0 ? -1 : extfs_read_archive (fstype, archive_name, &a);
g_free (archive_name);
if (result == -1)
{
path_element->class->verrno = EIO;
return NULL;
}
}
return_success:
*archive = a;
return path_element->path;
}