}
-struct map_struct *map_file(int fd,off_t len)
+struct map_struct *map_file(int fd,OFF_T len)
{
struct map_struct *ret;
ret = (struct map_struct *)malloc(sizeof(*ret));
ret->p_len = 0;
#ifdef HAVE_MMAP
- if (len < MAX_MAP_SIZE)
- ret->map = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0);
+ if (len < MAX_MAP_SIZE) {
+ ret->map = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0);
+ if (ret->map == (char *)-1) {
+ ret->map = NULL;
+ }
+ }
#endif
return ret;
}
-char *map_ptr(struct map_struct *map,off_t offset,int len)
+
+char *map_ptr(struct map_struct *map,OFF_T offset,int len)
{
int nread = -2;
if (len == 0)
return NULL;
- len = MIN(len,map->size-offset);
+ if (len > (map->size-offset))
+ len = map->size-offset;
if (offset >= map->p_offset &&
offset+len <= map->p_offset+map->p_len) {
}
len = MAX(len,CHUNK_SIZE);
- len = MIN(len,map->size - offset);
+ if (len > (map->size-offset))
+ len = map->size-offset;
if (len > map->p_size) {
if (map->p) free(map->p);
map->p_size = len;
}
- if (lseek(map->fd,offset,SEEK_SET) != offset ||
+ if (do_lseek(map->fd,offset,SEEK_SET) != offset ||
(nread=read(map->fd,map->p,len)) != len) {
- fprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n",
+ rprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n",
(int)offset, len, nread, errno);
exit_cleanup(1);
}
if (pipe(to_child_pipe) < 0 ||
pipe(from_child_pipe) < 0) {
- fprintf(FERROR,"pipe: %s\n",strerror(errno));
+ rprintf(FERROR,"pipe: %s\n",strerror(errno));
exit_cleanup(1);
}
- pid = fork();
+ pid = do_fork();
if (pid < 0) {
- fprintf(FERROR,"fork: %s\n",strerror(errno));
+ rprintf(FERROR,"fork: %s\n",strerror(errno));
exit_cleanup(1);
}
close(to_child_pipe[1]) < 0 ||
close(from_child_pipe[0]) < 0 ||
dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
- fprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno));
+ rprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno));
exit_cleanup(1);
}
if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]);
if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]);
umask(orig_umask);
execvp(command[0], command);
- fprintf(FERROR,"Failed to exec %s : %s\n",
+ rprintf(FERROR,"Failed to exec %s : %s\n",
command[0],strerror(errno));
exit_cleanup(1);
}
if (close(from_child_pipe[1]) < 0 ||
close(to_child_pipe[0]) < 0) {
- fprintf(FERROR,"Failed to close : %s\n",strerror(errno));
+ rprintf(FERROR,"Failed to close : %s\n",strerror(errno));
exit_cleanup(1);
}
return pid;
}
+int local_child(int argc, char **argv,int *f_in,int *f_out)
+{
+ int pid;
+ int to_child_pipe[2];
+ int from_child_pipe[2];
+
+ if (pipe(to_child_pipe) < 0 ||
+ pipe(from_child_pipe) < 0) {
+ rprintf(FERROR,"pipe: %s\n",strerror(errno));
+ exit_cleanup(1);
+ }
+
+
+ pid = do_fork();
+ if (pid < 0) {
+ rprintf(FERROR,"fork: %s\n",strerror(errno));
+ exit_cleanup(1);
+ }
+
+ if (pid == 0) {
+ extern int am_sender;
+ extern int am_server;
+
+ am_sender = !am_sender;
+ am_server = 1;
+
+ if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
+ close(to_child_pipe[1]) < 0 ||
+ close(from_child_pipe[0]) < 0 ||
+ dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
+ rprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno));
+ exit_cleanup(1);
+ }
+ if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]);
+ if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]);
+ start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
+ }
+
+ if (close(from_child_pipe[1]) < 0 ||
+ close(to_child_pipe[0]) < 0) {
+ rprintf(FERROR,"Failed to close : %s\n",strerror(errno));
+ exit_cleanup(1);
+ }
+
+ *f_in = from_child_pipe[0];
+ *f_out = to_child_pipe[1];
+
+ return pid;
+}
+
+
void out_of_memory(char *str)
{
- fprintf(FERROR,"out of memory in %s\n",str);
+ rprintf(FERROR,"ERROR: out of memory in %s\n",str);
+ exit_cleanup(1);
+}
+
+void overflow(char *str)
+{
+ rprintf(FERROR,"ERROR: buffer overflow in %s\n",str);
exit_cleanup(1);
}
int set_modtime(char *fname,time_t modtime)
{
+ extern int dry_run;
+ if (dry_run) return 0;
+ {
#ifdef HAVE_UTIMBUF
- struct utimbuf tbuf;
- tbuf.actime = time(NULL);
- tbuf.modtime = modtime;
- return utime(fname,&tbuf);
+ struct utimbuf tbuf;
+ tbuf.actime = time(NULL);
+ tbuf.modtime = modtime;
+ return utime(fname,&tbuf);
#elif defined(HAVE_UTIME)
- time_t t[2];
- t[0] = time(NULL);
- t[1] = modtime;
- return utime(fname,t);
+ time_t t[2];
+ t[0] = time(NULL);
+ t[1] = modtime;
+ return utime(fname,t);
#else
- struct timeval t[2];
- t[0].tv_sec = time(NULL);
- t[0].tv_usec = 0;
- t[1].tv_sec = modtime;
- t[1].tv_usec = 0;
- return utimes(fname,t);
+ struct timeval t[2];
+ t[0].tv_sec = time(NULL);
+ t[0].tv_usec = 0;
+ t[1].tv_sec = modtime;
+ t[1].tv_usec = 0;
+ return utimes(fname,t);
#endif
+ }
}
p = fname;
while ((p=strchr(p,'/'))) {
*p = 0;
- mkdir(fname,0777 & ~orig_umask);
+ do_mkdir(fname,0777 & ~orig_umask);
*p = '/';
p++;
}
ifd = open(source, O_RDONLY);
if (ifd == -1) {
- fprintf(FERROR,"open %s: %s\n",
+ rprintf(FERROR,"open %s: %s\n",
source,strerror(errno));
return -1;
}
- if (unlink(dest) && errno != ENOENT) {
- fprintf(FERROR,"unlink %s: %s\n",
+ if (do_unlink(dest) && errno != ENOENT) {
+ rprintf(FERROR,"unlink %s: %s\n",
dest,strerror(errno));
return -1;
}
- ofd = open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
+ ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
if (ofd < 0) {
- fprintf(FERROR,"open %s: %s\n",
+ rprintf(FERROR,"open %s: %s\n",
dest,strerror(errno));
close(ifd);
return -1;
while ((len = safe_read(ifd, buf, sizeof(buf))) > 0) {
if (full_write(ofd, buf, len) < 0) {
- fprintf(FERROR,"write %s: %s\n",
+ rprintf(FERROR,"write %s: %s\n",
dest,strerror(errno));
close(ifd);
close(ofd);
close(ofd);
if (len < 0) {
- fprintf(FERROR,"read %s: %s\n",
+ rprintf(FERROR,"read %s: %s\n",
source,strerror(errno));
return -1;
}
tv.tv_usec = usec;
select(0, NULL, NULL, NULL, &tv);
}
+
+
+static pid_t all_pids[10];
+static int num_pids;
+
+/* fork and record the pid of the child */
+pid_t do_fork(void)
+{
+ pid_t newpid = fork();
+
+ if (newpid) {
+ all_pids[num_pids++] = newpid;
+ }
+ return newpid;
+}
+
+/* kill all children */
+void kill_all(int sig)
+{
+ int i;
+ for (i=0;i<num_pids;i++) {
+ if (all_pids[i] != getpid())
+ kill(all_pids[i], sig);
+ }
+}
+
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff