From 3cacc54b787e8ff933181af4ca4b41866ef2b1ce Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Tue, 17 Aug 2004 10:40:31 +0000
Subject: [PATCH] Small fixes
--HG--
extra : convert_revision : 7f568ec9a453957b16efab56c215a4914f0cebf3
---
Makefile.in | 4 +++-
compat.c | 2 +-
dbmulti.c | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 3bbfe2a0..22907450 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -194,7 +194,9 @@ ltm-clean:
sizes: dropbear
objdump -t dropbear|grep ".text"|cut -d "." -f 2|sort -rn
-clean: ltc-clean ltm-clean
+clean: ltc-clean ltm-clean thisclean
+
+thisclean:
-rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress
-rm -f staticdropbear staticdropbearkey staticdropbearconvert staticscp
-rm -f dropbearmulti staticdropbearmulti
diff --git a/compat.c b/compat.c
index fb6e70a0..7e0c1ac7 100644
--- a/compat.c
+++ b/compat.c
@@ -190,7 +190,7 @@ int daemon(int nochdir, int noclose) {
#ifndef HAVE_BASENAME
-char *basename(char *path) {
+char *basename(const char *path) {
char *foo = strrchr(path, '/');
return ++foo;
diff --git a/dbmulti.c b/dbmulti.c
index 8d61c5c2..9d76055b 100644
--- a/dbmulti.c
+++ b/dbmulti.c
@@ -44,7 +44,8 @@ int main(int argc, char ** argv) {
}
#endif
#ifdef DBMULTI_dbclient
- if (strcmp(progname, "dbclient") == 0) {
+ if (strcmp(progname, "dbclient") == 0
+ || strcmp(progname, "ssh") == 0) {
return cli_main(argc, argv);
}
#endif
--
GitLab