Commit 3382b0a2 authored by Jelmer Vernooij's avatar Jelmer Vernooij Committed by Gerald (Jerry) Carter
Browse files

r1320: Return an error when the last command read from stdin fails in smbclient + 

prepare for better error checking in tar..
(This used to be commit 374f00b56b7e9bff08e70ee2d93538b2c7fde7b7)
parent 0b3cfe4a

source3/client/client.c

+4 −2
Original line number Diff line number Diff line
@@ -2579,9 +2579,10 @@ static void readline_callback(void) 
 Process commands on stdin.

****************************************************************************/



static void process_stdin(void)

static int process_stdin(void)

{

	const char *ptr;

	int rc = 0;



	while (1) {

		pstring tok;
@@ -2609,13 +2610,14 @@ static void process_stdin(void) 
		if (!next_token_nr(&ptr,tok,NULL,sizeof(tok))) continue;



		if ((i = process_tok(tok)) >= 0) {

			commands[i].fn();

			rc = commands[i].fn();

		} else if (i == -2) {

			d_printf("%s: command abbreviation ambiguous\n",tok);

		} else {

			d_printf("%s: command not found\n",tok);

		}

	}

	return rc;

}



/*****************************************************

source3/client/clitar.c

+3 −3
Original line number Diff line number Diff line
@@ -1357,9 +1357,8 @@ int cmd_tar(void) 
	if (!tar_parseargs(argcl, argl, buf, 0))

		return 1;



	process_tar();

	SAFE_FREE(argl);

	return 0;

	return process_tar();

}



/****************************************************************************
@@ -1368,6 +1367,7 @@ Command line (option) version 


int process_tar(void)

{

	int rc = 0;

	initarbuf();

	switch(tar_type) {

		case 'x':
@@ -1445,7 +1445,7 @@ int process_tar(void) 
		clipn = 0;

		must_free_cliplist = False;

	}

	return(0);

	return rc;

}



/****************************************************************************