Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-07-27 08:29:22 +00:00
Code Issues Projects Releases Wiki Activity

prodos: fixes to prodos_raw

Browse Source
This commit is contained in:
Vince Weaver 2024-07-16 18:05:29 -04:00
parent 47b48f51b3
commit fff72ef4a7
2 changed files with 101 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/prodos-utils/Makefile
View File

@ -2,7 +2,7 @@ include ../../Makefile.inc
CFLAGS := $(CFLAGS) -g
all: prodos mkprodosfs prodos_cat text_to_prodos
all: prodos mkprodosfs prodos_cat text_to_prodos prodos_raw
###
@ -32,11 +32,18 @@ prodos.o: prodos.c prodos.h
prodos_cat: prodos_cat.o
$(CC) $(LFLAGS) -o prodos_cat prodos_cat.o
####
prodos_cat.o: prodos_cat.c
$(CC) $(CFLAGS) -c prodos_cat.c
###
prodos_raw: prodos_raw.o prodos_2mg.o
$(CC) $(LFLAGS) -o prodos_raw prodos_raw.o prodos_2mg.o
prodos_raw.o: prodos_raw.c
$(CC) $(CFLAGS) -c prodos_raw.c
###

149
utils/prodos-utils/prodos_raw.c
View File

@ -7,117 +7,154 @@
#include <sys/stat.h>
/* usage: dos33_raw track sector file */
#include "prodos.h"
/* usage: prodos_raw block file start count max*/
static void usage(char *exe_name) {
printf("Usage:\n");
printf("\t%s disk_image track sector file start count [max_track]\n\n",exe_name);
printf("\t%s disk_image block file start count [max_block]\n\n",exe_name);
exit(1);
}
static int dos33_sector_map[16]={
0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15
};
//static int dos33_sector_map[16]={
// 0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15
//};
static int goto_dos_track_sector(int fd, int track, int sector) {
static int goto_prodos_block(int fd, int block, int offset) {
int result,translated_sector;
int result;
translated_sector=dos33_sector_map[sector%16];
/* For now, assume prodos order */
// translated_sector=dos33_sector_map[sector%16];
result=lseek(fd,(translated_sector*256)+(track*16*256),SEEK_SET);
result=lseek(fd,offset+(block*512),SEEK_SET);
// printf("going to: T=%d S=%d (%d)\n",track,sector,translated_sector);
// printf("going to: B=%d\n",block);
return result;
}
int main(int argc, char **argv) {
unsigned int track,sector,start,count,total,max_track,filesize;
unsigned int max_sector,check_max=0;
unsigned int block,start,count,total,max_block,filesize;
unsigned int check_max=0;
int disk_image_fd;
int file_fd;
unsigned char buffer[256];
unsigned char buffer[512];
int result,read_result;
struct stat statbuf;
unsigned char header[64];
int debug=1;
int interleave=PRODOS_INTERLEAVE_PRODOS,num_blocks,offset=0;
if (argc<7) {
if (argc<6) {
usage(argv[0]);
}
track=atoi(argv[2]);
sector=atoi(argv[3]);
start=atoi(argv[5]);
count=atoi(argv[6]);
/* usage: prodos_raw block file start count max*/
if (argc>7) {
max_track=atoi(argv[7]);
block=atoi(argv[2]);
start=atoi(argv[4]);
count=atoi(argv[5]);
if (argc>6) {
max_block=atoi(argv[6]);
check_max=1;
}
/* open disk image */
disk_image_fd=open(argv[1],O_RDWR);
if (disk_image_fd<0) {
fprintf(stderr,"Error opening disk image %s: %s\n",
argv[1],strerror(errno));
exit(1);
}
/* open file */
file_fd=open(argv[3],O_RDONLY);
if (file_fd<0) {
fprintf(stderr,"Error opening file %s: %s\n",
argv[3],strerror(errno));
exit(1);
}
/* check if 2img format */
result=read(disk_image_fd,header,64);
if (result<0) {
fprintf(stderr,"Error reading header\n");
exit(1);
}
result=read_2mg_header(header,&num_blocks,
&interleave,&offset,debug);
if (result<0) {
/* try figuring things out otherwise */
result=stat(argv[1], &statbuf);
num_blocks=statbuf.st_size/512;
if (num_blocks%512==0) num_blocks++;
}
/* check filesize using stat */
result=stat(argv[4], &statbuf);
result=stat(argv[3], &statbuf);
if (result<0) {
fprintf(stderr,"Error stating %s: %s\n",
argv[4],strerror(errno));
argv[3],strerror(errno));
exit(1);
}
filesize=statbuf.st_size;
if (count==0) {
count=(filesize/256);
if ((filesize%256)!=0) count++;
count=(filesize/512);
if ((filesize%512)!=0) count++;
}
/* sanity check we aren't going off the last track */
/* sanity check a bit */
/* max prodos image is 65535 */
if (block>65535) {
fprintf(stderr,"Warning! Unusual block number %d\n",block);
exit(1);
}
/* check if end too high */
if (block+count>num_blocks) {
fprintf(stderr,"Error! Last block %d beyond max image block %d\n",
block+count,num_blocks);
exit(1);
}
/* sanity check we aren't going above self-imposed max */
if (check_max) {
max_sector=((track*16)+sector+count);
if (max_sector >= max_track*16) {
fprintf(stderr,"Error, %d exceeds max_sector of %d\n",
max_sector,max_track*16);
if (block+count>max_block) {
fprintf(stderr,"Error, %d exceeds max_block of %d\n",
block+count,max_block);
exit(1);
}
}
if (track>34) {
fprintf(stderr,"Warning! Unusual track number %d\n",track);
}
if (sector>15) {
fprintf(stderr,"Warning! Unusual sector number %d\n",sector);
}
disk_image_fd=open(argv[1],O_RDWR);
if (disk_image_fd<0) {
fprintf(stderr,"Error opening %s: %s\n",
argv[1],strerror(errno));
if (interleave!=PRODOS_INTERLEAVE_PRODOS) {
fprintf(stderr,"Error! Unsupported interleave!\n");
exit(1);
}
file_fd=open(argv[4],O_RDONLY);
if (file_fd<0) {
fprintf(stderr,"Error opening %s: %s\n",
argv[4],strerror(errno));
exit(1);
}
result=lseek(file_fd,(start*256),SEEK_SET);
/* seek in source file if needed */
result=lseek(file_fd,(start*512),SEEK_SET);
if (result<0) {
fprintf(stderr,"Error skipping: %s\n",strerror(errno));
exit(1);
}
total=0;
/* write until out of space */
while(1) {
if (total>=count) break;
read_result=read(file_fd,buffer,256);
read_result=read(file_fd,buffer,512);
if (read_result<0) break; /* error */
if (read_result==0) break; /* done */
result=goto_dos_track_sector(disk_image_fd,track,sector);
result=goto_prodos_block(disk_image_fd,block,offset);
if (result<0) {
fprintf(stderr,"Error seeking: %s\n",strerror(errno));
exit(1);
@ -130,17 +167,13 @@ int main(int argc, char **argv) {
break;
}
total++;
sector++;
if (sector==16) {
sector=0;
track++;
}
block++;
}
close(file_fd);
close(disk_image_fd);
fprintf(stderr,"Wrote %d sectors\n",count);
fprintf(stderr,"Wrote %d blocks\n",total);
return 0;
}