Sat Jun 20 07:50:16 2020 UTC ()

Fix false positive for mvscanw tests on big endian machines.

When conversion specifier is not a derivative form of "%s", retrieve
input as 32bit integer, and then convert to string literal. Then we
can avoid interpretation from ASCII code to integer, which is
apparently byte-order depended.


(rin)

diff -r1.9 -r1.10 src/tests/lib/libcurses/slave/curses_commands.c
diff -r1.3 -r1.4 src/tests/lib/libcurses/tests/mvscanw

--- src/tests/lib/libcurses/slave/curses_commands.c 2019/05/26 07:47:37	1.9
+++ src/tests/lib/libcurses/slave/curses_commands.c 2020/06/20 07:50:16	1.10

 @@ -1,14 +1,14 @@
-/*	$NetBSD: curses_commands.c,v 1.9 2019/05/26 07:47:37 blymn Exp $	*/
+/*	$NetBSD: curses_commands.c,v 1.10 2020/06/20 07:50:16 rin Exp $	*/
 /*-
  * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
  * All rights reserved.
+ *
  * This code has been donated to The NetBSD Foundation by the Author.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -3051,47 +3051,53 @@ cmd_mvprintw(int nargs, char **args)
 		report_count(1);
 		report_error("BAD ARGUMENT");
 		return;
+	}
 	report_count(1);
 	report_return(mvprintw(y, x, args[2], args[3]));
+}
 void
 cmd_mvscanw(int nargs, char **args)
+{
-	int y, x;
+	int y, x, val;
 	char string[256];
 	if (check_arg_count(nargs, 3) == 1)
 		return;
 	if (sscanf(args[0], "%d", &y) == 0) {
 		report_count(1);
 		report_error("BAD ARGUMENT");
 		return;
+	}
 	if (sscanf(args[1], "%d", &x) == 0) {
 		report_count(1);
 		report_error("BAD ARGUMENT");
 		return;
+	}
 	/* XXX - call2 */
 	report_count(2);
-	report_return(mvscanw(y, x, args[2], &string));
+	if (strchr(args[2], 's') != NULL)
 		report_return(mvscanw(y, x, args[2], &string));
 	else {
 		/* XXX assume 32bit integer */
 		report_return(mvscanw(y, x, args[2], &val));
 		snprintf(string, sizeof(string), args[2], val);
+	}
 	report_status(string);
+}
 void
 cmd_mvvline(int nargs, char **args)
+{
 	int y, x, n;
 	chtype *ch;
 	if (check_arg_count(nargs, 4) == 1)
 		return;

--- src/tests/lib/libcurses/tests/mvscanw 2020/02/07 19:56:51	1.3
+++ src/tests/lib/libcurses/tests/mvscanw 2020/06/20 07:50:16	1.4

 @@ -1,11 +1,12 @@
 # XXX For this test, only one string or 32bit integer are supported as
 # conversion specifiers at the moment.
 include start
 input "testing 1 2 3\n"
 call2 OK "testing" mvscanw 3 5 "%s"
 input "testing 1 2 3\n"
 call2 OK "test" mvscanw 3 5 "%4s"
 # 50 will translate into number 2 in ascii
 input "50 12\n"
-call2 OK "2" mvscanw 3 5 "%d"
+call2 OK "50" mvscanw 3 5 "%d"
 input "aa bb 50 12\n"
 # expect ERR because input has alpha and scanw wants integer
-call2 ERR "2" mvscanw 3 5 "%d"
+call2 ERR "50" mvscanw 3 5 "%d"