Module Name: src
Committed By: christos
Date: Sun Jan 29 01:46:37 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/asn1: gen.c
Log Message:
handle our basename.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.4 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.5
--- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.4 Sat Jan 28 16:31:45 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c Sat Jan 28 20:46:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.4 2017/01/28 21:31:45 christos Exp $ */
+/* $NetBSD: gen.c,v 1.5 2017/01/29 01:46:37 christos Exp $ */
/*
* Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -38,7 +38,7 @@
#include "gen_locl.h"
#include <libgen.h>
-__RCSID("$NetBSD: gen.c,v 1.4 2017/01/28 21:31:45 christos Exp $");
+__RCSID("$NetBSD: gen.c,v 1.5 2017/01/29 01:46:37 christos Exp $");
FILE *privheaderfile, *headerfile, *codefile, *logfile, *templatefile;
@@ -153,10 +153,12 @@ init_generate (const char *filename, con
/* template file */
if (asprintf(&template, "%s-template.x", headerbase) < 0 || template == NULL)
errx(1, "malloc");
+ char *copy = estrdup(filename);
+ char *bn = basename(copy);
fprintf (headerfile,
"/* Generated from %s */\n"
"/* Do not edit */\n\n",
- basename(filename));
+ bn);
fprintf (headerfile,
"#ifndef __%s_h__\n"
"#define __%s_h__\n\n", headerbase, headerbase);
@@ -273,8 +275,9 @@ init_generate (const char *filename, con
"#include <errno.h>\n"
"#include <limits.h>\n"
"#include <krb5/%s.h>\n",
- basename(filename),
+ bn,
type_file_string);
+ free(copy);
fprintf (templatefile,
"#include <%s>\n"
@@ -364,6 +367,8 @@ generate_header_of_codefile(const char *
fprintf(logfile, "%s ", filename);
free(filename);
filename = NULL;
+ char *copy = estrdup(orig_filename);
+ char *bn = basename(copy);
fprintf (codefile,
"/* Generated from %s */\n"
"/* Do not edit */\n\n"
@@ -375,8 +380,9 @@ generate_header_of_codefile(const char *
"#include <errno.h>\n"
"#include <limits.h>\n"
"#include <krb5/%s>\n",
- basename(orig_filename),
+ bn,
type_file_string);
+ free(copy);
fprintf (codefile,
"#include \"%s\"\n"
