diff options
| author | Herb Lewis <herb@samba.org> | 2002-12-16 21:32:32 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2002-12-16 21:32:32 +0000 |
| commit | e76f1ffa7e5da5bc391c923e7cada44b77e01da9 (patch) | |
| tree | 5fb791966c86ba9867cea136c3713772112977e5 /source3/client | |
| parent | b02fa217c27c5c8a5703db3c6f4d65beb22612c2 (diff) | |
| download | samba-e76f1ffa7e5da5bc391c923e7cada44b77e01da9.tar.gz samba-e76f1ffa7e5da5bc391c923e7cada44b77e01da9.tar.bz2 samba-e76f1ffa7e5da5bc391c923e7cada44b77e01da9.zip | |
merge smbtar fix from 2.2
(This used to be commit 41188337c3fa8c716dc7a4721ee5c31e5ddd928d)
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/clitar.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index c453cfbb54..bf26beb652 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -45,10 +45,10 @@ typedef struct file_info_struct file_info2; struct file_info_struct { - size_t size; + SMB_BIG_UINT size; uint16 mode; - int uid; - int gid; + uid_t uid; + gid_t gid; /* These times are normally kept in GMT */ time_t mtime; time_t atime; @@ -620,6 +620,7 @@ static void do_atar(char *rname,char *lname,file_info *finfo1) finfo.mtime = finfo1 -> mtime; finfo.atime = finfo1 -> atime; finfo.ctime = finfo1 -> ctime; + finfo.name = finfo1 -> name; } else { finfo.size = def_finfo.size; @@ -629,13 +630,14 @@ static void do_atar(char *rname,char *lname,file_info *finfo1) finfo.mtime = def_finfo.mtime; finfo.atime = def_finfo.atime; finfo.ctime = def_finfo.ctime; + finfo.name = def_finfo.name; } if (dry_run) { - DEBUG(3,("skipping file %s of size %d bytes\n", + DEBUG(3,("skipping file %s of size %12.0f bytes\n", finfo.name, - (int)finfo.size)); + (double)finfo.size)); shallitime=0; ttarf+=finfo.size + TBLOCK - (finfo.size % TBLOCK); ntarf++; @@ -1833,7 +1835,7 @@ int tar_parseargs(int argc, char *argv[], char *Optarg, int Optind) if (tar_type=='c' && (dry_run || strcmp(argv[Optind], "/dev/null")==0)) { if (!dry_run) { - DEBUG(0,("Output is /dev/null, assuming dry_run")); + DEBUG(0,("Output is /dev/null, assuming dry_run\n")); dry_run = True; } tarhandle=-1; |