Changeset cee1f25

Timestamp:

Oct 28, 2003, 10:30:47 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

c7041b3

Parents:

12c35df

Message:

Fixed double quoting in smartzpunt

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (6 diffs)
• owl.h (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
-
+2.0.12-pre-2
+        Fixed double quoting in smartzpunt
+        
 2.0.12-pre-1
         Fixed replies to loopback messages

functions.c

@@ -2675 +2675 @@
   }
 
-  mclass = owl_text_quote(owl_message_get_class(m), OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-  minst = owl_text_quote(owl_message_get_instance(m), OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+  mclass = owl_message_get_class(m);
+  minst = owl_message_get_instance(m);
   if (!mclass || !*mclass || *mclass==' '
       || (!strcasecmp(mclass, "message") && !strcasecmp(minst, "personal"))
@@ -2684 +2684 @@
   } else {
     cmdprefix = "start-command zpunt ";
-    cmd = owl_malloc(strlen(cmdprefix)+strlen(mclass)+strlen(minst)+3);
+    cmd = owl_malloc(strlen(cmdprefix)+strlen(mclass)+strlen(minst)+10);
     strcpy(cmd, cmdprefix);
+    strcat(cmd, owl_getquoting(mclass));
     strcat(cmd, mclass);
+    strcat(cmd, owl_getquoting(mclass));
     if (type) {
       strcat(cmd, " ");
+      strcat(cmd, owl_getquoting(minst));
       strcat(cmd, minst);
+      strcat(cmd, owl_getquoting(minst));
     } else {
       strcat(cmd, " *");
@@ -2696 +2700 @@
     owl_free(cmd);
   }
-  owl_free(mclass);
-  owl_free(minst);
 }
 
@@ -2768 +2770 @@
   } else {
     quoted=owl_text_quote(class, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+    owl_text_tr(quoted, ' ', '.');
     sprintf(buff, "%s ^%s$", buff, quoted);
     owl_free(quoted);
@@ -2775 +2778 @@
   } else {
     quoted=owl_text_quote(inst, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+    owl_text_tr(quoted, ' ', '.');
     sprintf(buff, "%s and instance ^%s$", buff, quoted);
     owl_free(quoted);
@@ -2780 +2784 @@
   if (strcmp(recip, "*")) {
     quoted=owl_text_quote(recip, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+    owl_text_tr(quoted, ' ', '.');
     sprintf(buff, "%s and recipient ^%s$", buff, quoted);
     owl_free(quoted);

owl.h

@@ -19 +19 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.12-pre-1
-#define OWL_VERSION_STRING "2.0.12-pre-1"
+#define OWL_VERSION         2.0.12-pre-2
+#define OWL_VERSION_STRING "2.0.12-pre-2"
 
 /* Feature that is being tested to redirect stderr through a pipe.