Trivial patches from Andrew V. Samoilov <andrew@email.zp.ua>
Этот коммит содержится в:
родитель
b151ce4419
Коммит
c83ab1c1b2
@ -273,7 +273,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super)
|
|||||||
*/
|
*/
|
||||||
if (fish_command
|
if (fish_command
|
||||||
(me, super, WAIT_REPLY,
|
(me, super, WAIT_REPLY,
|
||||||
"#FISH\necho; start_fish_server 2>&1;" " echo '### 200'\n") !=
|
"#FISH\necho; start_fish_server 2>&1; echo '### 200'\n") !=
|
||||||
COMPLETE)
|
COMPLETE)
|
||||||
ERRNOR (E_PROTO, -1);
|
ERRNOR (E_PROTO, -1);
|
||||||
|
|
||||||
@ -686,7 +686,7 @@ fish_send_command(struct vfs_class *me, struct vfs_s_super *super, char *cmd, in
|
|||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
r = fish_command (me, super, WAIT_REPLY, cmd);
|
r = fish_command (me, super, WAIT_REPLY, "%s", cmd);
|
||||||
vfs_stamp_create (&vfs_fish_ops, super);
|
vfs_stamp_create (&vfs_fish_ops, super);
|
||||||
if (r != COMPLETE) ERRNOR (E_REMOTE, -1);
|
if (r != COMPLETE) ERRNOR (E_REMOTE, -1);
|
||||||
if (flags & OPT_FLUSH)
|
if (flags & OPT_FLUSH)
|
||||||
|
@ -354,7 +354,7 @@ static void *
|
|||||||
undelfs_readdir(void *vfs_info)
|
undelfs_readdir(void *vfs_info)
|
||||||
{
|
{
|
||||||
static union vfs_dirent undelfs_readdir_data;
|
static union vfs_dirent undelfs_readdir_data;
|
||||||
char *dirent_dest;
|
static char *const dirent_dest = undelfs_readdir_data.dent.d_name;
|
||||||
|
|
||||||
if (vfs_info != fs) {
|
if (vfs_info != fs) {
|
||||||
message (1, undelfserr, _(" vfs_info is not fs! "));
|
message (1, undelfserr, _(" vfs_info is not fs! "));
|
||||||
@ -362,9 +362,8 @@ undelfs_readdir(void *vfs_info)
|
|||||||
}
|
}
|
||||||
if (readdir_ptr == num_delarray)
|
if (readdir_ptr == num_delarray)
|
||||||
return NULL;
|
return NULL;
|
||||||
dirent_dest = undelfs_readdir_data.dent.d_name;
|
|
||||||
if (readdir_ptr < 0)
|
if (readdir_ptr < 0)
|
||||||
g_snprintf(dirent_dest, MC_MAXPATHLEN, "%s",
|
g_snprintf(dirent_dest, MC_MAXPATHLEN,
|
||||||
readdir_ptr == -2 ? "." : "..");
|
readdir_ptr == -2 ? "." : "..");
|
||||||
else
|
else
|
||||||
g_snprintf(dirent_dest, MC_MAXPATHLEN, "%ld:%d",
|
g_snprintf(dirent_dest, MC_MAXPATHLEN, "%ld:%d",
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user