dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* r_bin 

- Rename characteristics into srwx
  - Fix ref to binmain in the pe64 plugin
* r_bin_pe
  - Rename section.characteristics into section.flags like in
    the other formats
This commit is contained in:
Nibble 2010-06-17 18:45:27 +02:00
parent 9e49939dab
commit 3eb855f6c4
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
binr/rabin2/rabin2.c
View File

@ -294,24 +294,24 @@ static int rabin_show_sections(ut64 at) {
r_flag_name_filter (section->name);
printf ("S 0x%08"PFMT64x" 0x%08"PFMT64x" 0x%08"PFMT64x" 0x%08"PFMT64x" %s %d\n",
section->offset, baddr+section->rva,
section->size, section->vsize, section->name, (int)section->characteristics);
section->size, section->vsize, section->name, (int)section->srwx);
printf ("f section.%s %"PFMT64d" 0x%08"PFMT64x"\n",
section->name, section->size, va?baddr+section->rva:section->offset);
printf ("CC [%02i] va=0x%08"PFMT64x" pa=0x%08"PFMT64x" sz=%"PFMT64d" vsz=%"PFMT64d" "
"rwx=%c%c%c%c %s @ 0x%08"PFMT64x"\n",
i, baddr+section->rva, section->offset, section->size, section->vsize,
R_BIN_SCN_SHAREABLE (section->characteristics)?'s':'-',
R_BIN_SCN_READABLE (section->characteristics)?'r':'-',
R_BIN_SCN_WRITABLE (section->characteristics)?'w':'-',
R_BIN_SCN_EXECUTABLE (section->characteristics)?'x':'-',
R_BIN_SCN_SHAREABLE (section->srwx)?'s':'-',
R_BIN_SCN_READABLE (section->srwx)?'r':'-',
R_BIN_SCN_WRITABLE (section->srwx)?'w':'-',
R_BIN_SCN_EXECUTABLE (section->srwx)?'x':'-',
section->name,va?baddr+section->rva:section->offset);
} else printf ("idx=%02i address=0x%08"PFMT64x" offset=0x%08"PFMT64x" size=%"PFMT64d" vsize=%"PFMT64d" "
"privileges=%c%c%c%c name=%s\n",
i, baddr+section->rva, section->offset, section->size, section->vsize,
R_BIN_SCN_SHAREABLE (section->characteristics)?'s':'-',
R_BIN_SCN_READABLE (section->characteristics)?'r':'-',
R_BIN_SCN_WRITABLE (section->characteristics)?'w':'-',
R_BIN_SCN_EXECUTABLE (section->characteristics)?'x':'-',
R_BIN_SCN_SHAREABLE (section->srwx)?'s':'-',
R_BIN_SCN_READABLE (section->srwx)?'r':'-',
R_BIN_SCN_WRITABLE (section->srwx)?'w':'-',
R_BIN_SCN_EXECUTABLE (section->srwx)?'x':'-',
section->name);
}
i++;

2
libr/bin/format/pe/pe.c
View File

@ -630,7 +630,7 @@ struct r_bin_pe_section_t* PE_(r_bin_pe_get_sections)(struct PE_(r_bin_pe_obj_t)
sections[i].size = shdr[i].SizeOfRawData;
sections[i].vsize = shdr[i].Misc.VirtualSize;
sections[i].offset = shdr[i].PointerToRawData;
sections[i].characteristics = shdr[i].Characteristics;
sections[i].flags = shdr[i].Characteristics;
sections[i].last = 0;
}
sections[i].last = 1;

2
libr/bin/format/pe/pe.h
View File

@ -22,7 +22,7 @@ struct r_bin_pe_section_t {
ut64 vsize;
ut64 rva;
ut64 offset;
ut64 characteristics;
ut64 flags;
int last;
};

8
libr/bin/p/bin_elf.c
View File

@ -67,13 +67,13 @@ static RList* sections(RBin *bin) {
ptr->vsize = section[i].size;
ptr->offset = section[i].offset;
ptr->rva = section[i].rva;
ptr->characteristics = 0;
ptr->srwx = 0;
if (R_BIN_ELF_SCN_IS_EXECUTABLE (section[i].flags))
ptr->characteristics |= 1;
ptr->srwx |= 1;
if (R_BIN_ELF_SCN_IS_WRITABLE (section[i].flags))
ptr->characteristics |= 2;
ptr->srwx |= 2;
if (R_BIN_ELF_SCN_IS_READABLE (section[i].flags))
ptr->characteristics |= 4;
ptr->srwx |= 4;
r_list_append (ret, ptr);
}
free (section);

2
libr/bin/p/bin_mach0.c
View File

@ -62,7 +62,7 @@ static RList* sections(RBin *bin) {
ptr->vsize = sections[i].size;
ptr->offset = sections[i].offset;
ptr->rva = sections[i].addr;
ptr->characteristics = 0;
ptr->srwx = 0;
r_list_append (ret, ptr);
}
free (sections);

18
libr/bin/p/bin_pe.c
View File

@ -71,15 +71,15 @@ static RList* sections(RBin *bin) {
ptr->vsize = sections[i].vsize;
ptr->offset = sections[i].offset;
ptr->rva = sections[i].rva;
ptr->characteristics = 0;
if (R_BIN_PE_SCN_IS_EXECUTABLE (sections[i].characteristics))
ptr->characteristics |= 0x1;
if (R_BIN_PE_SCN_IS_WRITABLE (sections[i].characteristics))
ptr->characteristics |= 0x2;
if (R_BIN_PE_SCN_IS_READABLE (sections[i].characteristics))
ptr->characteristics |= 0x4;
if (R_BIN_PE_SCN_IS_SHAREABLE (sections[i].characteristics))
ptr->characteristics |= 0x8;
ptr->srwx = 0;
if (R_BIN_PE_SCN_IS_EXECUTABLE (sections[i].flags))
ptr->srwx |= 0x1;
if (R_BIN_PE_SCN_IS_WRITABLE (sections[i].flags))
ptr->srwx |= 0x2;
if (R_BIN_PE_SCN_IS_READABLE (sections[i].flags))
ptr->srwx |= 0x4;
if (R_BIN_PE_SCN_IS_SHAREABLE (sections[i].flags))
ptr->srwx |= 0x8;
r_list_append (ret, ptr);
}
free (sections);

2
libr/bin/p/bin_pe64.c
View File

@ -28,7 +28,7 @@ struct r_bin_plugin_t r_bin_plugin_pe64 = {
.destroy = &destroy,
.check = &check,
.baddr = &baddr,
.main = NULL,
.main = &binmain,
.entries = &entries,
.sections = &sections,
.symbols = &symbols,

2
libr/include/r_bin.h
View File

@ -75,7 +75,7 @@ typedef struct r_bin_section_t {
ut64 vsize;
ut64 rva;
ut64 offset;
ut64 characteristics;
ut64 srwx;
} RBinSection;
typedef struct r_bin_symbol_t {