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

Ticket #1501

Browse Source 
* place every operation into a if clause, so that every failure of the
     operations is reported.
    * Place chown/chmod into if conditions to check if the commands where
      successfull or not on fish.
    * Added one more argument to the #CHOWN line

    Signed-off-by: Patrick Winnertz <winnie@debian.org>
This commit is contained in:
Patrick Winnertz 2009-08-09 12:05:43 +02:00 committed by Ilia Maslakov
parent 65771004c4
commit c313396a45
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
vfs/fish.c
View File

@ -944,8 +944,11 @@ fish_chmod (struct vfs_class *me, const char *path, int mode)
{ {
PREFIX PREFIX
g_snprintf(buf, sizeof(buf), "#CHMOD %4.4o /%s\n" g_snprintf(buf, sizeof(buf), "#CHMOD %4.4o /%s\n"
"chmod %4.4o /%s 2>/dev/null\n" "if chmod %4.4o /%s 2>/dev/null; then\n"
"echo '### 000'\n", "echo '### 000'\n"
"else\n"
"echo '### 500'\n"
"fi\n",
mode & 07777, rpath, mode & 07777, rpath,
mode & 07777, rpath); mode & 07777, rpath);
POSTFIX(OPT_FLUSH); POSTFIX(OPT_FLUSH);
@ -978,11 +981,17 @@ static int fish_##name (struct vfs_class *me, const char *path1, const char *pat
} }
FISH_OP(rename, "#RENAME /%s /%s\n" FISH_OP(rename, "#RENAME /%s /%s\n"
"mv /%s /%s 2>/dev/null\n" "if mv /%s /%s 2>/dev/null; then\n"
"echo '### 000'" ) "echo '### 000'\n"
"else\n"
"echo '### 500'\n"
"fi\n")
FISH_OP(link, "#LINK /%s /%s\n" FISH_OP(link, "#LINK /%s /%s\n"
"ln /%s /%s 2>/dev/null\n" "if ln /%s /%s 2>/dev/null; then\n"
"echo '### 000'" ) "echo '### 000'\n"
"else\n"
"echo '### 500'\n"
"fi\n")
static int fish_symlink (struct vfs_class *me, const char *setto, const char *path) static int fish_symlink (struct vfs_class *me, const char *setto, const char *path)
{ {
@ -991,8 +1000,11 @@ static int fish_symlink (struct vfs_class *me, const char *setto, const char *pa
qsetto = strutils_shell_escape (setto); qsetto = strutils_shell_escape (setto);
g_snprintf(buf, sizeof(buf), g_snprintf(buf, sizeof(buf),
"#SYMLINK %s /%s\n" "#SYMLINK %s /%s\n"
"ln -s %s /%s 2>/dev/null\n" "if ln -s %s /%s 2>/dev/null; then\n"
"echo '### 000'\n", "echo '### 000'\n"
"else\n"
"echo '### 500'\n"
"fi\n",
qsetto, rpath, qsetto, rpath); qsetto, rpath, qsetto, rpath);
g_free (qsetto); g_free (qsetto);
POSTFIX(OPT_FLUSH); POSTFIX(OPT_FLUSH);
@ -1016,19 +1028,16 @@ fish_chown (struct vfs_class *me, const char *path, int owner, int group)
{ {
PREFIX PREFIX
g_snprintf (buf, sizeof(buf), g_snprintf (buf, sizeof(buf),
"#CHOWN %s /%s\n" "#CHOWN %s:%s /%s\n"
"chown %s /%s 2>/dev/null\n" "if chown %s:%s /%s 2>/dev/null; then\n"
"echo '### 000'\n", "echo '### 000'\n"
sowner, rpath, "else\n"
sowner, rpath); "echo '### 500'\n"
fish_send_command (me, super, buf, OPT_FLUSH); "fi\n",
sowner, sgroup, rpath,
sowner, sgroup, rpath);
fish_send_command (me, super, buf, OPT_FLUSH);
/* FIXME: what should we report if chgrp succeeds but chown fails? */ /* 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);
/* fish_send_command(me, super, buf, OPT_FLUSH); */ /* fish_send_command(me, super, buf, OPT_FLUSH); */
POSTFIX (OPT_FLUSH) POSTFIX (OPT_FLUSH)
} }
@ -1039,8 +1048,11 @@ static int fish_unlink (struct vfs_class *me, const char *path)
PREFIX PREFIX
g_snprintf(buf, sizeof(buf), g_snprintf(buf, sizeof(buf),
"#DELE /%s\n" "#DELE /%s\n"
"rm -f /%s 2>/dev/null\n" "if rm -f /%s 2>/dev/null; then\n"
"echo '### 000'\n", "echo '### 000'\n"
"else\n"
"echo '### 500'\n"
"fi\n",
rpath, rpath); rpath, rpath);
POSTFIX(OPT_FLUSH); POSTFIX(OPT_FLUSH);
} }
@ -1076,8 +1088,11 @@ static int fish_mkdir (struct vfs_class *me, const char *path, mode_t mode)
g_snprintf(buf, sizeof(buf), g_snprintf(buf, sizeof(buf),
"#MKD /%s\n" "#MKD /%s\n"
"mkdir /%s 2>/dev/null\n" "if mkdir /%s 2>/dev/null; then\n"
"echo '### 000'\n", "echo '### 000'\n"
"else\n"
"echo '### 500'\n"
"fi\n",
rpath, rpath); rpath, rpath);
g_free (rpath); g_free (rpath);
@ -1097,8 +1112,11 @@ static int fish_rmdir (struct vfs_class *me, const char *path)
PREFIX PREFIX
g_snprintf(buf, sizeof(buf), g_snprintf(buf, sizeof(buf),
"#RMD /%s\n" "#RMD /%s\n"
"rmdir /%s 2>/dev/null\n" "if rmdir /%s 2>/dev/null; then\n"
"echo '### 000'\n", "echo '### 000'\n"
"else\n"
"echo '### 500'\n"
"fi\n",
rpath, rpath); rpath, rpath);
POSTFIX(OPT_FLUSH); POSTFIX(OPT_FLUSH);
} }