From 30d087eaeca5454eca3dba0ed4bf0a8f0f204c89 Mon Sep 17 00:00:00 2001
From: Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>
Date: Fri, 15 Mar 2024 11:22:53 +0100
Subject: [PATCH] xxx

---
 cobc/cobc.c                          | 23 +----------------------
 cobc/cobc.h                          |  1 +
 cobc/error.c                         | 24 ++++++++++++++++++++++++
 cobc/typeck.c                        |  1 +
 tests/testsuite.src/used_binaries.at | 23 +++++++++++------------
 5 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/cobc/cobc.c b/cobc/cobc.c
index 52b2bc60b..e7137c4e7 100644
--- a/cobc/cobc.c
+++ b/cobc/cobc.c
@@ -9220,27 +9220,6 @@ finish_setup_internal_env (void)
 	CB_TEXT_LIST_CHK (cb_include_list, COB_COPY_DIR);
 }
 
-/* Replace a copy of the argument with backslashes replaced by slashes
-in filenames. Note that all Windows system calls accept slashes
-instead of backslashes. Only a few tools force the use of slashes,
-such as the cmd shell. */
-static char *
-slashify (const char *src)
-{
-	int i;
-	int len = strlen (src);
-	char *dst = cobc_malloc (len+1);
-	for (i=0; i<len; i++){
-		char c = src[i];
-		if ( c == '\\' )
-			dst[i] = '/';
-		else
-			dst[i] = c;
-	}
-	dst[i] = 0;
-	return dst;
-}
-
 static int
 process_file (struct filename *fn, int status)
 {
@@ -9327,7 +9306,7 @@ process_file (struct filename *fn, int status)
 		}
 
 		for (l = cb_depend_list; l; l = l->next) {
-			char* filename = slashify (l->text);
+			char* filename = cobc_slashify (l->text);
 			fprintf (file, " %s%s", filename, l->next ? sep : "\n\n");
 			cobc_free (filename);
 		}
diff --git a/cobc/cobc.h b/cobc/cobc.h
index 86771c8f2..b01338e45 100644
--- a/cobc/cobc.h
+++ b/cobc/cobc.h
@@ -669,6 +669,7 @@ DECLNORET extern void		flex_fatal_error (const char *, const char *,
 DECLNORET extern void		cobc_terminate_exit (const char *, const char *) COB_A_NORETURN;
 
 extern void		cobc_set_listing_header_code (void);
+extern char *           cobc_slashify (const char *);
 
 /* reserved.c */
 extern struct reserved_word_list	*cobc_user_res_list;
diff --git a/cobc/error.c b/cobc/error.c
index 9c971d66e..447900f5a 100644
--- a/cobc/error.c
+++ b/cobc/error.c
@@ -63,11 +63,34 @@ size_t				cb_msg_style;
 
 DECLNORET static void		cobc_too_many_errors (void) COB_A_NORETURN;
 
+/* Returns a copy of the argument with backslashes replaced by slashes
+in filenames. Note that all Windows system calls accept slashes
+instead of backslashes. Only a few tools force the use of slashes,
+such as the cmd shell. */
+char *
+cobc_slashify (const char *src)
+{
+	int i;
+	int len = strlen (src);
+	char *dst = cobc_malloc (len+1);
+	for (i=0; i<len; i++){
+		char c = src[i];
+		if ( c == '\\' )
+			dst[i] = '/';
+		else
+			dst[i] = c;
+	}
+	dst[i] = 0;
+	return dst;
+}
+
 static void
 print_error_prefix (const char *file, int line, const char *prefix)
 {
 	if (file) {
 		char *absfile = NULL ;
+		char *tmpfile = cobc_slashify (file);
+		file = tmpfile;
 		if (cb_diagnostics_absolute_paths
 		 && strcmp (file, COB_DASH) != 0
 		 && file[0] != '/'
@@ -101,6 +124,7 @@ print_error_prefix (const char *file, int line, const char *prefix)
 			fprintf (stderr, "%s:%d: ", file, line);
 		}
 		if (absfile) cobc_free (absfile);
+		cobc_free (tmpfile);
 	}
 	if (prefix) {
 		fprintf (stderr, "%s", prefix);
diff --git a/cobc/typeck.c b/cobc/typeck.c
index 7ca5db3f7..6b81dab4f 100644
--- a/cobc/typeck.c
+++ b/cobc/typeck.c
@@ -3595,6 +3595,7 @@ check_argument_conformance (struct cb_program *program, cb_tree argument_tripple
 	} else {
 		arg_field = NULL;
 	}
+	if (!CB_FIELD_P(param)) return;
 	param_field = CB_FIELD_PTR(CB_VALUE(param));
 
 	/*
diff --git a/tests/testsuite.src/used_binaries.at b/tests/testsuite.src/used_binaries.at
index d36703c16..6da3a05cd 100644
--- a/tests/testsuite.src/used_binaries.at
+++ b/tests/testsuite.src/used_binaries.at
@@ -1081,13 +1081,13 @@ AT_SETUP([check include header file])
 #AT_KEYWORDS([include])
 
 AT_DATA([file.h], [
-COB_EXT_IMPORT void f (char *, long);
+COB_EXT_IMPORT void rename  (const char *, const char*);
 ])
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
        PROGRAM-ID.      prog.
        PROCEDURE        DIVISION.
-           CALL "f" USING "Hello".
+           CALL "rename" USING "Hello".
 ])
 
 # No check, program seems correct
@@ -1097,14 +1097,13 @@ AT_CHECK([$COBC -m -fstatic-call prog.cob], [0], [], [])
 # We ignore the error output, as it depends on the C compiler in use
 
 AT_CHECK([$COBC -m --include "$PWD/file.h" -fstatic-call prog.cob], [1], [], [ignore])
+
 AT_DATA([prog2.cob], [
        IDENTIFICATION   DIVISION.
        PROGRAM-ID.      prog.
        DATA DIVISION.
-       WORKING-STORAGE SECTION.
-       01 long USAGE BINARY-C-LONG.
        PROCEDURE        DIVISION.
-           CALL "f" USING "Hello" BY VALUE long RETURNING NOTHING.
+           CALL "rename" USING "Hello" "Hello2" RETURNING NOTHING.
 ])
 
 AT_CHECK([$COBC -m --include "$PWD/file.h" -fstatic-call prog2.cob], [0], [], [])
@@ -1118,19 +1117,19 @@ AT_CHECK([$COBC -I . -m --include "file.h" -fstatic-call prog2.cob], [0], [], []
 # * putting RETURNING NOTHING is not supported
 # * putting RETURNING OMITTED is ok, but triggers a warning (see stderr)
 
-AT_DATA([f.copy], [
+AT_DATA([rename.copy], [
        IDENTIFICATION DIVISION.
-       PROGRAM-ID. f PROTOTYPE.
+       PROGRAM-ID. rename PROTOTYPE.
        DATA DIVISION.
        LINKAGE SECTION.
        01  a PIC X(20).
-       01  b BINARY-C-LONG.
-       PROCEDURE DIVISION USING a BY VALUE b RETURNING OMITTED.
-       END PROGRAM f.
+       01  b PIC X(20).
+       PROCEDURE DIVISION USING a b RETURNING OMITTED.
+       END PROGRAM rename.
 ])
 
-AT_CHECK([$COMPILE_MODULE -Wno-unfinished --copy "f.copy" -fstatic-call prog2.cob], [0], [],
-[prog2.cob:8: warning: unexpected RETURNING item
+AT_CHECK([$COMPILE_MODULE -Wno-unfinished --copy "rename.copy" -fstatic-call prog2.cob], [0], [],
+[prog2.cob:6: warning: unexpected RETURNING item
 ])
 
 AT_CLEANUP