Changeset 9a7b4f2


Ignore:
Timestamp:
Apr 8, 2010, 10:00:31 PM (11 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, 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:
5 edited

Legend:

Unmodified
Added
Removed
  • barnowl

    rd5ef539 r9a7b4f2  
    1313
    1414export BARNOWL_DATA_DIR="$SRCDIR/perl/"
     15export BARNOWL_BIN_DIR="$SRCDIR/"
    1516exec "$EXE" "$@"
  • configure.ac

    r7d03c8d r9a7b4f2  
    113113AC_DEFINE_UNQUOTED([DATADIR],["${prefix}/share/${PACKAGE}"],
    114114                   [Package data directory])
     115AC_DEFINE_UNQUOTED([BINDIR],["${prefix}/bin"],
     116                   [Binary directory])
    115117
    116118dnl Checks for typedefs, structures, and compiler characteristics.
  • functions.c

    rd564c3d r9a7b4f2  
    404404  owl_message *m;
    405405  const char *argv[7];
     406  char *zcrypt;
    406407  int rv, status;
    407408
     
    415416  mymsg=owl_zwrite_get_message(&z);
    416417
     418  zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir());
    417419  argv[0] = "zcrypt";
    418420  argv[1] = "-E";
     
    421423  argv[6] = NULL;
    422424
    423   rv = call_filter("zcrypt", argv, mymsg, &cryptmsg, &status);
     425  rv = call_filter(zcrypt, argv, mymsg, &cryptmsg, &status);
     426
     427  owl_free(zcrypt);
    424428
    425429  if (rv || status) {
  • message.c

    rd564c3d r9a7b4f2  
    851851    int rv;
    852852    int status;
    853 
    854     rv = call_filter("zcrypt", argv, owl_message_get_body(m), &out, &status);
     853    char *zcrypt;
     854
     855    zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir());
     856
     857    rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
     858    owl_free(zcrypt);
    855859
    856860    if(!rv && !status) {
  • util.c

    rf449096 r9a7b4f2  
    609609}
    610610
     611const char * owl_get_bindir(void)
     612{
     613  const char * bindir = getenv("BARNOWL_BIN_DIR");
     614  if(bindir != NULL)
     615    return bindir;
     616  return BINDIR;
     617}
     618
    611619/* Strips format characters from a valid utf-8 string. Returns the
    612620   empty string if 'in' does not validate. */
Note: See TracChangeset for help on using the changeset viewer.