[Qemacs-commit] qemacs archive.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/04/24 22:14:11

Modified files:
        .              : archive.c 

Log message:
        fix filtering commands
        
        * fix bug in http and ftp requests with embedded spaces and shell 
characters
        * quote filename in man_buffer_load
        * recognize nroff man pages starting with bare \"

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/archive.c?cvsroot=qemacs&r1=1.7&r2=1.8

Patches:
Index: archive.c
===================================================================
RCS file: /sources/qemacs/qemacs/archive.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- archive.c   17 Apr 2014 17:24:19 -0000      1.7
+++ archive.c   24 Apr 2014 22:14:11 -0000      1.8
@@ -318,7 +318,7 @@
     char cmd[1024];
 
     eb_clear(b);
-    snprintf(cmd, sizeof(cmd), "wget -q -O - %s", b->filename);
+    snprintf(cmd, sizeof(cmd), "wget -q -O - '%s'", b->filename);
     new_shell_buffer(b, get_basename(b->filename), NULL, cmd,
                      SF_INFINITE | SF_AUTO_CODING | SF_AUTO_MODE);
     /* XXX: should check for wget error */
@@ -375,7 +375,9 @@
    
     if (match_extension(p->real_filename, "1|1SSL|2|3|3SSL|4|5|6|7|8")
     &&  !strchr(p->filename, '.')
-    &&  (p->buf[0] == '.' || !memcmp(p->buf, "'\\\"", 3))) {
+    &&  (p->buf[0] == '.' ||
+         !memcmp(p->buf, "'\\\"", 3) ||
+         !memcmp(p->buf, "\\\"", 2))) {
     has_man:
         if (p->b && p->b->priv_data) {
             /* buffer loaded, re-selecting mode causes buffer reload */
@@ -395,7 +397,7 @@
     char cmd[1024];
 
     eb_clear(b);
-    snprintf(cmd, sizeof(cmd), "man %s", b->filename);
+    snprintf(cmd, sizeof(cmd), "man '%s'", b->filename);
     new_shell_buffer(b, get_basename(b->filename), NULL, cmd,
                      SF_COLOR | SF_INFINITE);
     /* XXX: should check for man error */