11
11
* Copyright (C) 1995-1997 H. Peter Anvin
12
12
*/
13
13
14
+ #include <libgen.h>
15
+ #include <linux/limits.h>
14
16
#include <stdio.h>
15
17
#include <stdlib.h>
16
18
#include <sysexits.h>
@@ -76,8 +78,8 @@ static void addpair(int fp, int un)
76
78
int main (int argc , char * argv [])
77
79
{
78
80
FILE * ctbl ;
79
- const char * tblname , * rel_tblname ;
80
- const char * abs_srctree ;
81
+ const char * tblname ;
82
+ char base_tblname [ PATH_MAX ] ;
81
83
char buffer [65536 ];
82
84
int fontlen ;
83
85
int i , nuni , nent ;
@@ -102,16 +104,6 @@ int main(int argc, char *argv[])
102
104
}
103
105
}
104
106
105
- abs_srctree = getenv ("abs_srctree" );
106
- if (abs_srctree && !strncmp (abs_srctree , tblname , strlen (abs_srctree )))
107
- {
108
- rel_tblname = tblname + strlen (abs_srctree );
109
- while (* rel_tblname == '/' )
110
- ++ rel_tblname ;
111
- }
112
- else
113
- rel_tblname = tblname ;
114
-
115
107
/* For now we assume the default font is always 256 characters. */
116
108
fontlen = 256 ;
117
109
@@ -253,6 +245,8 @@ int main(int argc, char *argv[])
253
245
for ( i = 0 ; i < fontlen ; i ++ )
254
246
nuni += unicount [i ];
255
247
248
+ strncpy (base_tblname , tblname , PATH_MAX );
249
+ base_tblname [PATH_MAX - 1 ] = 0 ;
256
250
printf ("\
257
251
/*\n\
258
252
* Do not edit this file; it was automatically generated by\n\
@@ -264,7 +258,7 @@ int main(int argc, char *argv[])
264
258
#include <linux/types.h>\n\
265
259
\n\
266
260
u8 dfont_unicount[%d] = \n\
267
- {\n\t" , rel_tblname , fontlen );
261
+ {\n\t" , basename ( base_tblname ) , fontlen );
268
262
269
263
for ( i = 0 ; i < fontlen ; i ++ )
270
264
{
0 commit comments