File bug199924.diff of Package minicom

Overview Repositories Revisions Requests Users Attributes Meta

File bug199924.diff of Package minicom (Revision 500e2ae1cdc2da30774ffa3451d93b47)

Currently displaying revision 500e2ae1cdc2da30774ffa3451d93b47 , Show latest

Index: minicom-2.4/src/util.c
===================================================================
--- minicom-2.4.orig/src/util.c
+++ minicom-2.4/src/util.c
@@ -115,7 +115,7 @@ int fastexec(char *cmd)
 
   /* Delete escape-characters ment for the shell */
   p = cmd;
-  while ((p = strchr(p, '\\')))
+  while ((p = strchr(p, '\\')) && *(p+1) != ' ')
     memmove(p, p + 1, strlen(p+1));
 
   /* Split line into words */
Index: minicom-2.4/src/file.c
===================================================================
--- minicom-2.4.orig/src/file.c
+++ minicom-2.4/src/file.c
@@ -534,6 +534,8 @@ static char *concat_list(GETSDIR_ENTRY *
 {
   GETSDIR_ENTRY *my_d;
   int indxr, len;
+  int i;
+  char *j;
 
   my_d = d;
   for (indxr = nrents, len = 0; indxr; --indxr, ++my_d)
@@ -553,8 +555,18 @@ static char *concat_list(GETSDIR_ENTRY *
     for (indxr = nrents; indxr; --indxr, ++my_d)
       if (my_d->cflags & FL_TAG) {
         /* this could be *much* more efficient */
-        strcat(ret_buf, my_d->fname);
-        strcat(ret_buf, " ");
+        for (i = strlen(ret_buf), j = my_d->fname; *j; j++) {
+          if (*j == ' ') {
+            if ((ret_buf = (char*)realloc(ret_buf, ++len)) == NULL) {
+              file_tell(_("Too many files tagged - buffer would overflow"));
+              return(NULL);
+            }
+            ret_buf[i++] = '\\';
+          }
+          ret_buf[i++] = *j;
+        }
+        ret_buf[i++] = ' ';
+        ret_buf[i]   = '\0';
       }
 
     ret_buf[strlen(ret_buf) - 1] = (char)0;

Places

File bug199924.diff of Package minicom (Revision 500e2ae1cdc2da30774ffa3451d93b47)

Places