1 --- bin2iso.c 2000-11-04 23:08:02.000000000 +0100
2 +++ bin2iso.c.wiget 2004-01-30 12:05:54.241985816 +0100
11 // got this from easycd pro by looking at a blank disk so it may be off...
\r
12 -#define CD74_MAX_SECTORS 334873 // 653.75 Mb
\r
13 +#define CD74_MAX_SECTORS 334873L // 653.75 Mb
\r
16 unsigned long int Index(char m, char s, char f)
\r
18 unsigned long size; /* track size in bytes */
\r
21 -buffered_fread(unsigned char *array, unsigned int size) {
\r
22 +int buffered_fread(unsigned char *array, unsigned int size) {
\r
25 if(INBUF_WIDX == 0) {
\r
27 array[i] = INBUF[INBUF_RIDX++];
\r
28 if((INBUF_RIDX == INBUF_WIDX) && (i < (size -1))) {
\r
29 printf(" Warning: Premature EOF\n");
\r
30 - while(i++ < size) { array[i] == 0; }/* zero fill the rest */
\r
31 + while(i++ < size) { array[i] = 0; }/* zero fill the rest */
\r
37 void buffered_fwrite(unsigned char *array, unsigned int size) {
\r
39 - unsigned long int readpos;
\r
40 + unsigned long int readpos = 0;
\r
42 if(OUTBUF_IDX+size >= OUTBUF_SIZE) {
\r
46 void flush_buffers(void)
\r
48 - unsigned long int readpos;
\r
49 + unsigned long int readpos = 0;
\r
51 if(fdOutFile == fdBinFile) {
\r
52 readpos = ftell(fdOutFile);
\r
54 } else if(track->mode == AUDIO) {
\r
55 strcat(track->name, ".wav");
\r
57 - printf("Track %d Unsupported mode\n", track->num);
\r
58 + printf("Track %s Unsupported mode\n", track->num);
\r
63 if (strncmp(&Line[4], "INDEX ", 6)==0)
\r
65 strncpy(inum, &Line[10], 2); inum[2] = '\0';
\r
66 - min = ((Line[13]-'0')<<4) | Line[14]-'0';
\r
67 - sec = ((Line[16]-'0')<<4) | Line[17]-'0';
\r
68 - block = ((Line[19]-'0')<<4) | Line[20]-'0';
\r
69 + min = ((Line[13]-'0')<<4) | (Line[14]-'0');
\r
70 + sec = ((Line[16]-'0')<<4) | (Line[17]-'0');
\r
71 + block = ((Line[19]-'0')<<4) | (Line[20]-'0');
\r
74 if(strcmp(inum, "00")==0) track->idx0 = Index(min, sec, block);
\r
77 uiLastIndex = startidx-1;
\r
78 // Input -- process -- Output
\r
79 - if(startidx != 0) printf("\nNote: PreGap = %d frames\n", startidx-preidx);
\r
80 + if(startidx != 0) printf("\nNote: PreGap = %ld frames\n", startidx-preidx);
\r
81 else printf("\nNote: PreGap = %d frames\n", OFFSET); // cd standard: starting offset
\r
82 // - of course this isn't true for bootable cd's...
\r
84 if(sOutFilename[0] != '\0') {
\r
85 - printf("Creating %s (%06d,%06d) ", sOutFilename, startidx, endidx-1);
\r
86 + printf("Creating %s (%06ld,%06ld) ", sOutFilename, startidx, endidx-1);
\r
88 - printf("Converting (%06d,%06d) ", startidx, endidx-1);
\r
89 + printf("Converting (%06ld,%06ld) ", startidx, endidx-1);
\r
94 buffered_fwrite( buf, SIZERAW );
\r
96 memset( &buf[0], '\0', sizeof( buf ) );
\r
97 - if (startidx%PROG_INTERVAL == 0) { printf("\b\b\b\b\b\b%06d", startidx); }
\r
98 + if (startidx%PROG_INTERVAL == 0) { printf("\b\b\b\b\b\b%06ld", startidx); }
\r
99 if (++startidx == endidx) { printf("\b\b\b\b\b\bComplete\n"); break; }
\r
101 } else if (mode == MODE1_2048) {
\r
102 while( buffered_fread( buf, SIZEISO_MODE1) ) {
\r
103 buffered_fwrite( buf, SIZEISO_MODE1 );
\r
105 - if (startidx%PROG_INTERVAL == 0) { printf("\b\b\b\b\b\b%06d", startidx); }
\r
106 + if (startidx%PROG_INTERVAL == 0) { printf("\b\b\b\b\b\b%06ld", startidx); }
\r
107 if (++startidx == endidx) { printf("\b\b\b\b\b\bComplete\n"); break; }
\r
113 memset( &buf[0], '\0', sizeof( buf ) );
\r
114 - if (startidx%PROG_INTERVAL == 0) { printf("\b\b\b\b\b\b%06d", startidx); }
\r
115 + if (startidx%PROG_INTERVAL == 0) { printf("\b\b\b\b\b\b%06ld", startidx); }
\r
116 if (++startidx == endidx) { printf("\b\b\b\b\b\bComplete\n"); break; }
\r
121 unsigned long int j;
\r
122 unsigned char buf[SIZERAW];
\r
128 /* /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/ */
\r
130 int main(int argc, char **argv) {
\r
131 - unsigned long int count = 0;
\r
132 // int printon = 0;
\r
136 // strlwr(sBinFilename);
\r
139 - printf ("Error: Filename not found on first line of cuefile.\n", argv[1]);
\r
140 + printf ("Error: Filename not found on first line of cuefile %s.\n", argv[1]);
\r
147 for(i = 0; i <= nTracks-1; i++) {
\r
148 - printf("%s (%3d Mb) - sectors %06ld:%06ld (offset %09ld:%09ld)\n",
\r
149 + printf("%s (%3ld Mb) - sectors %06ld:%06ld (offset %09ld:%09ld)\n",
\r
151 tracks[i].size/(1024*1024),
\r