mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-03 18:14:25 +03:00
(extfs_cmd): fix build of extfs command if localname is empty.
Fix d4e59aa022
.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
f2166c264c
commit
95958bce85
@ -916,8 +916,8 @@ extfs_cmd (const char *str_extfs_cmd, const struct extfs_super_t *archive,
|
|||||||
{
|
{
|
||||||
char *file;
|
char *file;
|
||||||
char *quoted_file;
|
char *quoted_file;
|
||||||
char *quoted_localname;
|
|
||||||
char *archive_name, *quoted_archive_name;
|
char *archive_name, *quoted_archive_name;
|
||||||
|
const extfs_plugin_info_t *info;
|
||||||
char *cmd = NULL;
|
char *cmd = NULL;
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
@ -946,14 +946,18 @@ extfs_cmd (const char *str_extfs_cmd, const struct extfs_super_t *archive,
|
|||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
quoted_localname = name_quote (localname, FALSE);
|
info = &g_array_index (extfs_plugins, extfs_plugin_info_t, archive->fstype);
|
||||||
if (quoted_localname != NULL)
|
|
||||||
{
|
|
||||||
const extfs_plugin_info_t *info;
|
|
||||||
|
|
||||||
info = &g_array_index (extfs_plugins, extfs_plugin_info_t, archive->fstype);
|
if (localname == NULL || *localname == '\0')
|
||||||
cmd = g_strconcat (info->path, info->prefix, str_extfs_cmd,
|
cmd = g_strconcat (info->path, info->prefix, str_extfs_cmd, quoted_archive_name, " ",
|
||||||
quoted_archive_name, " ", file, " ", quoted_localname, (char *) NULL);
|
file, (char *) NULL);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
char *quoted_localname;
|
||||||
|
|
||||||
|
quoted_localname = name_quote (localname, FALSE);
|
||||||
|
cmd = g_strconcat (info->path, info->prefix, str_extfs_cmd, quoted_archive_name, " ",
|
||||||
|
file, " ", quoted_localname, (char *) NULL);
|
||||||
g_free (quoted_localname);
|
g_free (quoted_localname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user