[xsrc/trunk]: xsrc/external/mit/xsm/dist merge xsm 1.0.5.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/3d3dc0758064
branches:  trunk
changeset: 7052:3d3dc0758064
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 11 19:41:08 2022 +0000

description:
merge xsm 1.0.5.

diffstat:

 external/mit/xsm/dist/choose.c   |   4 ++--
 external/mit/xsm/dist/compile    |  17 +++++++++--------
 external/mit/xsm/dist/saveutil.c |  11 +++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diffs (131 lines):

diff -r 2afef80fc9d7 -r 3d3dc0758064 external/mit/xsm/dist/choose.c
--- a/external/mit/xsm/dist/choose.c    Mon Jul 11 19:40:44 2022 +0000
+++ b/external/mit/xsm/dist/choose.c    Mon Jul 11 19:41:08 2022 +0000
@@ -461,7 +461,7 @@
 {
     XawListReturnStruct *current;
     int longest;
-    char *name;
+    String name;
 
     CheckBreakLockCancel ();
 
@@ -555,7 +555,7 @@
                             XtPointer callData)
 {
     XawListReturnStruct *current;
-    char *name;
+    String name;
 
     CheckDeleteCancel ();
 
diff -r 2afef80fc9d7 -r 3d3dc0758064 external/mit/xsm/dist/compile
--- a/external/mit/xsm/dist/compile     Mon Jul 11 19:40:44 2022 +0000
+++ b/external/mit/xsm/dist/compile     Mon Jul 11 19:41:08 2022 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey%cygnus.com@localhost>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@
          MINGW*)
            file_conv=mingw
            ;;
-         CYGWIN*)
+         CYGWIN* | MSYS*)
            file_conv=cygwin
            ;;
          *)
@@ -67,7 +67,7 @@
        mingw/*)
          file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
          ;;
-       cygwin/*)
+       cygwin/* | msys/*)
          file=`cygpath -m "$file" || echo "$file"`
          ;;
        wine/*)
@@ -255,7 +255,8 @@
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -r 2afef80fc9d7 -r 3d3dc0758064 external/mit/xsm/dist/saveutil.c
--- a/external/mit/xsm/dist/saveutil.c  Mon Jul 11 19:40:44 2022 +0000
+++ b/external/mit/xsm/dist/saveutil.c  Mon Jul 11 19:41:08 2022 +0000
@@ -204,7 +204,7 @@
 
     if (state == 5)
     {
-       String strbuf;
+       char *strbuf;
        int bufsize = 0;
 
        getnextline(&buf, &buflen, f);
@@ -220,13 +220,12 @@
            {
                getnextline(&buf, &buflen, f);
                if((p = strchr(buf, '\n'))) *p = '\0';
-               non_session_aware_clients[i] = (char *) malloc (
-                   strlen (buf) + 2);
+               non_session_aware_clients[i] = malloc (strlen (buf) + 2);
                strcpy (non_session_aware_clients[i], buf);
                bufsize += (strlen (buf) + 1);
            }
 
-           strbuf = (String) malloc (bufsize + 1);
+           strbuf = malloc (bufsize + 1);
            strbuf[0] = '\0';
 
            for (i = 0; i < non_session_aware_count; i++)
@@ -303,7 +302,7 @@
     ClientRec *client;
     FILE *f;
     List *cl;
-    String commands;
+    char *commands;
     char *p, *c;
     int count;
 
@@ -311,7 +310,7 @@
 
     if (!f)
     {
-       char msg[256];
+       char msg[36 + sizeof(session_save_file)];
 
        snprintf (msg, sizeof(msg), "%s: Error creating session save file %s", 
                  Argv[0], session_save_file);