Changeset cffb044

Timestamp:

Apr 19, 2013, 3:23:18 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

487cc2b (diff), 0625919 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 0625919d1e483ec9ba11021e1281e05f9d2b877a into 487cc2b1b658bcc696e3951201320be455fc86e4

Files:

• Makefile.am (modified) (4 diffs)
• barnowl-wrapper.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• owl.c (modified) (2 diffs)
• zcrypt.c (modified) (6 diffs)

Makefile.am

@@ -4 +4 @@
 GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
 
-bin_PROGRAMS = barnowl.bin
+bin_PROGRAMS = bin/barnowl
 if ENABLE_ZCRYPT
 bin_PROGRAMS += zcrypt
@@ -11 +11 @@
 zcrypt_SOURCES = zcrypt.c filterproc.c
 
-check_PROGRAMS = tester.bin
+check_PROGRAMS = bin/tester
 dist_check_DATA = t
 dist_check_SCRIPTS = runtests.sh
 
-bin_SCRIPTS = barnowl
+noinst_SCRIPTS = barnowl
 check_SCRIPTS = tester
 
-barnowl tester: %: barnowl-wrapper.in %.bin Makefile
+barnowl tester: %: barnowl-wrapper.in bin/% Makefile
         sed \
             -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \
@@ -25 +25 @@
         chmod +x $@
 
-barnowl_bin_SOURCES = $(BASE_SRCS) \
+bin_barnowl_SOURCES = $(BASE_SRCS) \
      owl.h owl_perl.h \
      owl.c
-nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
+nodist_bin_barnowl_SOURCES = $(GEN_C) $(GEN_H)
 
 dist_man_MANS = doc/barnowl.1
 dist_doc_DATA = doc/intro.txt doc/advanced.txt
 
-barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_barnowl_LDADD = compat/libcompat.a libfaim/libfaim.a
 
-tester_bin_SOURCES = $(BASE_SRCS) \
+bin_tester_SOURCES = $(BASE_SRCS) \
      owl.h owl_perl.h \
      tester.c
-nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
+nodist_bin_tester_SOURCES = $(GEN_C) $(GEN_H)
 
-tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_tester_LDADD = compat/libcompat.a libfaim/libfaim.a
 
 TESTS=runtests.sh
@@ -96 +96 @@
         $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
 
-do_transform = $(shell echo '$(1)' | sed '$(transform)')
-install-exec-hook:
-        mv -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl.bin) \
-              $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
-
-uninstall-local:
-        rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
-
-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)
+CLEANFILES = $(BUILT_SOURCES) $(noinst_SCRIPTS) $(check_SCRIPTS)
 EXTRA_DIST = \
     autogen.sh \

barnowl-wrapper.in

@@ -1 +1 @@
 #!/bin/sh
 # This is a wrapper script to point BARNOWL_DATA_DIR at the source dir
-# if we're running from a build tree. barnowl.bin is the actual built
+# if we're running from a build tree. bin/barnowl is the actual built
 # binary.
 
-EXE="$0.bin"
+EXE="@abs_builddir@/bin/$(basename "$0")"
 
 if test ! -x "$EXE"; then

configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT([BarnOwl],[1.10dev],[bug-barnowl@mit.edu])
-AM_INIT_AUTOMAKE([1.7.0 -Wall -Wno-portability foreign])
+AM_INIT_AUTOMAKE([1.7.0 foreign std-options -Wall -Wno-portability])
 AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

owl.c

@@ -34 +34 @@
 } owl_options;
 
-void usage(void)
+void usage(FILE *file)
 {
-  fprintf(stderr, "Barnowl version %s\n", OWL_VERSION_STRING);
-  fprintf(stderr, "Usage: barnowl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n");
-  fprintf(stderr, "  -n,--no-subs        don't load zephyr subscriptions\n");
-  fprintf(stderr, "  -d,--debug          enable debugging\n");
-  fprintf(stderr, "  -v,--version        print the Barnowl version number and exit\n");
-  fprintf(stderr, "  -h,--help           print this help message\n");
-  fprintf(stderr, "  -s,--config-dir     specify an alternate config dir (default ~/.owl)\n");
-  fprintf(stderr, "  -c,--config-file    specify an alternate config file (default ~/.owl/init.pl)\n");
-  fprintf(stderr, "  -t,--tty            set the tty name\n");
+  fprintf(file, "Barnowl version %s\n", OWL_VERSION_STRING);
+  fprintf(file, "Usage: barnowl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n");
+  fprintf(file, "  -n,--no-subs        don't load zephyr subscriptions\n");
+  fprintf(file, "  -d,--debug          enable debugging\n");
+  fprintf(file, "  -v,--version        print the Barnowl version number and exit\n");
+  fprintf(file, "  -h,--help           print this help message\n");
+  fprintf(file, "  -s,--config-dir     specify an alternate config dir (default ~/.owl)\n");
+  fprintf(file, "  -c,--config-file    specify an alternate config file (default ~/.owl/init.pl)\n");
+  fprintf(file, "  -t,--tty            set the tty name\n");
 }
 
@@ -83 +83 @@
       exit(0);
     case 'h':
+      usage(stdout);
+      exit(0);
     default:
-      usage();
+      usage(stderr);
       exit(1);
     }

zcrypt.c

@@ -16 +16 @@
 #include <sys/wait.h>
 #include <ctype.h>
+#include <limits.h>
+#include <getopt.h>
 
 #include <config.h>
@@ -26 +28 @@
 
 #include "filterproc.h"
+
+#ifndef OWL_VERSION_STRING
+#ifdef  GIT_VERSION
+#define stringify(x)       __stringify(x)
+#define __stringify(x)     #x
+#define OWL_VERSION_STRING stringify(GIT_VERSION)
+#else
+#define OWL_VERSION_STRING PACKAGE_VERSION
+#endif
+#endif /* !OWL_VERSION_STRING */
 
 /* Annotate functions in which the caller owns the return value and is
@@ -106 +118 @@
 }
 
+void usage(FILE *file, const char *progname)
+{
+  fprintf(file, "Usage: %s [-Z|-D|-E|-R|-S] [-F Keyfile] [-c class] [-i instance]\n", progname);
+  fprintf(file, "       [-advqtluon] [-s signature] [-f arg] [-m message]\n");
+  fprintf(file, "  One or more of class, instance, and keyfile must be specified.\n");
+}
+
 int main(int argc, char *argv[])
 {
@@ -116 +135 @@
   int mode = M_NONE;
 
-  char c;
+  int c;
 
   int messageflag = FALSE;
@@ -122 +141 @@
   zoptions.flags = 0;
 
-  while ((c = getopt(argc, argv, "ZDERSF:c:i:advqtluons:f:m")) != (char)EOF)
+  enum {
+    OPT_VERSION = CHAR_MAX + 1,
+    OPT_HELP,
+  };
+  static const struct option options[] = {
+    {"version", no_argument, NULL, OPT_VERSION},
+    {"help", no_argument, NULL, OPT_HELP},
+    {NULL, 0, NULL, 0}
+  };
+
+  while ((c = getopt_long(argc, argv, "ZDERSF:c:i:advqtluons:f:m", options, NULL)) != -1)
   {
     switch(c)
     {
+      case OPT_VERSION:
+        /* Version */
+        printf("This is zcrypt version %s\n", OWL_VERSION_STRING);
+        exit(0);
+      case OPT_HELP:
+        /* Help */
+        usage(stdout, argv[0]);
+        exit(0);
       case 'Z':
         /* Zephyr encrypt */
@@ -257 +294 @@
   if (error || !cryptspec)
   {
-    fprintf(stderr, "Usage: %s [-Z|-D|-E|-R|-S] [-F Keyfile] [-c class] [-i instance]\n", argv[0]);
-    fprintf(stderr, "       [-advqtluon] [-s signature] [-f arg] [-m message]\n");
-    fprintf(stderr, "  One or more of class, instance, and keyfile must be specified.\n");
+    usage(stderr, argv[0]);
     exit(1);
   }