summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2002-12-16 21:30:20 +0000
committerHerb Lewis <herb@samba.org>2002-12-16 21:30:20 +0000
commit96978d397a7a17ba6ed77214c461d26e850ee94a (patch)
treee93df5dee079f7e24ee268cdf365b67b3dec35a8
parentb242cfe6b3965796d550ea9d84747cb302fbfac2 (diff)
downloadsamba-96978d397a7a17ba6ed77214c461d26e850ee94a.tar.gz
samba-96978d397a7a17ba6ed77214c461d26e850ee94a.tar.bz2
samba-96978d397a7a17ba6ed77214c461d26e850ee94a.zip
merge smbtar fixes from 2.2
(This used to be commit f3b994326ea4bfc9a74acb2901c733c35900af53)
-rw-r--r--source3/client/clitar.c14
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;