oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Give tags to generated structs.

Browse Source 
Use `err' and `asprintf'


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2271 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-14 11:37:10 +00:00
parent bcfcce7d80
commit 48011fae6a
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/asn1/gen.c
View File

@@ -13,10 +13,8 @@ init_generate (char *filename)
{ {
orig_filename = filename; orig_filename = filename;
headerfile = fopen (STEM ".h", "w"); headerfile = fopen (STEM ".h", "w");
if (headerfile == NULL) { if (headerfile == NULL)
fprintf (stderr, "Could not open " STEM ".h" "\n"); err (1, "open " STEM ".h");
exit (1);
}
fprintf (headerfile, fprintf (headerfile,
"/* Generated from %s */\n" "/* Generated from %s */\n"
"/* Do not edit */\n\n", "/* Do not edit */\n\n",
@@ -28,13 +26,13 @@ init_generate (char *filename)
"#include <stddef.h>\n" "#include <stddef.h>\n"
"#include <time.h>\n\n"); "#include <time.h>\n\n");
fprintf (headerfile, fprintf (headerfile,
"typedef struct {\n" "typedef struct octet_string {\n"
" size_t length;\n" " size_t length;\n"
" void *data;\n" " void *data;\n"
"} octet_string;\n\n"); "} octet_string;\n\n");
fprintf (headerfile, fprintf (headerfile,
#if 0 #if 0
"typedef struct {\n" "typedef struct general_string {\n"
" size_t length;\n" " size_t length;\n"
" char *data;\n" " char *data;\n"
"} general_string;\n\n" "} general_string;\n\n"
@@ -43,10 +41,8 @@ init_generate (char *filename)
#endif #endif
); );
logfile = fopen(STEM "_files", "w"); logfile = fopen(STEM "_files", "w");
if (logfile == NULL) { if (logfile == NULL)
fprintf (stderr, "Could not open " STEM "_files" "\n"); err (1, "open " STEM "_files");
exit (1);
}
} }
void void
@@ -157,7 +153,7 @@ define_asn1 (int level, Type *t)
} }
static void static void
define_type (int level, char *name, Type *t) define_type (int level, char *name, Type *t, int typedefp)
{ {
switch (t->type) { switch (t->type) {
case TType: case TType:
@@ -179,12 +175,12 @@ define_type (int level, char *name, Type *t)
i.type = TInteger; i.type = TInteger;
space(level); space(level);
fprintf (headerfile, "struct {\n"); fprintf (headerfile, "struct %s {\n", typedefp ? name : "");
for (m = t->members; m && m->val != tag; m = m->next) { for (m = t->members; m && m->val != tag; m = m->next) {
char *n = malloc(strlen(m->gen_name) + 3); char *n;
strcpy (n, m->gen_name);
strcat (n, ":1"); asprintf (&n, "%s:1", m->gen_name);
define_type (level + 1, n, &i); define_type (level + 1, n, &i, FALSE);
free (n); free (n);
if (tag == -1) if (tag == -1)
tag = m->val; tag = m->val;
@@ -198,17 +194,16 @@ define_type (int level, char *name, Type *t)
int tag = -1; int tag = -1;
space(level); space(level);
fprintf (headerfile, "struct {\n"); fprintf (headerfile, "struct %s {\n", typedefp ? name : "");
for (m = t->members; m && m->val != tag; m = m->next) { for (m = t->members; m && m->val != tag; m = m->next) {
if (m->optional) { if (m->optional) {
char *n = malloc(strlen(m->gen_name) + 2); char *n;
*n = '*'; asprintf (&n, "*%s", m->gen_name);
strcpy (n+1, m->gen_name); define_type (level + 1, n, m->type, FALSE);
define_type (level + 1, n, m->type);
free (n); free (n);
} else } else
define_type (level + 1, m->gen_name, m->type); define_type (level + 1, m->gen_name, m->type, FALSE);
if (tag == -1) if (tag == -1)
tag = m->val; tag = m->val;
} }
@@ -223,9 +218,9 @@ define_type (int level, char *name, Type *t)
i.application = 0; i.application = 0;
space(level); space(level);
fprintf (headerfile, "struct {\n"); fprintf (headerfile, "struct %s {\n", typedefp ? name : "");
define_type (level + 1, "len", &i); define_type (level + 1, "len", &i, FALSE);
define_type (level + 1, "*val", t->subtype); define_type (level + 1, "*val", t->subtype, FALSE);
space(level); space(level);
fprintf (headerfile, "} %s;\n", name); fprintf (headerfile, "} %s;\n", name);
break; break;
@@ -239,7 +234,7 @@ define_type (int level, char *name, Type *t)
fprintf (headerfile, "general_string %s;\n", name); fprintf (headerfile, "general_string %s;\n", name);
break; break;
case TApplication: case TApplication:
define_type (level, name, t->subtype); define_type (level, name, t->subtype, FALSE);
break; break;
default: default:
abort (); abort ();
@@ -255,7 +250,7 @@ generate_type_header (Symbol *s)
fprintf (headerfile, "\n*/\n\n"); fprintf (headerfile, "\n*/\n\n");
fprintf (headerfile, "typedef "); fprintf (headerfile, "typedef ");
define_type (0, s->gen_name, s->type); define_type (0, s->gen_name, s->type, TRUE);
fprintf (headerfile, "\n"); fprintf (headerfile, "\n");
} }
@@ -264,13 +259,11 @@ generate_type_header (Symbol *s)
void void
generate_type (Symbol *s) generate_type (Symbol *s)
{ {
char *filename = malloc(strlen(STEM) + strlen(s->gen_name) + 4); char *filename;
sprintf(filename, "%s_%s.x", STEM, s->gen_name); asprintf (&filename, "%s_%s.x", STEM, s->gen_name);
codefile = fopen (filename, "w"); codefile = fopen (filename, "w");
if (codefile == NULL) { if (codefile == NULL)
fprintf (stderr, "Could not create %s\n", filename); err (1, "fopen %s", filename);
exit (1);
}
fprintf(logfile, "%s ", filename); fprintf(logfile, "%s ", filename);
free(filename); free(filename);
fprintf (codefile, fprintf (codefile,