Commit ea9ae3b6 authored by Niels Möller's avatar Niels Möller
Browse files

* src/sexp-conv.c: Renamed from sexp_conv.c.

Rev: src/.cvsignore:1.20
Rev: src/Makefile.am.in:1.82
Rev: src/lsh-authorize:1.4
Rev: src/sexp-conv.c:1.1
Rev: src/sexp_conv.c:1.16(DEAD)
Rev: src/ssh-conv:1.3
parent fcc29ac1
......@@ -28,7 +28,7 @@ packet_types.h
pkcs5-test
prime_table
prime_table.h
sexp_conv
sexp-conv
sexp_table.h
sexp_test
srp-gen
......
......@@ -28,7 +28,7 @@
/pkcs5-test
/prime_table
/prime_table.h
/sexp_conv
/sexp-conv
/sexp_table.h
/sexp_test
/srp-gen
......
......@@ -24,7 +24,7 @@ Makefile.am: Makefile.am.in
SCHEME = $(SCHEME_PROGRAM) -l $(srcdir)/scm/$(SCHEME_NAME)-compat.scm
bin_PROGRAMS = lsh lsh_keygen lsh_writekey lsh-decode-key sexp_conv srp-gen
bin_PROGRAMS = lsh lsh_keygen lsh_writekey lsh-decode-key sexp-conv srp-gen
sbin_PROGRAMS = lshd lsh_proxy
bin_SCRIPTS = lsh-authorize ssh-conv
noinst_PROGRAMS = prime_table digit_table pkcs5-test
......
......@@ -40,9 +40,13 @@ create_dir () {
create_dir ~/.lsh 0700
create_dir ~/.lsh/authorized_keys_sha1 0700
SEXP_CONV=`PATH=$PATH:. \type -path sexp_conv`
if type sexp-conv ; then
SEXP_CONV=sexp_conv
else
SEXP_CONV=./sexp_conv
fi
if [ -z $SEXP_CONV ] ; then
if ! type $SEXP_CONV ; then
echo "Can't find the sexp_conv program"
exit 1
fi
......
/* sexp_conv.c
/* sexp-conv.c
*
* Reads a sexp in given form from, and writes it in given form.
*
......@@ -39,7 +39,7 @@
#include <string.h>
#include <unistd.h>
#include "sexp_conv.c.x"
#include "sexp-conv.c.x"
/* Global, for simplicity */
int exit_code = EXIT_SUCCESS;
......@@ -79,7 +79,7 @@ do_exc_sexp_conv_handler(struct exception_handler *self,
{
CAST(io_exception, e, x);
exit_code = EXIT_FAILURE;
werror("sexp_conv: %z, (errno = %i)\n", x->msg, e->error);
werror("sexp-conv: %z, (errno = %i)\n", x->msg, e->error);
break;
}
default:
......@@ -92,7 +92,7 @@ do_exc_sexp_conv_handler(struct exception_handler *self,
/* Option parsing */
const char *argp_program_version
= "sexp_conv-" VERSION;
= "sexp-conv-" VERSION;
const char *argp_program_bug_address = BUG_ADDRESS;
......
#! /bin/sh
SSH_CONV=`PATH=$PATH:. \type -path lsh-decode-key`
if type lsh-decode-key ; then
SSH_CONV=lsh-decode-key
else
SSH_CONV=./lsh-decode-key
if
if [ -z $SSH_CONV ] ; then
if ! type $SSH_CONV ; then
echo "Can't find the lsh-decode-key program"
exit 1
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment