Changeset 282ec9b

Timestamp:

Jul 9, 2003, 2:12:36 AM (20 years ago)

Author:

Erik Nygren <nygren@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:

a7a42b9

Parents:

5d9c664

Message:

        Make sure that a newline is always at the end of messages
	        returned by perl style formatting functions.
	Add owl::login to legacy variables populated for format_msg.

Files:

• ChangeLog (modified) (1 diff)
• owl.h (modified) (1 diff)
• perlwrap.pm (modified) (1 diff)
• style.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
+
+2.0.8-pre-3
+        Make sure that a newline is always at the end of messages
+                returned by perl style formatting functions.
+        Add owl::login to legacy variables populated for format_msg.
 
 2.0.8-pre-2

owl.h

@@ -21 +21 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.8-pre-2
-#define OWL_VERSION_STRING "2.0.8-pre-2"
+#define OWL_VERSION         2.0.8-pre-3
+#define OWL_VERSION_STRING "2.0.8-pre-3"
 
 #define OWL_DEBUG 0

perlwrap.pm

@@ -123 +123 @@
     $owl::time       = $m->time      ;
     $owl::host       = $m->host      ;
+    $owl::login      = $m->login     ;
     if ($m->fields) {
         @owl::fields = @{$m->fields};

style.c

@@ -54 +54 @@
     (* s->formatfunc)(fm, m);
   } else if (s->type==OWL_STYLE_TYPE_PERL) {
-    char *body, *indent;
+    char *body, *indent, curlen;
 
     /* run the perl function */
     body=owl_perlconfig_getmsg(m, 1, s->perlfuncname);
     
-    /* indent */
-    indent=owl_malloc(strlen(body)+owl_text_num_lines(body)*OWL_TAB+10);
+    /* indent and ensure ends with a newline */
+    indent=owl_malloc(strlen(body)+(owl_text_num_lines(body))*OWL_TAB+10);
     owl_text_indent(indent, body, OWL_TAB);
-    
+    curlen = strlen(indent);
+    if (curlen==0 || indent[curlen-1] != '\n') {
+      indent[curlen] = '\n';
+      indent[curlen+1] = '\0';
+    }
+
     /* fmtext_append.  This needs to change */
     owl_fmtext_append_ztext(fm, indent);