Changeset 9a7b4f2

Timestamp:

Apr 8, 2010, 10:00:31 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

88f0dae

Parents:

7d03c8d

git-author:

Nelson Elhage <nelhage@ksplice.com> (03/17/10 23:11:45)

git-committer:

Nelson Elhage <nelhage@mit.edu> (04/08/10 22:00:31)

Message:

Use zcrypt from our own bin directory.

Files:

• barnowl (modified) (1 diff)
• configure.ac (modified) (1 diff)
• functions.c (modified) (3 diffs)
• message.c (modified) (1 diff)
• util.c (modified) (1 diff)

barnowl

@@ -13 +13 @@
 
 export BARNOWL_DATA_DIR="$SRCDIR/perl/"
+export BARNOWL_BIN_DIR="$SRCDIR/"
 exec "$EXE" "$@"

configure.ac

@@ -113 +113 @@
 AC_DEFINE_UNQUOTED([DATADIR],["${prefix}/share/${PACKAGE}"],
                    [Package data directory])
+AC_DEFINE_UNQUOTED([BINDIR],["${prefix}/bin"],
+                   [Binary directory])
 
 dnl Checks for typedefs, structures, and compiler characteristics.

functions.c

@@ -404 +404 @@
   owl_message *m;
   const char *argv[7];
+  char *zcrypt;
   int rv, status;
 
@@ -415 +416 @@
   mymsg=owl_zwrite_get_message(&z);
 
+  zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir());
   argv[0] = "zcrypt";
   argv[1] = "-E";
@@ -421 +423 @@
   argv[6] = NULL;
 
-  rv = call_filter("zcrypt", argv, mymsg, &cryptmsg, &status);
+  rv = call_filter(zcrypt, argv, mymsg, &cryptmsg, &status);
+
+  owl_free(zcrypt);
 
   if (rv || status) {

message.c

@@ -851 +851 @@
     int rv;
     int status;
-
-    rv = call_filter("zcrypt", argv, owl_message_get_body(m), &out, &status);
+    char *zcrypt;
+
+    zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir());
+
+    rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
+    owl_free(zcrypt);
 
     if(!rv && !status) {

util.c

@@ -609 +609 @@
 }
 
+const char * owl_get_bindir(void)
+{
+  const char * bindir = getenv("BARNOWL_BIN_DIR");
+  if(bindir != NULL)
+    return bindir;
+  return BINDIR;
+}
+
 /* Strips format characters from a valid utf-8 string. Returns the
    empty string if 'in' does not validate. */