sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

merge smbtar fixes from 2.2

Browse Source 
(This used to be commit f3b994326e)
This commit is contained in:
Herb Lewis 2002-12-16 21:30:20 +00:00
parent b242cfe6b3
commit 96978d397a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/client/clitar.c
View File

@ -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;