mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

shell_unescape: fix recently added breakage of decoding escapy strings

Browse Source 
This pach fixes two issues (both appear only in escapy strings):
  * tail cut of escapy string when '\\' is met
  * head cut of escapy string when '\\' is met :]

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
This commit is contained in:
Sergei Trofimovich 2009-02-07 16:15:41 +02:00
parent 96fc77bc3e
commit 97bdf084f8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util.c
View File

@ -1611,7 +1611,7 @@ shell_unescape(const char* text)
result = g_strdup(text);
return result;
}
str = g_string_new("");
str = g_string_new_len(text, readptr - text);
/* if we're here, we're standing on the first '\' */
char c;
@ -1622,6 +1622,9 @@ shell_unescape(const char* text)
readptr++;
switch ((c = *readptr))
{
case '\0': /* end of string! malformed escape string */
goto out;
case 'n': g_string_append_c(str,'\n'); break;
case 'r': g_string_append_c(str,'\r'); break;
case 't': g_string_append_c(str,'\t'); break;
@ -1646,8 +1649,6 @@ shell_unescape(const char* text)
case '`':
case '"':
case ';':
case '\0': /* end of string! malformed escape string */
goto out;
default:
g_string_append_c(str,c); break;
}
@ -1659,7 +1660,6 @@ shell_unescape(const char* text)
readptr++;
}
out:
g_string_append_c(str,'\0');
result = str->str;
g_string_free(str,FALSE);