return ret;
}
+
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);
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
+ }
}
return -1;
}
- if (unlink(dest) && errno != ENOENT) {
+ if (do_unlink(dest) && errno != ENOENT) {
fprintf(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",
dest,strerror(errno));