Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions ld/catimage.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#ifdef __STDC__
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#endif
#include "x86_aout.h"

Expand All @@ -39,9 +40,14 @@ FILE * ofd;
FILE * ifd = 0;
struct exec header;

main(argc, argv)
int argc;
char ** argv;
void open_obj(char * fname);
void copy_segment(long out_offset,long in_offset,long length);
void patch_bin(long file_off, int value);
void read_symtable(void);
void fatal(char * str);

int
main(int argc, char ** argv)
{
long image_offset, text_off;
int image_id;
Expand Down Expand Up @@ -100,8 +106,8 @@ char ** argv;
exit(0);
}

open_obj(fname)
char * fname;
void
open_obj(char * fname)
{
input_file = fname;

Expand All @@ -117,8 +123,8 @@ char * fname;
fatal("Input file has bad magic number");
}

copy_segment(out_offset, in_offset, length)
long out_offset, in_offset, length;
void
copy_segment(long out_offset,long in_offset,long length)
{
char buffer[1024];
int ssize;
Expand All @@ -143,9 +149,8 @@ long out_offset, in_offset, length;
}
}

patch_bin(file_off, value)
long file_off;
int value;
void
patch_bin(long file_off, int value)
{
char wbuf[4];
if( file_off > 0 )
Expand All @@ -163,7 +168,8 @@ int value;
}
}

read_symtable()
void
read_symtable(void)
{
struct nlist item;
int nitems;
Expand Down Expand Up @@ -234,8 +240,8 @@ read_symtable()
}
}

fatal(str)
char * str;
void
fatal(char * str)
{
fprintf(stderr, "catimage:%s: %s\n", input_file, str);
exit(2);
Expand Down
16 changes: 8 additions & 8 deletions ld/objchop.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ main()

#else

void fatal(char* str);
void write_file(char *fname, long bsize);

FILE * ifd;
struct exec header;

main(argc, argv)
int argc;
char ** argv;
int main(int argc, char** argv)
{
FILE * ofd;
if( argc != 5 ) fatal("Usage: objchop a.out text.bin data.bin sizes.asm");
Expand Down Expand Up @@ -56,9 +57,8 @@ char ** argv;
exit(0);
}

write_file(fname, bsize)
char * fname;
long bsize;
void
write_file(char *fname, long bsize)
{
char buffer[1024];
int ssize;
Expand All @@ -81,8 +81,8 @@ long bsize;
fclose(ofd);
}

fatal(str)
char * str;
void
fatal(char* str)
{
fprintf(stderr, "objchop: %s\n", str);
exit(2);
Expand Down