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
added hooks for compression in token.c
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
22ca8c2
..
f9985ef
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-66,7
+66,7
@@
char *map_ptr(char *buf,off_t offset,int len)
return (p + (offset - p_offset));
}
return (p + (offset - p_offset));
}
- len = MAX(len,
WRITE_BLOC
K_SIZE);
+ len = MAX(len,
CHUN
K_SIZE);
len = MIN(len,map_size - offset);
if (len > p_size) {
len = MIN(len,map_size - offset);
if (len > p_size) {
@@
-78,8
+78,8
@@
char *map_ptr(char *buf,off_t offset,int len)
if (lseek(map_fd,offset,SEEK_SET) != offset ||
read(map_fd,p,len) != len) {
if (lseek(map_fd,offset,SEEK_SET) != offset ||
read(map_fd,p,len) != len) {
- fprintf(
stderr
,"EOF in map_ptr!\n");
- exit(1);
+ fprintf(
FERROR
,"EOF in map_ptr!\n");
+ exit
_cleanup
(1);
}
p_offset = offset;
}
p_offset = offset;
@@
-91,8
+91,10
@@
char *map_ptr(char *buf,off_t offset,int len)
void unmap_file(char *buf,off_t len)
{
void unmap_file(char *buf,off_t len)
{
+#ifdef HAVE_MMAP
if (len > 0 && buf)
munmap(buf,len);
if (len > 0 && buf)
munmap(buf,len);
+#endif
map_fd = -1;
map_size = 0;
p_len = 0;
map_fd = -1;
map_size = 0;
p_len = 0;
@@
-108,15
+110,15
@@
int piped_child(char **command,int *f_in,int *f_out)
if (pipe(to_child_pipe) < 0 ||
pipe(from_child_pipe) < 0) {
if (pipe(to_child_pipe) < 0 ||
pipe(from_child_pipe) < 0) {
- fprintf(
stderr
,"pipe: %s\n",strerror(errno));
- exit(1);
+ fprintf(
FERROR
,"pipe: %s\n",strerror(errno));
+ exit
_cleanup
(1);
}
pid = fork();
if (pid < 0) {
}
pid = fork();
if (pid < 0) {
- fprintf(
stderr
,"fork: %s\n",strerror(errno));
- exit(1);
+ fprintf(
FERROR
,"fork: %s\n",strerror(errno));
+ exit
_cleanup
(1);
}
if (pid == 0)
}
if (pid == 0)
@@
-125,19
+127,19
@@
int piped_child(char **command,int *f_in,int *f_out)
close(to_child_pipe[1]) < 0 ||
close(from_child_pipe[0]) < 0 ||
dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
close(to_child_pipe[1]) < 0 ||
close(from_child_pipe[0]) < 0 ||
dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
- fprintf(
stderr
,"Failed to dup/close : %s\n",strerror(errno));
- exit(1);
+ fprintf(
FERROR
,"Failed to dup/close : %s\n",strerror(errno));
+ exit
_cleanup
(1);
}
execvp(command[0], command);
}
execvp(command[0], command);
- fprintf(
stderr
,"Failed to exec %s : %s\n",
+ fprintf(
FERROR
,"Failed to exec %s : %s\n",
command[0],strerror(errno));
command[0],strerror(errno));
- exit(1);
+ exit
_cleanup
(1);
}
if (close(from_child_pipe[1]) < 0 ||
close(to_child_pipe[0]) < 0) {
}
if (close(from_child_pipe[1]) < 0 ||
close(to_child_pipe[0]) < 0) {
- fprintf(
stderr
,"Failed to close : %s\n",strerror(errno));
- exit(1);
+ fprintf(
FERROR
,"Failed to close : %s\n",strerror(errno));
+ exit
_cleanup
(1);
}
*f_in = from_child_pipe[0];
}
*f_in = from_child_pipe[0];
@@
-149,8
+151,8
@@
int piped_child(char **command,int *f_in,int *f_out)
void out_of_memory(char *str)
{
void out_of_memory(char *str)
{
- fprintf(
stderr
,"out of memory in %s\n",str);
- exit(1);
+ fprintf(
FERROR
,"out of memory in %s\n",str);
+ exit
_cleanup
(1);
}
}