Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't show basedir in printed path (a aesthetic change only)
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
08d0929
..
ec40818
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-88,10
+88,17
@@
static void report(int f)
tsize = read_longint(f);
}
tsize = read_longint(f);
}
+#if HAVE_LONGLONG
+ printf("wrote %lld bytes read %lld bytes %g bytes/sec\n",
+ (long long)out,(long long)in,(in+out)/(0.5 + (t-starttime)));
+ printf("total size is %lld speedup is %g\n",
+ (long long)tsize,(1.0*tsize)/(in+out));
+#else
printf("wrote %ld bytes read %ld bytes %g bytes/sec\n",
(long)out,(long)in,(in+out)/(0.5 + (t-starttime)));
printf("total size is %ld speedup is %g\n",
(long)tsize,(1.0*tsize)/(in+out));
printf("wrote %ld bytes read %ld bytes %g bytes/sec\n",
(long)out,(long)in,(in+out)/(0.5 + (t-starttime)));
printf("total size is %ld speedup is %g\n",
(long)tsize,(1.0*tsize)/(in+out));
+#endif
}
}
@@
-220,23
+227,10
@@
static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f
server_options(args,&argc);
server_options(args,&argc);
- if (path && *path) {
- dir = strdup(path);
- p = strrchr(dir,'/');
- if (p && !relative_paths) {
- *p = 0;
- if (!dir[0])
- args[argc++] = "/";
- else
- args[argc++] = dir;
- p++;
- } else {
- args[argc++] = ".";
- p = dir;
- }
- if (p[0])
- args[argc++] = path;
- }
+ args[argc++] = ".";
+
+ if (path && *path)
+ args[argc++] = path;
args[argc] = NULL;
args[argc] = NULL;
@@
-306,31
+300,31
@@
static char *get_local_name(struct file_list *flist,char *name)
void do_server_sender(int argc,char *argv[])
{
int i;
void do_server_sender(int argc,char *argv[])
{
int i;
- char *dir = argv[0];
struct file_list *flist;
struct file_list *flist;
+ char *dir = argv[0];
if (verbose > 2)
fprintf(FERROR,"server_sender starting pid=%d\n",(int)getpid());
if (!relative_paths && chdir(dir) != 0) {
if (verbose > 2)
fprintf(FERROR,"server_sender starting pid=%d\n",(int)getpid());
if (!relative_paths && chdir(dir) != 0) {
- fprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno));
- exit_cleanup(1);
+
fprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno));
+
exit_cleanup(1);
}
argc--;
argv++;
if (strcmp(dir,".")) {
}
argc--;
argv++;
if (strcmp(dir,".")) {
- int l = strlen(dir);
- if (strcmp(dir,"/") == 0)
- l = 0;
- for (i=0;i<argc;i++)
- argv[i] += l+1;
+
int l = strlen(dir);
+
if (strcmp(dir,"/") == 0)
+
l = 0;
+
for (i=0;i<argc;i++)
+
argv[i] += l+1;
}
if (argc == 0 && recurse) {
}
if (argc == 0 && recurse) {
- argc=1;
- argv--;
- argv[0] = ".";
+
argc=1;
+
argv--;
+
argv[0] = ".";
}
}
@@
-374,21
+368,22
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
void do_server_recv(int argc,char *argv[])
{
int status;
void do_server_recv(int argc,char *argv[])
{
int status;
- char *dir = NULL;
struct file_list *flist;
char *local_name=NULL;
struct file_list *flist;
char *local_name=NULL;
+ char *dir = NULL;
if (verbose > 2)
fprintf(FERROR,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
if (argc > 0) {
if (verbose > 2)
fprintf(FERROR,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
if (argc > 0) {
- dir = argv[0];
- argc--;
- argv++;
- if (chdir(dir) != 0) {
- fprintf(FERROR,"chdir %s : %s (4)\n",dir,strerror(errno));
- exit_cleanup(1);
- }
+ dir = argv[0];
+ argc--;
+ argv++;
+ if (chdir(dir) != 0) {
+ fprintf(FERROR,"chdir %s : %s (4)\n",
+ dir,strerror(errno));
+ exit_cleanup(1);
+ }
}
if (delete_mode)
}
if (delete_mode)
@@
-401,11
+396,11
@@
void do_server_recv(int argc,char *argv[])
}
if (argc > 0) {
}
if (argc > 0) {
- if (strcmp(dir,".")) {
- argv[0] += strlen(dir);
- if (argv[0][0] == '/') argv[0]++;
- }
- local_name = get_local_name(flist,argv[0]);
+
if (strcmp(dir,".")) {
+
argv[0] += strlen(dir);
+
if (argv[0][0] == '/') argv[0]++;
+
}
+
local_name = get_local_name(flist,argv[0]);
}
status = do_recv(STDIN_FILENO,STDOUT_FILENO,flist,local_name);
}
status = do_recv(STDIN_FILENO,STDOUT_FILENO,flist,local_name);