9:34 a.m.
Two auxiliary functions for readline to support space character escaping
in filenames in future.
Escaping function used to be parse_quoted_string and there is its
un-escaping counterpart.
---
fish/rl.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
fish/rl.h | 25 +++++++++++++++++++
2 files changed, 99 insertions(+), 11 deletions(-)
create mode 100644 fish/rl.h
diff --git a/fish/rl.c b/fish/rl.c
index c98ce8e..bdf2eb1 100644
--- a/fish/rl.c
+++ b/fish/rl.c
@@ -16,7 +16,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-static int
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gettext.h>
+#include <errno.h>
+
+#include <c-ctype.h>
+
+#include "guestfs.h"
+#include "guestfs-internal-frontend.h"
+#include "rl.h"
+
+int
hexdigit (char d)
{
switch (d) {
@@ -27,12 +41,14 @@ hexdigit (char d)
}
}
-static ssize_t
-parse_quoted_string (char *p)
+/* backslash unescape for readline */
+char *
+bs_unescape_filename (const char *str)
{
- char *start = p;
+ char *p = strdup (str);
+ const char *start = p;
- for (; *p && *p != '"'; p++) {
+ for (; *p; p++) {
if (*p == '\\') {
int m = 1, c;
@@ -48,6 +64,7 @@ parse_quoted_string (char *p)
case '"': *p = '"'; break;
case '\'': *p = '\''; break;
case '?': *p = '?'; break;
+ case ' ': *p = ' '; break;
case '0'...'7': /* octal escape - always 3 digits */
m = 3;
@@ -78,17 +95,63 @@ parse_quoted_string (char *p)
error:
fprintf (stderr, _("%s: invalid escape sequence in string (starting at
offset %d)\n"),
program_name, (int) (p - start));
- return -1;
+ return NULL;
}
memmove (p+1, p+1+m, strlen (p+1+m) + 1);
}
}
- if (!*p) {
- fprintf (stderr, _("%s: unterminated double quote\n"), program_name);
- return -1;
+ return (char *)start;
+}
+
+/* backslash scape */
+char *
+bs_escape_filename (const char *p)
+{
+ const char *start = p;
+ /* four times original length - if all chars are unprintable
+ * new string would be \xXY\xWZ */
+ char *n = malloc (strlen (p) * 4 + 1);
+ char *nstart = n;
+
+ for (; *p; p++, n++) {
+ int m = 1;
+
+ switch (*p) {
+ case '\\': break;
+ case '\a': *(n++) = '\\'; *n = 'a'; break;
+ case '\b': *(n++) = '\\'; *n = 'b'; break;
+ case '\f': *(n++) = '\\'; *n = 'f'; break;
+ case '\n': *(n++) = '\\'; *n = 'n'; break;
+ case '\r': *(n++) = '\\'; *n = 'r'; break;
+ case '\t': *(n++) = '\\'; *n = 't'; break;
+ case '\v': *(n++) = '\\'; *n = 'v'; break;
+ case '"': *(n++) = '\\'; *n = '"'; break;
+ case '\'': *(n++) = '\\'; *n = '\''; break;
+ case '?': *(n++) = '\\'; *n = '?'; break;
+ case ' ': *(n++) = '\\'; *n = ' '; break;
+
+ default:
+ /* Hexadecimal escape unprintable character. This violates identity
+ * after composition of bs_escape_filename after bs_unescape_filename
+ * (i.e. can escape some characters differently). */
+ if (!c_isprint (*p)) {
+ int r = sprintf (n, "\\x%x", (int) (*p & 0xff)) - 1;
+ if (r < 0) {
+ return NULL;
+ }
+ n += r;
+ } else {
+ *n = *p;
+ }
+ break;
+ error:
+ fprintf (stderr, _("%s: invalid escape sequence in string (starting at
offset %d)\n"),
+ program_name, (int) (p - start));
+ return NULL;
+ }
}
- *p = '\0';
- return p - start;
+ *n = '\0';
+ return nstart;
}
diff --git a/fish/rl.h b/fish/rl.h
new file mode 100644
index 0000000..8ac8da2
--- /dev/null
+++ b/fish/rl.h
@@ -0,0 +1,25 @@
+/* guestfish - guest filesystem shell
+ * Copyright (C) 2009-2014 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _FISH_RL_H
+#define _FISH_RL_H
+
+extern char * bs_escape_filename (const char *p);
+extern char * bs_unescape_filename (const char *p);
+
+#endif /* !_FISH_RL_H */
--
1.9.3