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

fish: cleanup: unboxed quoted strings when generate shell commands

Browse Source 
Signed-off-by: Sergei Trofimovich <st@anti-virus.by>
This commit is contained in:
Sergei Trofimovich 2009-01-28 10:29:18 +02:00
parent 90763ba82f
commit c825c379c4
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mhl/string.h
View File

@ -60,9 +60,6 @@ static inline char* __mhl_str_concat_hlp(const char* base, ...)
int count = 0;
size_t totalsize = 0;
// first pass: scan through the params and count string sizes
va_list par;
if (base)
{
arg_ptr[0] = base;

20
vfs/fish.c
View File

@ -901,8 +901,8 @@ fish_chmod (struct vfs_class *me, const char *path, int mode)
g_snprintf(buf, sizeof(buf), "#CHMOD %4.4o /%s\n"
"chmod %4.4o /%s 2>/dev/null\n"
"echo '### 000'\n",
mode & 07777, rpath,
mode & 07777, rpath);
mode & 07777, rpath.s,
mode & 07777, rpath.s);
POSTFIX(OPT_FLUSH);
}
@ -948,7 +948,7 @@ static int fish_symlink (struct vfs_class *me, const char *setto, const char *pa
"#SYMLINK %s /%s\n"
"ln -s %s /%s 2>/dev/null\n"
"echo '### 000'\n",
qsetto, rpath, qsetto, rpath);
qsetto.s, rpath.s, qsetto.s, rpath.s);
mhl_mem_free (qsetto.s);
POSTFIX(OPT_FLUSH);
}
@ -974,16 +974,16 @@ fish_chown (struct vfs_class *me, const char *path, int owner, int group)
"#CHOWN %s /%s\n"
"chown %s /%s 2>/dev/null\n"
"echo '### 000'\n",
sowner, rpath,
sowner, rpath);
sowner, rpath.s,
sowner, rpath.s);
fish_send_command (me, super, buf, OPT_FLUSH);
/* FIXME: what should we report if chgrp succeeds but chown fails? */
g_snprintf (buf, sizeof(buf),
"#CHGRP /%s \"/%s\"\n"
"chgrp %s \"/%s\" 2>/dev/null\n"
"echo '### 000'\n",
sgroup, rpath,
sgroup, rpath);
sgroup, rpath.s,
sgroup, rpath.s);
/* fish_send_command(me, super, buf, OPT_FLUSH); */
POSTFIX (OPT_FLUSH)
}
@ -996,7 +996,7 @@ static int fish_unlink (struct vfs_class *me, const char *path)
"#DELE /%s\n"
"rm -f /%s 2>/dev/null\n"
"echo '### 000'\n",
rpath, rpath);
rpath.s, rpath.s);
POSTFIX(OPT_FLUSH);
}
@ -1010,7 +1010,7 @@ static int fish_mkdir (struct vfs_class *me, const char *path, mode_t mode)
"#MKD /%s\n"
"mkdir /%s 2>/dev/null\n"
"echo '### 000'\n",
rpath, rpath);
rpath.s, rpath.s);
POSTFIX(OPT_FLUSH);
}
@ -1021,7 +1021,7 @@ static int fish_rmdir (struct vfs_class *me, const char *path)
"#RMD /%s\n"
"rmdir /%s 2>/dev/null\n"
"echo '### 000'\n",
rpath, rpath);
rpath.s, rpath.s);
POSTFIX(OPT_FLUSH);
}