Apple-2gs-SW
/
DumpObj
mirror of https://github.com/byteworksinc/DumpObj.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4 from ksherlock/patch_4 

fix hex dump function
This commit is contained in:
MikeW50 2018-03-25 15:23:57 -06:00 committed by GitHub
parent 988ff7929e 7b60740a02
commit 434f5d8544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DumpOBJ.cc
View File

@ -502,11 +502,12 @@ return FALSE;
BOOLEAN NextSeg(void) BOOLEAN NextSeg(void)
{ {
if ((format == 2)
|| ((format == 1) && !header && !checkf)) { if ((format == 2 || format == 1) && !header && !checkf) {
numsex = 0; numsex = 0;
return TRUE; return TRUE;
} }
do do
{ {
if ((ftype == LIBFL) || (version == 2)) { if ((ftype == LIBFL) || (version == 2)) {
@ -1246,7 +1247,7 @@ while (NextSeg()) {
if (body) { /* write out the body */ if (body) { /* write out the body */
if ((! header) && checkf) { if ((! header) && checkf) {
count = bod_disp; count = bod_disp;
fseek(input, ftell(input) + bod_disp, SEEK_CUR); fseek(input, ftell(input) + bod_disp, SEEK_SET);
} }
PutOpCodeBody(); PutOpCodeBody();
} }
@ -2374,6 +2375,8 @@ while (NextSeg()) {
} }
if ((! shorth) || body) if ((! shorth) || body)
puts("\n"); puts("\n");
if (!checkf && !header) break;
} }
} }
@ -2396,8 +2399,10 @@ int k, i, space;
while (NextSeg()) { while (NextSeg()) {
count = 0L; count = 0L;
CheckESC(); CheckESC();
if (! PutHeader()) /* write out the header */ if (checkf || header) /* write out the header */
return; if (! PutHeader())
return;
/* if we don't print header and we're not doing file checking then /* if we don't print header and we're not doing file checking then
dump the entire file and forget about segment scanning */ dump the entire file and forget about segment scanning */
if ((! checkf) && (! header)) { /* get the segment length */ if ((! checkf) && (! header)) { /* get the segment length */
@ -2413,6 +2418,7 @@ while (NextSeg()) {
count = bod_disp; count = bod_disp;
fseek(input, ftell(input) + bod_disp, SEEK_SET); fseek(input, ftell(input) + bod_disp, SEEK_SET);
} }
while (count <= mark) { while (count <= mark) {
putchar('\n'); putchar('\n');
if (colf) if (colf)
@ -2444,6 +2450,8 @@ while (NextSeg()) {
} }
} }
if ((! shorth) || body) printf("\n\n"); if ((! shorth) || body) printf("\n\n");
if (!checkf && !header) break;
} }
} }