logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

meslibc.patch (4367B)

    

  1. SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
  3. SPDX-License-Identifier: GPL-3.0-or-later
  5. Remove usages of tmpfile(), rewind(), fgetpos(), fsetpos() and bsearch(),
  6. which are unsupported by meslibc, and add missing declaration for strdup.
  8. License note: Berkeley Yacc is in the public domain, but it's linked with
  9. meslibc, which is GPL-3.0-or-later, so we apply that license here too.
  11. diff -ru ../byacc-20240109.bak/main.c ./main.c
  12. --- byacc-20240109/main.c	2024-04-14 16:06:09.646465507 +0200
  13. +++ byacc-20240109/main.c	2024-04-14 20:41:56.227083399 +0200
  14. @@ -788,7 +788,7 @@
  15.  	(void)umask(save_umask);
  16.      }
  17.  #else
  18. -    result = tmpfile();
  19. +    result = fopen(label, "w+");
  20.  #endif
  21.  
  22.      if (result == 0)
  23. diff -ru ../byacc-20240109.bak/output.c ./output.c
  24. --- byacc-20240109/output.c	2024-04-14 16:06:09.646465507 +0200
  25. +++ byacc-20240109/output.c	2024-04-14 16:06:24.636465897 +0200
  26. @@ -1289,7 +1289,7 @@
  27.  	{
  28.  	    if (union_file != 0)
  29.  	    {
  30. -		rewind(union_file);
  31. +		fseek(union_file, 0, SEEK_SET);
  32.  		while ((c = getc(union_file)) != EOF)
  33.  		    putc_code(fp, c);
  34.  	    }
  35. @@ -1314,7 +1314,7 @@
  36.  
  37.      if (text_file == NULL)
  38.  	open_error("text_file");
  39. -    rewind(text_file);
  40. +    fseek(text_file, 0, SEEK_SET);
  41.      in = text_file;
  42.      if ((c = getc(in)) == EOF)
  43.  	return;
  44. @@ -1684,7 +1684,7 @@
  45.      int state;
  46.      char line_state[20];
  47.  
  48. -    rewind(action_file);
  49. +    fseek(action_file, 0, SEEK_SET);
  50.      if ((c = getc(action_file)) == EOF)
  51.  	return;
  52.  
  53. diff -ru ../byacc-20240109.bak/reader.c ./reader.c
  54. --- byacc-20240109/reader.c	2024-04-14 16:06:09.646465507 +0200
  55. +++ byacc-20240109/reader.c	2024-04-14 20:40:58.387082748 +0200
  56. @@ -70,7 +70,7 @@
  57.      char *line_data;	/* saved input-line */
  58.      size_t line_used;	/* position within saved input-line */
  59.      size_t line_size;	/* length of saved input-line */
  60. -    fpos_t line_fpos;	/* pointer before reading past saved input-line */
  61. +    long line_fpos;	/* pointer before reading past saved input-line */
  62.  }
  63.  SAVE_LINE;
  64.  
  65. @@ -315,7 +315,7 @@
  66.  	line = save_area.line_data;
  67.  	cptr = save_area.line_used + line;
  68.  	linesize = save_area.line_size;
  69. -	if (fsetpos(input_file, &save_area.line_fpos) != 0)
  70. +	if (fseek(input_file, save_area.line_fpos, SEEK_SET) != 0)
  71.  	    on_error();
  72.  	memset(&save_area, 0, sizeof(save_area));
  73.      }
  74. @@ -338,7 +338,7 @@
  75.  	save_area.line_size = linesize;
  76.  	NO_SPACE(save_area.line_data);
  77.  	memcpy(save_area.line_data, line, linesize);
  78. -	if (fgetpos(f, &save_area.line_fpos) != 0)
  79. +	if ((save_area.line_fpos = ftell(f)) == -1)
  80.  	    on_error();
  81.  	must_save = -must_save;
  82.      }
  83. @@ -572,6 +572,36 @@
  84.      return strcmp(p->name, q->name);
  85.  }
  86.  
  87. +/*
  88. + * Compare keyword to cached token, treating '_' and '-' the same.  Some
  89. + * grammars rely upon this misfeature.
  90. + */
  91. +static int
  92. +matchec(const char *name)
  93. +{
  94. +    const char *p = cache;
  95. +    const char *q = name;
  96. +    int code = 0;	/* assume mismatch */
  97. +
  98. +    while (*p != '\0' && *q != '\0')
  99. +    {
  100. +	char a = *p++;
  101. +	char b = *q++;
  102. +	if (a == '_')
  103. +	    a = '-';
  104. +	if (b == '_')
  105. +	    b = '-';
  106. +	if (a != b)
  107. +	    break;
  108. +	if (*p == '\0' && *q == '\0')
  109. +	{
  110. +	    code = 1;
  111. +	    break;
  112. +	}
  113. +    }
  114. +    return code;
  115. +}
  116. +
  117.  static int
  118.  keyword(void)
  119.  {
  120. @@ -612,10 +642,36 @@
  121.  	}
  122.  	cachec(NUL);
  123.  
  124. -	if ((key = bsearch(cache, keywords,
  125. -			   sizeof(keywords) / sizeof(*key),
  126. -			   sizeof(*key), compare_keys)))
  127. -	    return key->token;
  128. +	if (matchec("token") || matchec("term"))
  129. +	    return (TOKEN);
  130. +	if (matchec("type"))
  131. +	    return (TYPE);
  132. +	if (matchec("left"))
  133. +	    return (LEFT);
  134. +	if (matchec("right"))
  135. +	    return (RIGHT);
  136. +	if (matchec("nonassoc") || matchec("binary"))
  137. +	    return (NONASSOC);
  138. +	if (matchec("start"))
  139. +	    return (START);
  140. +	if (matchec("union"))
  141. +	    return (UNION);
  142. +	if (matchec("ident"))
  143. +	    return (IDENT);
  144. +	if (matchec("expect"))
  145. +	    return (EXPECT);
  146. +	if (matchec("expect-rr"))
  147. +	    return (EXPECT_RR);
  148. +	if (matchec("pure-parser"))
  149. +	    return (PURE_PARSER);
  150. +	if (matchec("parse-param"))
  151. +	    return (PARSE_PARAM);
  152. +	if (matchec("lex-param"))
  153. +	    return (LEX_PARAM);
  154. +	if (matchec("token-table"))
  155. +	    return (TOKEN_TABLE);
  156. +	if (matchec("yacc"))
  157. +	    return (POSIX_YACC);
  158.      }
  159.      else
  160.      {
  161. @@ -1178,6 +1234,9 @@
  162.      return result;
  163.  }
  164.  
  165. +char *
  166. +strdup (char const *s);
  167. +
  168.  static void
  169.  save_param(int k, char *buffer, int name, int type2)
  170.  {