char *map_ptr(struct map_struct *map,off_t offset,int len)
{
+ int nread = -2;
+
if (map->map)
return map->map+offset;
}
if (lseek(map->fd,offset,SEEK_SET) != offset ||
- read(map->fd,map->p,len) != len) {
- fprintf(FERROR,"EOF in map_ptr!\n");
+ (nread=read(map->fd,map->p,len)) != len) {
+ fprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n",
+ (int)offset, len, nread, errno);
exit_cleanup(1);
}
if (pid == 0)
{
+ extern int orig_umask;
if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
close(to_child_pipe[1]) < 0 ||
close(from_child_pipe[0]) < 0 ||
fprintf(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",
command[0],strerror(errno));
return fcntl( fd, F_SETFL, val);
#undef FLAG_TO_SET
}
+
+/****************************************************************************
+create any necessary directories in fname. Unfortunately we don't know
+what perms to give the directory when this is called so we need to rely
+on the umask
+****************************************************************************/
+int create_directory_path(char *fname)
+{
+ extern int orig_umask;
+ char *p;
+
+ while (*fname == '/') fname++;
+ while (strncmp(fname,"./",2)==0) fname += 2;
+
+ p = fname;
+ while ((p=strchr(p,'/'))) {
+ *p = 0;
+ mkdir(fname,0777 & ~orig_umask);
+ *p = '/';
+ p++;
+ }
+ return 0;
+}