comparison xdwsort.cpp @ 3:edfa39292d78

small fix.
author pyon@macmini
date Tue, 24 Oct 2017 19:29:36 +0900
parents 9341384c2785
children 61ce4754737e
comparison
equal deleted inserted replaced
2:f96c40f7aeae 3:edfa39292d78
1 /* Makefile 1 /* Makefile
2 debug: xdwsort.cpp 2 debug: xdwsort.c
3 #rm -rf tempXXXX 3 #rm -rf tempXXXX
4 #cls 4 #cls
5 gcc -g -O0 -I. xdwsort.cpp xdwapi.lib 5 gcc -g -O0 -I. xdwsort.c xdwapi.lib
6 #date 6 #date
7 #./a.exe target.xdw 7 #./a.exe target.xdw
8 #date 8 #date
9 9
10 release: xdwsort.cpp 10 release: xdwsort.c
11 gcc -I. xdwsort.cpp xdwapi.lib -static -o xdwsort.exe 11 gcc -I. xdwsort.c xdwapi.lib -static -o xdwsort.exe
12 strip xdwsort.exe 12 strip xdwsort.exe
13 13
14 clean: 14 clean:
15 rm -rf tempXXXX 15 rm -rf tempXXXX
16 */ 16 */
82 print_now( "start." ); 82 print_now( "start." );
83 break; 83 break;
84 case 'l': /* now writing... */ 84 case 'l': /* now writing... */
85 break; 85 break;
86 default: 86 default:
87 printf("error: illegal option '%c'.\n", c ); 87 fprintf( stderr, "error: illegal option '%c'.\n", c );
88 exit( 1 ); 88 exit( 1 );
89 } 89 }
90 } 90 }
91 } 91 }
92 92
218 exit( 1 ); 218 exit( 1 );
219 } 219 }
220 } 220 }
221 sprintf( buf, "tempXXXX/%04d.xdw", p + 1 ); 221 sprintf( buf, "tempXXXX/%04d.xdw", p + 1 );
222 _fullpath( in_path, buf, _MAX_PATH ); 222 _fullpath( in_path, buf, _MAX_PATH );
223 strncpy( &blk_path[ m * _MAX_PATH ], buf, _MAX_PATH ); 223 strncpy( &blk_path[ m * _MAX_PATH ], in_path, _MAX_PATH );
224 blk_path_addr[m] = &blk_path[ m * _MAX_PATH ]; 224 blk_path_addr[m] = &blk_path[ m * _MAX_PATH ];
225 } 225 }
226 if ( last_page % BLOCKSZ != 0 ) { 226 if ( last_page % BLOCKSZ != 0 ) {
227 sprintf( buf, "tempXXXX/b%04d.xdw", ++bn ); 227 sprintf( buf, "tempXXXX/b%04d.xdw", ++bn );
228 _fullpath( in_path, buf, _MAX_PATH ); 228 _fullpath( in_path, buf, _MAX_PATH );
235 235
236 // ブロックをまとめる 236 // ブロックをまとめる
237 for ( int b = 0; b < bn; b++ ) { 237 for ( int b = 0; b < bn; b++ ) {
238 sprintf( buf, "tempXXXX/b%04d.xdw", b + 1 ); 238 sprintf( buf, "tempXXXX/b%04d.xdw", b + 1 );
239 _fullpath( in_path, buf, _MAX_PATH ); 239 _fullpath( in_path, buf, _MAX_PATH );
240 strncpy( &blk_path[ b * _MAX_PATH ], buf, _MAX_PATH ); 240 strncpy( &blk_path[ b * _MAX_PATH ], in_path, _MAX_PATH );
241 blk_path_addr[b] = &blk_path[ b * _MAX_PATH ]; 241 blk_path_addr[b] = &blk_path[ b * _MAX_PATH ];
242 } 242 }
243 _fullpath( in_path, "tempXXXX/temp.xdw", _MAX_PATH ); 243 _fullpath( in_path, "tempXXXX/temp.xdw", _MAX_PATH );
244 remove( in_path ); 244 remove( in_path );
245 api_result = XDW_MergeXdwFiles( blk_path_addr, bn, in_path, NULL ); 245 api_result = XDW_MergeXdwFiles( blk_path_addr, bn, in_path, NULL );