 @@ -1,14 +1,14 @@
-/* $NetBSD: check-portability.c,v 1.6 2020/03/12 19:26:17 rillig Exp $ */
+/* $NetBSD: check-portability.c,v 1.7 2020/03/12 19:45:06 rillig Exp $ */
 /*
  Copyright (c) 2020 Roland Illig
  All rights reserved.
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
 . Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
 @@ -228,51 +228,69 @@ static bool
 str_read_text_line(str *s, FILE *f)
+{
 	int c;
 	s->len = 0;
 	while ((c = fgetc(f)) > '\0' && c != '\n' && c != '\r') {
 		str_append_char(s, (char) c);
+	}
 	assert(c != '\0');
 	return c != EOF;
+}
 typedef enum {
 	W_how_to_fix,
 	W_dollar_random,
 	W_test_eqeq,
 	W_double_bracket
 } warning_kind;
 static unsigned long explained = 0;
 static void
 explain(warning_kind warning, ...)
+{
 	unsigned long mask = 1UL << warning;
 	if ((explained & mask) != 0)
 		return;
 	explained |= mask;
 	va_list args;
 	va_start(args, warning);
 	printf("\n");
 	const char *line;
 	while ((line = va_arg(args, const char *)) != nullptr)
 		printf("%s%s\n", line[0] == '\0' ? "" : "\t", line);
 	printf("\n");
 	va_end(args);
+}
 static void
 explain_how_to_fix(void)
+{
 	explain(
 	    W_how_to_fix,
 	    "To fix this message, decide whether this file is necessary",
 	    "for the package to build. Then choose any of these variants:",
 	    "",
 	    "1.  Add a patch for the file",
 	    "    (see https://www.netbsd.org/docs/pkgsrc/pkgsrc.html#components.patches)",
 	    "2.  Add a SUBST block for the file to the package Makefile",
 	    "    (see mk/subst.mk)",
 	    "3.  Add CHECK_PORTABILITY_SKIP+= shell/glob to the package Makefile",
 	    "    (see mk/check/check-portability.mk)",
 	    nullptr);
+}
 static size_t
 index_opening_bracket(cstr s)
+{
 	size_t index = cstr_index(s, CSTR("[["));
 	if (index == npos)
 		return npos;
 	if (index > 0 && !is_hspace(s.data[index - 1]))
 		return npos;
 	if (index + 2 < s.len && !is_hspace(s.data[index + 2]))
 		return npos;
 	return index;
+}
 @@ -318,26 +336,27 @@ checkline_sh_double_brackets(cstr filena
 	    cstr_charptr(filename), lineno, opening_index + 1,
 	    cstr_charptr(line));
 	nerrors++;
 	explain(
 	    W_double_bracket,
 	    "The keyword [[ is only available in bash, not in other shells.",
 	    "Since it is typically used inside an if statement, if that",
 	    "command is missing, it is interpreted as a \"no\".",
 	    "",
 	    "An error message of the form \"[[: command not found\"",
 	    "is logged, but that is easy to overlook in the large",
 	    "output of the build process.",
 	    nullptr);
 	explain_how_to_fix();
+}
 // Check for $RANDOM, which is specific to ksh and bash.
 static void
 checkline_sh_dollar_random(cstr filename, size_t lineno, cstr line)
+{
 	// Note: This code does not find _all_ instances of
 	// unportable code. If a single line contains an unsafe and
 	// a safe usage of $RANDOM, it will pass the test.
 	if (is_shell_comment(line))
 		return;
 	if (!cstr_contains(line, CSTR("$RANDOM")))
 		return;
 @@ -354,26 +373,27 @@ checkline_sh_dollar_random(cstr filename
 	if (idx != npos && idx + 7 < line.len && is_alnum(line.data[idx + 7]))
 		return;
 	printf("%s:%zu:%zu: $RANDOM: %s\n",
 	    cstr_charptr(filename), lineno, idx + 1,
 	    cstr_charptr(line));
 	explain(
 	    W_dollar_random,
 	    "The variable $RANDOM is not required for a POSIX-conforming shell, and",
 	    "many implementations of /bin/sh do not support it. It should therefore",
 	    "not be used in shell programs that are meant to be portable across a",
 	    "large number of POSIX-like systems.",
 	    nullptr);
 	explain_how_to_fix();
+}
 typedef void (*foreach_3_fields_cb)(cstr f1, cstr f2, cstr f3, void *actiondata);
 static void
 foreach_3_fields_in_line(cstr line, foreach_3_fields_cb action, void *actiondata)
+{
 	size_t idx = 0;
 	cstr f1 = cstr_next_field(line, &idx);
 	cstr f2 = cstr_next_field(line, &idx);
 	cstr f3 = cstr_next_field(line, &idx);
 	while (f3.len > 0) {
 @@ -403,33 +423,28 @@ checkline_sh_test_eqeq_action(cstr f1, c
 	    "%s:%zu:%zu: found test ... == ...: %s\n",
 	    cstr_charptr(ad->filename), ad->lineno,
 	    (size_t) (f3.data - ad->line.data),
 	    cstr_charptr(ad->line));
 	explain(
 	    W_test_eqeq,
 	    "The \"test\" command, as well as the \"[\" command, are not required to know",
 	    "the \"==\" operator. Only a few implementations like bash and some",
 	    "versions of ksh support it.",
 	    "",
 	    "When you run \"test foo == foo\" on a platform that does not support the",
 	    "\"==\" operator, the result will be \"false\" instead of \"true\". This can",
 	    "lead to unexpected behavior.",
 	    "",
 	    "There are two ways to fix this error message. If the file that contains",
 	    "the \"test ==\" is needed for building the package, you should create a",
 	    "patch for it, replacing the \"==\" operator with \"=\". If the file is not",
 	    "needed, add its name to the CHECK_PORTABILITY_SKIP variable in the",
 	    "package Makefile.",
 	    nullptr);
 	explain_how_to_fix();
+}
 static void
 checkline_sh_test_eqeq(cstr filename, size_t lineno, cstr line)
+{
 	if (is_shell_comment(line))
 		return;
 	struct checkline_sh_test_eqeq_actiondata ad = { filename, lineno, line };
 	foreach_3_fields_in_line(line, checkline_sh_test_eqeq_action, &ad);
+}
 static bool