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

Renamed functions shell_escape (to strutils_shell_escape) and shell_unescape (to strutils_shell_unescape)

Просмотр исходного кода 
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Этот коммит содержится в:
Slava Zanko 2009-06-09 12:12:17 +03:00
родитель 75fe3bf3a8
Коммит f018970577
6 изменённых файлов: 26 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/command.c
Просмотреть файл

@ -68,7 +68,7 @@ examine_cd (const char *_path)
const char *t; const char *t;
/* Tilde expansion */ /* Tilde expansion */
path = shell_unescape(_path); path = strutils_shell_unescape(_path);
path_tilde = tilde_expand (path); path_tilde = tilde_expand (path);
/* Leave space for further expansion */ /* Leave space for further expansion */

10
src/complete.c
Просмотреть файл

@ -93,12 +93,12 @@ filename_completion_function (const char * text, int state, INPUT_COMPLETE_FLAGS
char * result; char * result;
char * e_result; char * e_result;
u_text = shell_unescape (text); u_text = strutils_shell_unescape (text);
result = filename_completion_function (u_text, state, flags & (~INPUT_COMPLETE_SHELL_ESC)); result = filename_completion_function (u_text, state, flags & (~INPUT_COMPLETE_SHELL_ESC));
g_free (u_text); g_free (u_text);
e_result = shell_escape (result); e_result = strutils_shell_escape (result);
g_free (result); g_free (result);
return e_result; return e_result;
@ -482,7 +482,7 @@ command_completion_function (const char *_text, int state, INPUT_COMPLETE_FLAGS
if (!(flags & INPUT_COMPLETE_COMMANDS)) if (!(flags & INPUT_COMPLETE_COMMANDS))
return 0; return 0;
text = shell_unescape(_text); text = strutils_shell_unescape(_text);
flags &= ~INPUT_COMPLETE_SHELL_ESC; flags &= ~INPUT_COMPLETE_SHELL_ESC;
if (!state) { /* Initialize us a little bit */ if (!state) { /* Initialize us a little bit */
@ -506,7 +506,7 @@ command_completion_function (const char *_text, int state, INPUT_COMPLETE_FLAGS
if (p) { if (p) {
char *temp_p = p; char *temp_p = p;
p = shell_escape (p); p = strutils_shell_escape (p);
g_free (temp_p); g_free (temp_p);
} }
@ -564,7 +564,7 @@ command_completion_function (const char *_text, int state, INPUT_COMPLETE_FLAGS
path = NULL; path = NULL;
} else if ((p = strrchr (found, PATH_SEP)) != NULL) { } else if ((p = strrchr (found, PATH_SEP)) != NULL) {
char *tmp = found; char *tmp = found;
found = shell_escape (p + 1); found = strutils_shell_escape (p + 1);
g_free (tmp); g_free (tmp);
} }

4
src/file.c
Просмотреть файл

@ -2017,10 +2017,10 @@ panel_operate (void *source_panel, FileOperation operation,
g_free(temp); g_free(temp);
temp3 = source_with_path; temp3 = source_with_path;
source_with_path = shell_unescape(source_with_path); source_with_path = strutils_shell_unescape(source_with_path);
g_free(temp3); g_free(temp3);
temp3 = temp2; temp3 = temp2;
temp2 = shell_unescape(temp2); temp2 = strutils_shell_unescape(temp2);
g_free(temp3); g_free(temp3);
switch (operation) { switch (operation) {

4
src/strescape.c
Просмотреть файл

@ -62,7 +62,7 @@
or NULL when NULL string is passed. or NULL when NULL string is passed.
*/ */
char * char *
shell_escape (const char *src) strutils_shell_escape (const char *src)
{ {
GString *str; GString *str;
char *result = NULL; char *result = NULL;
@ -110,7 +110,7 @@ shell_escape (const char *src)
return unescaped string (which needs to be freed) return unescaped string (which needs to be freed)
*/ */
char * char *
shell_unescape (const char *text) strutils_shell_unescape (const char *text)
{ {
GString *str; GString *str;
char *result = NULL; char *result = NULL;

6
src/strescape.h
Просмотреть файл

@ -15,8 +15,8 @@
/*** declarations of public functions ************************************************************/ /*** declarations of public functions ************************************************************/
gboolean shell_is_char_escaped (const char *); gboolean strutils_is_char_escaped (const char *);
char *shell_unescape (const char *); char *strutils_shell_unescape (const char *);
char *shell_escape (const char *); char *strutils_shell_escape (const char *);
#endif #endif

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

@ -394,7 +394,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
gettimeofday(&dir->timestamp, NULL); gettimeofday(&dir->timestamp, NULL);
dir->timestamp.tv_sec += fish_directory_timeout; dir->timestamp.tv_sec += fish_directory_timeout;
quoted_path = shell_escape (remote_path); quoted_path = strutils_shell_escape (remote_path);
shell_commands = g_strconcat( shell_commands = g_strconcat(
"#LIST /%s\n" "#LIST /%s\n"
"if `perl -v > /dev/null 2>&1` ; then\n" "if `perl -v > /dev/null 2>&1` ; then\n"
@ -410,12 +410,12 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
"my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = lstat(\"$dirname/$filename\");\n" "my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = lstat(\"$dirname/$filename\");\n"
"my $mloctime= scalar localtime $mtime;\n" "my $mloctime= scalar localtime $mtime;\n"
, ,
"my $shell_escape_regex= s/([;<>\\*\\|`&\\$!#\\(\\)\\[\\]\\{\\}:'\\''\"\\ \\\\])/\\\\$1/g;\n" "my $strutils_shell_escape_regex= s/([;<>\\*\\|`&\\$!#\\(\\)\\[\\]\\{\\}:'\\''\"\\ \\\\])/\\\\$1/g;\n"
"my $e_filename = $filename;\n" "my $e_filename = $filename;\n"
"$e_filename =~ $shell_escape_regex;\n" "$e_filename =~ $strutils_shell_escape_regex;\n"
"if (S_ISLNK($mode) ) {\n" "if (S_ISLNK($mode) ) {\n"
"my $linkname = readlink (\"$dirname/$filename\");\n" "my $linkname = readlink (\"$dirname/$filename\");\n"
"$linkname =~ $shell_escape_regex;\n" "$linkname =~ $strutils_shell_escape_regex;\n"
"\n" "\n"
"printf(\"R%%o %%o $uid.$gid\\n" "printf(\"R%%o %%o $uid.$gid\\n"
"S$size\\n" "S$size\\n"
@ -545,12 +545,12 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
ent->name = str_dup_range(filename, filename_bound); ent->name = str_dup_range(filename, filename_bound);
temp = ent->name; temp = ent->name;
ent->name = shell_unescape(ent->name); ent->name = strutils_shell_unescape(ent->name);
g_free(temp); g_free(temp);
ent->ino->linkname = str_dup_range(linkname, linkname_bound); ent->ino->linkname = str_dup_range(linkname, linkname_bound);
temp = ent->ino->linkname; temp = ent->ino->linkname;
ent->ino->linkname = shell_unescape(ent->ino->linkname); ent->ino->linkname = strutils_shell_unescape(ent->ino->linkname);
g_free(temp); g_free(temp);
} else { } else {
/* we expect: "escaped-name" */ /* we expect: "escaped-name" */
@ -567,7 +567,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
} }
ent->name = str_dup_range(filename, filename_bound); ent->name = str_dup_range(filename, filename_bound);
temp = ent->name; temp = ent->name;
ent->name = shell_unescape(ent->name); ent->name = strutils_shell_unescape(ent->name);
g_free(temp); g_free(temp);
} }
break; break;
@ -686,7 +686,7 @@ 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.
*/ */
quoted_name = shell_escape(name); quoted_name = strutils_shell_escape(name);
print_vfs_message(_("fish: store %s: sending command..."), quoted_name ); print_vfs_message(_("fish: store %s: sending command..."), quoted_name );
/* FIXME: File size is limited to ULONG_MAX */ /* FIXME: File size is limited to ULONG_MAX */
@ -784,7 +784,7 @@ fish_linear_start (struct vfs_class *me, struct vfs_s_fh *fh, off_t offset)
name = vfs_s_fullpath (me, fh->ino); name = vfs_s_fullpath (me, fh->ino);
if (!name) if (!name)
return 0; return 0;
quoted_name = shell_escape(name); quoted_name = strutils_shell_escape(name);
fh->u.fish.append = 0; fh->u.fish.append = 0;
/* /*
@ -925,7 +925,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 = shell_escape(crpath); \ rpath = strutils_shell_escape(crpath); \
g_free (mpath); g_free (mpath);
#define POSTFIX(flags) \ #define POSTFIX(flags) \
@ -960,9 +960,9 @@ static int fish_##name (struct vfs_class *me, const char *path1, const char *pat
g_free (mpath2); \ g_free (mpath2); \
return -1; \ return -1; \
} \ } \
rpath1 = shell_escape (crpath1); \ rpath1 = strutils_shell_escape (crpath1); \
g_free (mpath1); \ g_free (mpath1); \
rpath2 = shell_escape (crpath2); \ rpath2 = strutils_shell_escape (crpath2); \
g_free (mpath2); \ g_free (mpath2); \
g_snprintf(buf, sizeof(buf), string "\n", rpath1, rpath2, rpath1, rpath2); \ g_snprintf(buf, sizeof(buf), string "\n", rpath1, rpath2, rpath1, rpath2); \
g_free (rpath1); \ g_free (rpath1); \
@ -981,7 +981,7 @@ static int fish_symlink (struct vfs_class *me, const char *setto, const char *pa
{ {
char *qsetto; char *qsetto;
PREFIX PREFIX
qsetto = 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" "ln -s %s /%s 2>/dev/null\n"