diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2002-04-30 21:00:33 +0000 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2002-04-30 21:00:33 +0000 |
| commit | 1cd0e2d5bf50b2cc482cad7beb8f7dee6a81d57b (patch) | |
| tree | 53de3660be58d806d9de78394b44e95b9e80a55c /rdoff/rdoff.c | |
| parent | af535c16cf3f9f628384ec834e3aa325709cb37b (diff) | |
| download | nasm-1cd0e2d5bf50b2cc482cad7beb8f7dee6a81d57b.tar.gz | |
NASM 0.98.08nasm-0.98.08
Diffstat (limited to 'rdoff/rdoff.c')
| -rw-r--r-- | rdoff/rdoff.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/rdoff/rdoff.c b/rdoff/rdoff.c index 7f4937ac..e7d8b764 100644 --- a/rdoff/rdoff.c +++ b/rdoff/rdoff.c @@ -24,6 +24,7 @@ #include <string.h> #include <errno.h> +#include "multboot.h" #include "rdoff.h" #define newstr(str) strcpy(malloc(strlen(str) + 1),str) @@ -49,13 +50,14 @@ memorybuffer * newmembuf() memorybuffer * t; t = malloc(sizeof(memorybuffer)); + if (!t) return NULL; t->length = 0; t->next = NULL; return t; } -void membufwrite(memorybuffer *b, void *data, int bytes) +void membufwrite(memorybuffer *const b, void *data, int bytes) { int16 w; long l; @@ -276,7 +278,10 @@ int rdfopenhere(rdffile *f, FILE *fp, int *refcount, const char *name) int rdfclose(rdffile *f) { if (! f->refcount || ! --(*f->refcount)) - fclose(f->fp); + { + fclose(f->fp); + f->fp = NULL; + } free(f->name); return 0; @@ -400,6 +405,10 @@ rdfheaderrec *rdfgetheaderrec(rdffile *f) RI32(r.b.amount); break; + case 8: /* Module name record */ + RS(r.m.modname,127); + break; + default: #ifdef STRICT_ERRORS rdf_errno = 8; /* unknown header record */ @@ -420,7 +429,7 @@ void rdfheaderrewind(rdffile *f) rdf_headerbuf * rdfnewheader(void) { - rdf_headerbuf * hb = malloc(sizeof(hb)); + rdf_headerbuf * hb = malloc(sizeof(rdf_headerbuf)); if (hb == NULL) return NULL; hb->buf = newmembuf(); @@ -468,6 +477,16 @@ int rdfaddheader(rdf_headerbuf * h, rdfheaderrec * r) membufwrite(h->buf,&r->b.amount,-4); break ; + case 8: /* Module name */ + membufwrite(h->buf,&r->m.modname,strlen(r->m.modname) + 1); + break ; + +#ifdef _MULTBOOT_H + case 9: /* MultiBoot header */ + membufwrite(h->buf,&r->mbh.mb,sizeof(struct tMultiBootHeader)+RDFLDRMOVER_SIZE); + break ; +#endif + default: #ifdef STRICT_ERRORS return (rdf_errno = 8); @@ -509,3 +528,4 @@ void rdfdoneheader(rdf_headerbuf * h) freemembuf(h->buf); free(h); } + |