Changeset ff25de6

Timestamp:

Nov 17, 2013, 3:44:14 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

release-1.9

Children:

e2e4072

Parents:

a634103

git-author:

Alex Dehnert <adehnert@mit.edu> (05/29/13 01:42:24)

git-committer:

Anders Kaseorg <andersk@mit.edu> (11/17/13 03:44:14)

Message:

Update and make configurable the default format

- Rather than http://zephyr.1ts.org/wiki/df, use http://mit.edu/df, which is
  shorter
- Rather than a bare URL, prefix "Config error: see " to make it clearer what
  is going on
- Make the default format configurable using ./configure, to aid users with
  particularly severe length constraints

(cherry picked from commit 80d7b445c48a5c63361e0ae972d0b0264d54ed65)

Files:

• configure.ac (modified) (1 diff)
• zephyr.c (modified) (1 diff)

configure.ac

@@ -9 +9 @@
 AC_PROG_CC
 AC_PROG_CC_C99
+
+AC_ARG_WITH([zephyr-default-format],
+    [AS_HELP_STRING([--with-zephyr-default-format],
+                    [value for the default format zephyrgram field])],
+    [
+        case $withval in
+            yes) withval='Config error: see http://mit.edu/df';;
+            no) withval='';;
+        esac
+        zephyr_default_format=$withval
+    ],
+    [zephyr_default_format='Config error: see http://mit.edu/df'])
+AC_DEFINE_UNQUOTED(
+    [ZEPHYR_DEFAULT_FORMAT], ["$zephyr_default_format"],
+    [Value for the default format zephyrgram field]
+)
 
 AC_ARG_WITH([stack-protector],

zephyr.c

@@ -729 +729 @@
   if (!owl_zwrite_recip_is_personal(recipient) && *owl_global_get_zsender(&g))
     notice.z_sender = zsender = long_zuser(owl_global_get_zsender(&g));
-  notice.z_default_format=zstr("http://zephyr.1ts.org/wiki/df");
+  notice.z_default_format=zstr(ZEPHYR_DEFAULT_FORMAT);
   if (opcode) notice.z_opcode=zstr(opcode);