Attachment #191814 for bug #270460

View | Details | Raw Unified | Return to bug 270460
Collapse All | Expand All






/*
 *   getline_() is a wrapper function for get_line().  It returns `False' in
 *   case of error and expects a pointer to a buffer to store the current
 *   line.   Additionally, the final newline character is stripped.
 */

Boolean
getline_(char **bufferp, FILE *f)
{
  size_t l;


Lines 26-32 void *mycalloc(size_t len); Link Here

(-)freetype.orig/freetype1-contrib/ttf2pk/newobj.h (-1 / +1 lines)
26	void myrealloc(void oldp, size_t len);	26	void myrealloc(void oldp, size_t len);
27		27
28	char get_line(FILE f);	28	char get_line(FILE f);
29	Boolean getline(char *bufferp, FILE f);	29	Boolean getline_(char *bufferp, FILE f);
30	char newstring(char s);	30	char newstring(char s);
31		31
32	ttfinfo newchar(Font fnt);	32	ttfinfo newchar(Font fnt);




      if (*bufferp)
        free(*bufferp);

      if (getline_(bufferp, f) == False)
        oops("Premature end in encoding file.");

      curp = *bufferp;

        "Token 258 in encoding must be make-array (]).");
    free(p);

    while (getline_(&buffer, enc_file))
    {
      for (p = buffer; *p; p++)
        if (*p == '%')

  if (replacement_file == NULL)
    oops("Cannot open replacement file `%s'.", real_replacement_name);

  while (getline_(&buffer, replacement_file))
  {
    for (p = buffer; *p; p++)
      if (*p == '%')

Return to bug 270460

Lines 128-140 get_line(FILE *f) Link Here

(-)freetype.orig/freetype1-contrib/ttf2pk/newobj.c (-2 / +2 lines)
128		128
129		129
130	/*	130	/*
131	* getline() is a wrapper function for get_line(). It returns `False' in	131	* getline_() is a wrapper function for get_line(). It returns `False' in
132	* case of error and expects a pointer to a buffer to store the current	132	* case of error and expects a pointer to a buffer to store the current
133	* line. Additionally, the final newline character is stripped.	133	* line. Additionally, the final newline character is stripped.
134	*/	134	*/
135		135
136	Boolean	136	Boolean
137	getline(char *bufferp, FILE f)	137	getline_(char *bufferp, FILE f)
138	{	138	{
139	size_t l;	139	size_t l;
140		140

Lines 63-69 gettoken(char *bufferp, size_t offsetp Link Here

(-)freetype.orig/freetype1-contrib/ttf2pk/parse.c (-3 / +3 lines)
63	if (*bufferp)	63	if (*bufferp)
64	free(*bufferp);	64	free(*bufferp);
65		65
66	if (getline(bufferp, f) == False)	66	if (getline_(bufferp, f) == False)
67	oops("Premature end in encoding file.");	67	oops("Premature end in encoding file.");
68		68
69	curp = *bufferp;	69	curp = *bufferp;
Lines 187-193 readencoding(char *enc, Font fnt, Bool Link Here
187	"Token 258 in encoding must be make-array (]).");	187	"Token 258 in encoding must be make-array (]).");
188	free(p);	188	free(p);
189		189
190	while (getline(&buffer, enc_file))	190	while (getline_(&buffer, enc_file))
191	{	191	{
192	for (p = buffer; *p; p++)	192	for (p = buffer; *p; p++)
193	if (*p == '%')	193	if (*p == '%')
Lines 246-252 get_replacements(Font *fnt) Link Here
246	if (replacement_file == NULL)	246	if (replacement_file == NULL)
247	oops("Cannot open replacement file `%s'.", real_replacement_name);	247	oops("Cannot open replacement file `%s'.", real_replacement_name);
248		248
249	while (getline(&buffer, replacement_file))	249	while (getline_(&buffer, replacement_file))
250	{	250	{
251	for (p = buffer; *p; p++)	251	for (p = buffer; *p; p++)
252	if (*p == '%')	252	if (*p == '%')