Make "short" context in @part actually work

diff --git a/server/disorder-cgi.h b/server/disorder-cgi.h
index 9da897591fc701eaa841e484f009d9960bdc2eca..beb858148a3488d99fbdd3e58e7236623ba0febf 100644 (file)
--- a/server/disorder-cgi.h
+++ b/server/disorder-cgi.h
@@ -56,6 +56,7 @@
 #include "split.h"
 #include "mime.h"
 #include "sendmail.h"
 #include "split.h"
 #include "mime.h"
 #include "sendmail.h"

+#include "charset.h"

 
 extern disorder_client *dcgi_client;
 extern char *dcgi_cookie;
 
 extern disorder_client *dcgi_client;
 extern char *dcgi_cookie;

diff --git a/server/macros-disorder.c b/server/macros-disorder.c
index 2dc809852d648c4533d4cf0172b779b1117c20c3..eff631325229ac98701516533d4b0e9b30835c6b 100644 (file)
--- a/server/macros-disorder.c
+++ b/server/macros-disorder.c
@@ -149,7 +149,7 @@ static int exp_part(int nargs,
                    void attribute((unused)) *u) {
   const char *track = args[0], *part = args[1];
   const char *context = nargs > 2 ? args[2] : "display";
                    void attribute((unused)) *u) {
   const char *track = args[0], *part = args[1];
   const char *context = nargs > 2 ? args[2] : "display";

-  char *s;
+  const char *s;

 
   if(track[0] != '/') {
     struct queue_entry *q = dcgi_findtrack(track);
 
   if(track[0] != '/') {
     struct queue_entry *q = dcgi_findtrack(track);


@@ -160,11 +160,14 @@ static int exp_part(int nargs,
       return 0;
   }
   if(dcgi_client
       return 0;
   }
   if(dcgi_client

-     && !disorder_part(dcgi_client, &s,
+     && !disorder_part(dcgi_client, (char **)&s,

                        track,
                        !strcmp(context, "short") ? "display" : context,
                        track,
                        !strcmp(context, "short") ? "display" : context,

-                       part))
+                       part)) {
+    if(!strcmp(context, "short"))
+      s = truncate_for_display(s, config->short_display);

     return sink_writes(output, cgi_sgmlquote(s)) < 0 ? -1 : 0;
     return sink_writes(output, cgi_sgmlquote(s)) < 0 ? -1 : 0;

+  }

   return 0;
 }
 
   return 0;
 }