Updates from upstream, and changed our version number

This commit is contained in:
Deon George 2010-12-21 07:12:53 +11:00 committed by Deon George
parent 983751d1af
commit 4d331a492a

View File

@ -21,7 +21,7 @@ SOFTWARE.
*/
static const char rcsid[] = /*Add RCS version string to binary */
"$Id: tsmpipe.c,v 1.6 2010/02/15 07:41:26 nikke Exp $";
"$Id: tsmpipe.c,v 1.5-dg 2010/02/15 07:41:26 nikke Exp $";
/* Enable Large File Support stuff */
#define _FILE_OFFSET_BITS 64
@ -370,14 +370,14 @@ int tsm_sendfile(dsUint32_t sesshandle, char *fsname, char *filename,
dataBlk.bufferPtr = buffer;
rc = dsmSendData(sesshandle, &dataBlk);
if(rc != DSM_RC_OK) {
if(rc != DSM_RC_OK && rc != DSM_RC_COMPRESS_GREW) {
tsm_printerr(sesshandle, rc, "dsmSendData failed");
return 0;
}
}
rc = dsmEndSendObj(sesshandle);
if(rc != DSM_RC_OK) {
if(rc != DSM_RC_OK && rc != DSM_RC_COMPRESS_GREW) {
tsm_printerr(sesshandle, rc, "dsmEndSendObj failed");
return(0);
}
@ -867,7 +867,7 @@ int copy_env(const char *from, const char *to) {
void usage(void) {
fprintf(stderr,
"tsmpipe $Revision: 1.6 $, usage:\n"
"tsmpipe $Revision: 1.5-dg $, usage:\n"
"tsmpipe [-A|-B] [-c|-x|-d|-t] -s fsname -f filepath [-l len]\n"
" -A and -B are mutually exclusive:\n"
" -A Use Archive objects\n"