Module Name: xsrc
Committed By: mrg
Date: Mon Jul 11 19:41:09 UTC 2022
Modified Files:
xsrc/external/mit/xsm/dist: choose.c compile saveutil.c
Log Message:
merge xsm 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xsm/dist/choose.c \
xsrc/external/mit/xsm/dist/compile xsrc/external/mit/xsm/dist/saveutil.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xsm/dist/choose.c
diff -u xsrc/external/mit/xsm/dist/choose.c:1.3 xsrc/external/mit/xsm/dist/choose.c:1.4
--- xsrc/external/mit/xsm/dist/choose.c:1.3 Sat Feb 28 17:27:14 2015
+++ xsrc/external/mit/xsm/dist/choose.c Mon Jul 11 19:41:08 2022
@@ -461,7 +461,7 @@ ChooseSessionDeleteXtProc(Widget w, XtPo
{
XawListReturnStruct *current;
int longest;
- char *name;
+ String name;
CheckBreakLockCancel ();
@@ -555,7 +555,7 @@ ChooseSessionBreakLockXtProc(Widget w, X
XtPointer callData)
{
XawListReturnStruct *current;
- char *name;
+ String name;
CheckDeleteCancel ();
Index: xsrc/external/mit/xsm/dist/compile
diff -u xsrc/external/mit/xsm/dist/compile:1.3 xsrc/external/mit/xsm/dist/compile:1.4
--- xsrc/external/mit/xsm/dist/compile:1.3 Sun Mar 11 08:55:27 2018
+++ xsrc/external/mit/xsm/dist/compile Mon Jul 11 19:41:08 2022
@@ -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 <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# 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 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@ EOF
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 @@ exit $ret
# 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:
Index: xsrc/external/mit/xsm/dist/saveutil.c
diff -u xsrc/external/mit/xsm/dist/saveutil.c:1.3 xsrc/external/mit/xsm/dist/saveutil.c:1.4
--- xsrc/external/mit/xsm/dist/saveutil.c:1.3 Sat Feb 28 17:27:14 2015
+++ xsrc/external/mit/xsm/dist/saveutil.c Mon Jul 11 19:41:08 2022
@@ -204,7 +204,7 @@ ReadSave(const char *session_name, char
if (state == 5)
{
- String strbuf;
+ char *strbuf;
int bufsize = 0;
getnextline(&buf, &buflen, f);
@@ -220,13 +220,12 @@ ReadSave(const char *session_name, char
{
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 @@ WriteSave(const char *sm_id)
ClientRec *client;
FILE *f;
List *cl;
- String commands;
+ char *commands;
char *p, *c;
int count;
@@ -311,7 +310,7 @@ WriteSave(const char *sm_id)
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);
