--- ray/src/hd/rhcopy.c 2004/01/02 11:42:01 3.23 +++ ray/src/hd/rhcopy.c 2010/09/30 15:43:30 3.26 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rhcopy.c,v 3.23 2004/01/02 11:42:01 schorsch Exp $"; +static const char RCSid[] = "$Id: rhcopy.c,v 3.26 2010/09/30 15:43:30 greg Exp $"; #endif /* * Copy data into a holodeck file @@ -85,7 +85,7 @@ main( userr: fprintf(stderr, "Usage: %s output.hdk [-u][-d] -h inp1.hdk ..\n", progname); - fprintf(stderr, " Or: %s output.hdk [-u][-d] -p inp1.pic inp1.zbf ..\n", + fprintf(stderr, " Or: %s output.hdk [-u][-d] -p inp1.hdr inp1.zbf ..\n", progname); exit(1); } @@ -134,7 +134,7 @@ openholo( /* open existing holodeck file for i/o */ FILE *fp; int fd; int hflags = 0; - long nextloc; + off_t nextloc; int n; /* open holodeck file */ if ((fp = fopen(fname, append ? "r+" : "r")) == NULL) { @@ -152,7 +152,7 @@ openholo( /* open existing holodeck file for i/o */ nextloc = ftell(fp); /* get stdio position */ fclose(fp); /* done with stdio */ for (n = 0; nextloc > 0L; n++) { /* initialize each section */ - lseek(fd, (off_t)nextloc, SEEK_SET); + lseek(fd, nextloc, SEEK_SET); read(fd, (char *)&nextloc, sizeof(nextloc)); hdinit(fd, NULL)->priv = hflags&H_OBST ? &obstr : hflags&H_OBSF ? &unobstr : (char *)NULL;