Add popt to binaries in makefile. Hack clitar to compile until I fix it.

Jeremy.
(This used to be commit 252ef28bb8f1406fdd92edba8538cb9e88f0b77f)

2 files changed, 12 insertions, 19 deletions

diff --git a/source3/client/client.c b/source3/client/client.c
index 5caad192b6..6514dc76af 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1313,10 +1313,8 @@ static int cmd_mget(void)
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	uint16 attribute = aSYSTEM | aHIDDEN;
-	char *mget_mask;
-	char *buf;
-
-	*mget_mask = 0;
+	char *mget_mask = NULL;
+	char *buf = NULL;
 
 	if (recurse) {
 		attribute |= aDIR;
@@ -4369,7 +4367,7 @@ static int process(const char *base_directory)
 
 static int do_host_query(const char *query_host)
 {
-	cli = cli_cm_open(talloc_tos(), query_host, "IPC$", true);
+	cli = cli_cm_open(talloc_tos(), NULL, query_host, "IPC$", true);
 	if (!cli)
 		return 1;
 
@@ -4382,7 +4380,7 @@ static int do_host_query(const char *query_host)
 
 		cli_cm_shutdown();
 		cli_cm_set_port( 139 );
-		cli = cli_cm_open(talloc_tos(), query_host, "IPC$", true);
+		cli = cli_cm_open(talloc_tos(), NULL, query_host, "IPC$", true);
 	}
 
 	if (cli == NULL) {
@@ -4575,7 +4573,7 @@ static int do_message_op(void)
 		}
 
 		/* if the service has already been retrieved then check if we have also a password */
-		if (service_opt && (!cmdline_auth_info.got_pass) && poptPeekArg(pc)) {
+		if (service_opt && (!get_cmdline_auth_info_got_pass()) && poptPeekArg(pc)) {
 			set_cmdline_auth_info_password(poptGetArg(pc));
 		}
 
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index cb7a5deddd..1b0ea59a9a 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -38,6 +38,8 @@
 #include "clitar.h"
 #include "client/client_proto.h"
 
+static pstring cur_dir; /* FIXME !!! JRA*/
+
 static int clipfind(char **aret, int ret, char *tok);
 
 typedef struct file_info_struct file_info2;
@@ -102,7 +104,6 @@ static char **cliplist=NULL;
 static int clipn=0;
 static bool must_free_cliplist = False;
 
-extern file_info def_finfo;
 extern bool lowercase;
 extern uint16 cnum;
 extern bool readbraw_supported;
@@ -117,7 +118,7 @@ static int tarhandle;
 static void writetarheader(int f,  const char *aname, SMB_BIG_UINT size, time_t mtime,
 			   const char *amode, unsigned char ftype);
 static void do_atar(char *rname,char *lname,file_info *finfo1);
-static void do_tar(file_info *finfo);
+static void do_tar(file_info *finfo, const char *dir);
 static void oct_it(SMB_BIG_UINT value, int ndgs, char *p);
 static void fixtarname(char *tptr, const char *fp, size_t l);
 static int dotarbuf(int f, char *b, int n);
@@ -629,14 +630,8 @@ static void do_atar(char *rname,char *lname,file_info *finfo1)
 		finfo.ctime_ts = finfo1 -> ctime_ts;
 		finfo.name  = finfo1 -> name;
 	} else {
-		finfo.size  = def_finfo.size;
-		finfo.mode  = def_finfo.mode;
-		finfo.uid   = def_finfo.uid;
-		finfo.gid   = def_finfo.gid;
-		finfo.mtime_ts = def_finfo.mtime_ts;
-		finfo.atime_ts = def_finfo.atime_ts;
-		finfo.ctime_ts = def_finfo.ctime_ts;
-		finfo.name  = def_finfo.name;
+		/* DEAL WITH NULL finfo1. */
+		/* FIXME !!! JRA */
 	}
 
 	if (dry_run) {
@@ -650,7 +645,7 @@ static void do_atar(char *rname,char *lname,file_info *finfo1)
 
 	fnum = cli_open(cli, rname, O_RDONLY, DENY_NONE);
 
-	pstring_clean_name(rname);
+/*	pstring_clean_name(rname); FIXME !!! JRA  */
 
 	if (fnum == -1) {
 		DEBUG(0,("%s opening remote file %s (%s)\n",
@@ -793,7 +788,7 @@ static void do_atar(char *rname,char *lname,file_info *finfo1)
 Append single file to tar file (or not)
 ***************************************************************************/
 
-static void do_tar(file_info *finfo)
+static void do_tar(file_info *finfo, const char *dir)
 {
 	pstring rname;