ports/mc
ports/mc
1
1
Форкнуть 0
Код Релизы 2 Активность

Add some whitespace fixes which are also used to make symlinks work correctly

Просмотр исходного кода
Этот коммит содержится в:
Patrick Winnertz 2009-01-23 21:00:30 +01:00
родитель 1667b696b7
Коммит b198432f06
1 изменённых файлов: 37 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

71
vfs/fish.c
Просмотреть файл

@ -366,7 +366,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
dir->timestamp.tv_sec += fish_directory_timeout; dir->timestamp.tv_sec += fish_directory_timeout;
quoted_path = name_quote (remote_path, 0); quoted_path = name_quote (remote_path, 0);
fish_command (me, super, NONE, fish_command (me, super, NONE,
"#LIST /%s\n" "#LIST \"/%s\"\n"
"if `perl -v > /dev/null 2>&1` ; then\n" "if `perl -v > /dev/null 2>&1` ; then\n"
"perl -e \"\n" "perl -e \"\n"
"use strict;\n" "use strict;\n"
@ -385,15 +385,15 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
"}}\n" "}}\n"
"printf(\"###200\n\");\n" "printf(\"###200\n\");\n"
"closedir(DIR);\"\n" "closedir(DIR);\"\n"
"elif `ls -1 /%s >/dev/null 2>&1` ; then\n" "elif `ls -1 \"/%s\" >/dev/null 2>&1` ; then\n"
"if `ls -Q >/dev/null 2>&1`; then\n" "if `ls -Q \"/%s\" >/dev/null 2>&1`; then\n"
"LSOPT=\"-Qlan\";\n" "LSOPT=\"-Qlan\";\n"
"ADD=0;\n" "ADD=0;\n"
"else\n" "else\n"
"LSOPT=\"-lan\";\n" "LSOPT=\"-lan\";\n"
"ADD=1;\n" "ADD=1;\n"
"fi\n" "fi\n"
"ls $LSOPT /%s 2>/dev/null | grep '^[^cbt]' | (\n" "ls $LSOPT \"/%s\" 2>/dev/null | grep '^[^cbt]' | (\n"
"while read p l u g s m d y n; do\n" "while read p l u g s m d y n; do\n"
"if [ $ADD = 0 ]; then\n" "if [ $ADD = 0 ]; then\n"
"echo \"P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\"\n" "echo \"P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\"\n"
@ -404,7 +404,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
"echo \"P$p $u $g\nS$s\nd$m $d $y\n:\"$n\"\n\"\n" "echo \"P$p $u $g\nS$s\nd$m $d $y\n:\"$n\"\n\"\n"
"fi\n" "fi\n"
"done )\n" "done )\n"
"ls $LSOPT /%s 2>/dev/null | grep '^[cb]' | (\n" "ls $LSOPT \"/%s\" 2>/dev/null | grep '^[cb]' | (\n"
"while read p l u g a i m d y n; do\n" "while read p l u g a i m d y n; do\n"
"if [ $ADD = 0 ]; then\n" "if [ $ADD = 0 ]; then\n"
"echo \"P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\"\n" "echo \"P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\"\n"
@ -419,7 +419,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
"else\n" "else\n"
"echo '### 500'\n" "echo '### 500'\n"
"fi\n", "fi\n",
remote_path, quoted_path, quoted_path, quoted_path, quoted_path); remote_path, quoted_path, quoted_path, quoted_path, quoted_path, quoted_path);
g_free (quoted_path); g_free (quoted_path);
ent = vfs_s_generate_entry(me, NULL, dir, 0); ent = vfs_s_generate_entry(me, NULL, dir, 0);
while (1) { while (1) {
@ -575,15 +575,16 @@ fish_file_store(struct vfs_class *me, struct vfs_s_fh *fh, char *name, char *loc
* algorithm for file appending case, therefore just "dd" is used for it. * algorithm for file appending case, therefore just "dd" is used for it.
*/ */
name = mhl_shell_escape_dup(name);
print_vfs_message(_("fish: store %s: sending command..."), name ); print_vfs_message(_("fish: store %s: sending command..."), name );
quoted_name = name_quote (name, 0); quoted_name = mhl_shell_escape_dup(name_quote (name, 0));
/* FIXME: File size is limited to ULONG_MAX */ /* FIXME: File size is limited to ULONG_MAX */
if (!fh->u.fish.append) if (!fh->u.fish.append)
n = fish_command (me, super, WAIT_REPLY, n = fish_command (me, super, WAIT_REPLY,
"#STOR %lu /%s\n" "#STOR %lu \"/%s\"\n"
"echo '### 001'\n" "echo '### 001'\n"
"file=/%s\n" "file=\"/%s\"\n"
"res=`exec 3>&1\n" "res=`exec 3>&1\n"
"(\n" "(\n"
"head -c %lu -q - || echo DD >&3\n" "head -c %lu -q - || echo DD >&3\n"
@ -605,10 +606,10 @@ fish_file_store(struct vfs_class *me, struct vfs_s_fh *fh, char *name, char *loc
(unsigned long) s.st_size); (unsigned long) s.st_size);
else else
n = fish_command (me, super, WAIT_REPLY, n = fish_command (me, super, WAIT_REPLY,
"#STOR %lu /%s\n" "#STOR %lu \"/%s\"\n"
"echo '### 001'\n" "echo '### 001'\n"
"{\n" "{\n"
"file=/%s\n" "file=\"/%s\"\n"
"rest=%lu\n" "rest=%lu\n"
"while [ $rest -gt 0 ]\n" "while [ $rest -gt 0 ]\n"
"do\n" "do\n"
@ -653,12 +654,14 @@ fish_file_store(struct vfs_class *me, struct vfs_s_fh *fh, char *name, char *loc
(unsigned long) s.st_size); (unsigned long) s.st_size);
} }
close(h); close(h);
mhl_mem_free(quoted_name);
if ((fish_get_reply (me, SUP.sockr, NULL, 0) != COMPLETE) || was_error) if ((fish_get_reply (me, SUP.sockr, NULL, 0) != COMPLETE) || was_error)
ERRNOR (E_REMOTE, -1); ERRNOR (E_REMOTE, -1);
return 0; return 0;
error_return: error_return:
close(h); close(h);
fish_get_reply(me, SUP.sockr, NULL, 0); fish_get_reply(me, SUP.sockr, NULL, 0);
mhl_mem_free(quoted_name);
return -1; return -1;
} }
@ -674,7 +677,7 @@ fish_linear_start (struct vfs_class *me, struct vfs_s_fh *fh, off_t offset)
return 0; return 0;
quoted_name = name_quote (name, 0); quoted_name = name_quote (name, 0);
g_free (name); g_free (name);
name = quoted_name; name = mhl_shell_escap_dup(quoted_name);
fh->u.fish.append = 0; fh->u.fish.append = 0;
/* /*
@ -684,15 +687,15 @@ fish_linear_start (struct vfs_class *me, struct vfs_s_fh *fh, off_t offset)
* standard output (i.e. over the network). * standard output (i.e. over the network).
*/ */
offset = fish_command (me, FH_SUPER, WANT_STRING, offset = fish_command (me, FH_SUPER, WANT_STRING,
"#RETR /%s\n" "#RETR \"/%s\"\n"
"if dd if=/%s of=/dev/null bs=1 count=1 2>/dev/null ;\n" "if dd if=\"/%s\" of=/dev/null bs=1 count=1 2>/dev/null ;\n"
"then\n" "then\n"
"ls -ln /%s 2>/dev/null | (\n" "ls -ln \"/%s\" 2>/dev/null | (\n"
"read p l u g s r\n" "read p l u g s r\n"
"echo \"$s\"\n" "echo \"$s\"\n"
")\n" ")\n"
"echo '### 100'\n" "echo '### 100'\n"
"cat /%s\n" "cat \"/%s\"\n"
"echo '### 200'\n" "echo '### 200'\n"
"else\n" "else\n"
"echo '### 500'\n" "echo '### 500'\n"
@ -813,7 +816,7 @@ fish_send_command(struct vfs_class *me, struct vfs_s_super *super, const char *c
g_free (mpath); \ g_free (mpath); \
return -1; \ return -1; \
} \ } \
rpath = name_quote (crpath, 0); \ rpath = mhl_shell_escape_dup(name_quote (crpath, 0)); \
g_free (mpath); g_free (mpath);
#define POSTFIX(flags) \ #define POSTFIX(flags) \
@ -824,7 +827,7 @@ static int
fish_chmod (struct vfs_class *me, const char *path, int mode) 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" "chmod %4.4o \"/%s\" 2>/dev/null\n"
"echo '### 000'\n", "echo '### 000'\n",
mode & 07777, rpath, mode & 07777, rpath,
@ -858,11 +861,11 @@ static int fish_##name (struct vfs_class *me, const char *path1, const char *pat
return fish_send_command(me, super2, buf, OPT_FLUSH); \ return fish_send_command(me, super2, buf, OPT_FLUSH); \
} }
FISH_OP(rename, "#RENAME /%s /%s\n" FISH_OP(rename, "#RENAME \"/%s\" \"/%s\"\n"
"mv /%s /%s 2>/dev/null\n" "mv \"/%s\" \"/%s\" 2>/dev/null\n"
"echo '### 000'" ) "echo '### 000'" )
FISH_OP(link, "#LINK /%s /%s\n" FISH_OP(link, "#LINK \"/%s\" \"/%s\"\n"
"ln /%s /%s 2>/dev/null\n" "ln \"/%s\" \"/%s\" 2>/dev/null\n"
"echo '### 000'" ) "echo '### 000'" )
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)
@ -871,8 +874,8 @@ static int fish_symlink (struct vfs_class *me, const char *setto, const char *pa
PREFIX PREFIX
qsetto = name_quote (setto, 0); qsetto = name_quote (setto, 0);
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" "ln -s \"%s\" \"/%s\" 2>/dev/null\n"
"echo '### 000'\n", "echo '### 000'\n",
qsetto, rpath, qsetto, rpath); qsetto, rpath, qsetto, rpath);
g_free (qsetto); g_free (qsetto);
@ -897,16 +900,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\"\n"
"chown %s /%s 2>/dev/null\n" "chown %s \"/%s\" 2>/dev/null\n"
"echo '### 000'\n", "echo '### 000'\n",
sowner, rpath, sowner, rpath,
sowner, rpath); sowner, rpath);
fish_send_command (me, super, buf, OPT_FLUSH); 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), g_snprintf (buf, sizeof(buf),
"#CHGRP /%s /%s\n" "#CHGRP /%s \"/%s\"\n"
"chgrp %s /%s 2>/dev/null\n" "chgrp %s \"/%s\" 2>/dev/null\n"
"echo '### 000'\n", "echo '### 000'\n",
sgroup, rpath, sgroup, rpath,
sgroup, rpath); sgroup, rpath);
@ -919,8 +922,8 @@ 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" "rm -f \"/%s\" 2>/dev/null\n"
"echo '### 000'\n", "echo '### 000'\n",
rpath, rpath); rpath, rpath);
POSTFIX(OPT_FLUSH); POSTFIX(OPT_FLUSH);
@ -933,8 +936,8 @@ static int fish_mkdir (struct vfs_class *me, const char *path, mode_t mode)
(void) mode; (void) mode;
g_snprintf(buf, sizeof(buf), g_snprintf(buf, sizeof(buf),
"#MKD /%s\n" "#MKD \"/%s\"\n"
"mkdir /%s 2>/dev/null\n" "mkdir \"/%s\" 2>/dev/null\n"
"echo '### 000'\n", "echo '### 000'\n",
rpath, rpath); rpath, rpath);
POSTFIX(OPT_FLUSH); POSTFIX(OPT_FLUSH);
@ -944,8 +947,8 @@ 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" "rmdir \"/%s\" 2>/dev/null\n"
"echo '### 000'\n", "echo '### 000'\n",
rpath, rpath); rpath, rpath);
POSTFIX(OPT_FLUSH); POSTFIX(OPT_FLUSH);