CVS commit: xsrc/external/mit/xsm/dist
Module Name:xsrc Committed By: nia Date: Tue Sep 22 16:20:40 UTC 2020 Modified Files: xsrc/external/mit/xsm/dist: system.xsm Log Message: update the default xsm session to ctwm/uxterm To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xsm/dist/system.xsm 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/system.xsm diff -u xsrc/external/mit/xsm/dist/system.xsm:1.1.1.1 xsrc/external/mit/xsm/dist/system.xsm:1.2 --- xsrc/external/mit/xsm/dist/system.xsm:1.1.1.1 Wed Jul 30 04:38:48 2008 +++ xsrc/external/mit/xsm/dist/system.xsm Tue Sep 22 16:20:39 2020 @@ -1,4 +1,4 @@ -! $Xorg: system.xsm,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ -twm +! $NetBSD: system.xsm,v 1.2 2020/09/22 16:20:39 nia Exp $ +ctwm smproxy -xterm +uxterm
CVS commit: xsrc/external/mit/xsm/dist
Module Name:xsrc
Committed By: wiz
Date: Sat Feb 28 17:27:14 UTC 2015
Modified Files:
xsrc/external/mit/xsm/dist: auth.c choose.c lock.c remote.c restart.c
saveutil.c
Log Message:
Switch to the version of the close-on-exec patch that was committed upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xsm/dist/auth.c \
xsrc/external/mit/xsm/dist/choose.c xsrc/external/mit/xsm/dist/lock.c \
xsrc/external/mit/xsm/dist/remote.c xsrc/external/mit/xsm/dist/restart.c \
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/auth.c
diff -u xsrc/external/mit/xsm/dist/auth.c:1.2 xsrc/external/mit/xsm/dist/auth.c:1.3
--- xsrc/external/mit/xsm/dist/auth.c:1.2 Thu Sep 18 19:13:50 2014
+++ xsrc/external/mit/xsm/dist/auth.c Sat Feb 28 17:27:14 2015
@@ -154,26 +154,30 @@ SetAuthentication(int count, IceListenOb
if ((addAuthFile = unique_filename (path, .xsm)) == NULL)
goto bad;
-if (!(addfp = fopen (addAuthFile, we)))
+if (!(addfp = fopen (addAuthFile, w)))
goto bad;
+fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
if ((remAuthFile = unique_filename (path, .xsm)) == NULL)
goto bad;
-if (!(removefp = fopen (remAuthFile, we)))
+if (!(removefp = fopen (remAuthFile, w)))
goto bad;
+fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
#else
if ((addAuthFile = unique_filename (path, .xsm, fd)) == NULL)
goto bad;
-if (!(addfp = fdopen(fd, wbe)))
+if (!(addfp = fdopen(fd, wb)))
goto bad;
+fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
if ((remAuthFile = unique_filename (path, .xsm, fd)) == NULL)
goto bad;
-if (!(removefp = fdopen(fd, wbe)))
+if (!(removefp = fdopen(fd, wb)))
goto bad;
+fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
#endif
if ((*authDataEntries = (IceAuthDataEntry *) XtMalloc (
Index: xsrc/external/mit/xsm/dist/choose.c
diff -u xsrc/external/mit/xsm/dist/choose.c:1.2 xsrc/external/mit/xsm/dist/choose.c:1.3
--- xsrc/external/mit/xsm/dist/choose.c:1.2 Thu Sep 18 19:13:50 2014
+++ xsrc/external/mit/xsm/dist/choose.c Sat Feb 28 17:27:14 2015
@@ -98,7 +98,7 @@ GetSessionNames(int *count_ret, String *
if ((dir = opendir (path)) == NULL)
return 0;
-(void)fcntl(dirfd(dir), F_SETFD, FD_CLOEXEC);
+fcntl(dirfd(dir), F_SETFD, FD_CLOEXEC);
count = 0;
Index: xsrc/external/mit/xsm/dist/lock.c
diff -u xsrc/external/mit/xsm/dist/lock.c:1.2 xsrc/external/mit/xsm/dist/lock.c:1.3
--- xsrc/external/mit/xsm/dist/lock.c:1.2 Thu Sep 18 19:13:50 2014
+++ xsrc/external/mit/xsm/dist/lock.c Sat Feb 28 17:27:14 2015
@@ -117,10 +117,11 @@ GetLockId(const char *session_name)
snprintf (lock_file, sizeof(lock_file), %s/.XSMlock-%s,
path, session_name);
-if ((fp = fopen (lock_file, re)) == NULL)
+if ((fp = fopen (lock_file, r)) == NULL)
{
return (NULL);
}
+fcntl(fileno(fp), F_SETFD, FD_CLOEXEC);
buf[0] = '\0';
fscanf (fp, %255s\n, buf);
Index: xsrc/external/mit/xsm/dist/remote.c
diff -u xsrc/external/mit/xsm/dist/remote.c:1.2 xsrc/external/mit/xsm/dist/remote.c:1.3
--- xsrc/external/mit/xsm/dist/remote.c:1.2 Thu Sep 18 19:13:50 2014
+++ xsrc/external/mit/xsm/dist/remote.c Sat Feb 28 17:27:14 2015
@@ -111,7 +111,8 @@ remote_start(const char *restart_protoco
default: /* parent */
close (pipefd[0]);
- fp = fdopen (pipefd[1], we);
+ fcntl(pipefd[1], F_SETFD, FD_CLOEXEC);
+ fp = fdopen (pipefd[1], w);
fprintf (fp, CONTEXT X\n);
fprintf (fp, DIR %s\n, cwd);
Index: xsrc/external/mit/xsm/dist/restart.c
diff -u xsrc/external/mit/xsm/dist/restart.c:1.2 xsrc/external/mit/xsm/dist/restart.c:1.3
--- xsrc/external/mit/xsm/dist/restart.c:1.2 Thu Sep 18 19:13:50 2014
+++ xsrc/external/mit/xsm/dist/restart.c Sat Feb 28 17:27:14 2015
@@ -531,11 +531,11 @@ StartDefaultApps (void)
home = .;
snprintf (filename, sizeof(filename), %s/.xsmstartup, home);
-f = fopen (filename, re);
+f = fopen (filename, r);
if (!f)
{
- f = fopen (SYSTEM_INIT_FILE, re);
+ f = fopen (SYSTEM_INIT_FILE, r);
if (!f)
{
printf (Could not find default apps file. Make sure you did\n);
@@ -543,6 +543,7 @@ StartDefaultApps (void)
exit (1);
}
}
+fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
buf = NULL;
buflen = 0;
Index: xsrc/external/mit/xsm/dist/saveutil.c
diff -u xsrc/external/mit/xsm/dist/saveutil.c:1.2 xsrc/external/mit/xsm/dist/saveutil.c:1.3
--- xsrc/external/mit/xsm/dist/saveutil.c:1.2 Thu Sep 18 19:13:50 2014
+++ xsrc/external/mit/xsm/dist/saveutil.c Sat Feb 28 17:27:14 2015
@@ -65,13 +65,14 @@ ReadSave(const char *session_name, char
int state, i;
int version_number;
-f = fopen(session_save_file, re);
+f = fopen(session_save_file, r);
if(!f) {
if (verbose)
CVS commit: xsrc/external/mit/xsm/dist
Module Name:xsrc
Committed By: christos
Date: Thu Sep 18 19:13:50 UTC 2014
Modified Files:
xsrc/external/mit/xsm/dist: auth.c choose.c lock.c remote.c restart.c
saveutil.c
Log Message:
set close-on-exec for all fds opened...
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xsm/dist/auth.c \
xsrc/external/mit/xsm/dist/choose.c xsrc/external/mit/xsm/dist/lock.c \
xsrc/external/mit/xsm/dist/remote.c xsrc/external/mit/xsm/dist/restart.c \
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/auth.c
diff -u xsrc/external/mit/xsm/dist/auth.c:1.1.1.3 xsrc/external/mit/xsm/dist/auth.c:1.2
--- xsrc/external/mit/xsm/dist/auth.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/auth.c Thu Sep 18 15:13:50 2014
@@ -154,25 +154,25 @@ SetAuthentication(int count, IceListenOb
if ((addAuthFile = unique_filename (path, .xsm)) == NULL)
goto bad;
-if (!(addfp = fopen (addAuthFile, w)))
+if (!(addfp = fopen (addAuthFile, we)))
goto bad;
if ((remAuthFile = unique_filename (path, .xsm)) == NULL)
goto bad;
-if (!(removefp = fopen (remAuthFile, w)))
+if (!(removefp = fopen (remAuthFile, we)))
goto bad;
#else
if ((addAuthFile = unique_filename (path, .xsm, fd)) == NULL)
goto bad;
-if (!(addfp = fdopen(fd, wb)))
+if (!(addfp = fdopen(fd, wbe)))
goto bad;
if ((remAuthFile = unique_filename (path, .xsm, fd)) == NULL)
goto bad;
-if (!(removefp = fdopen(fd, wb)))
+if (!(removefp = fdopen(fd, wbe)))
goto bad;
#endif
Index: xsrc/external/mit/xsm/dist/choose.c
diff -u xsrc/external/mit/xsm/dist/choose.c:1.1.1.3 xsrc/external/mit/xsm/dist/choose.c:1.2
--- xsrc/external/mit/xsm/dist/choose.c:1.1.1.3 Fri May 31 03:51:31 2013
+++ xsrc/external/mit/xsm/dist/choose.c Thu Sep 18 15:13:50 2014
@@ -98,6 +98,8 @@ GetSessionNames(int *count_ret, String *
if ((dir = opendir (path)) == NULL)
return 0;
+(void)fcntl(dirfd(dir), F_SETFD, FD_CLOEXEC);
+
count = 0;
while ((entry = readdir (dir)) != NULL)
Index: xsrc/external/mit/xsm/dist/lock.c
diff -u xsrc/external/mit/xsm/dist/lock.c:1.1.1.3 xsrc/external/mit/xsm/dist/lock.c:1.2
--- xsrc/external/mit/xsm/dist/lock.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/lock.c Thu Sep 18 15:13:50 2014
@@ -117,7 +117,7 @@ GetLockId(const char *session_name)
snprintf (lock_file, sizeof(lock_file), %s/.XSMlock-%s,
path, session_name);
-if ((fp = fopen (lock_file, r)) == NULL)
+if ((fp = fopen (lock_file, re)) == NULL)
{
return (NULL);
}
Index: xsrc/external/mit/xsm/dist/remote.c
diff -u xsrc/external/mit/xsm/dist/remote.c:1.1.1.3 xsrc/external/mit/xsm/dist/remote.c:1.2
--- xsrc/external/mit/xsm/dist/remote.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/remote.c Thu Sep 18 15:13:50 2014
@@ -111,7 +111,7 @@ remote_start(const char *restart_protoco
default: /* parent */
close (pipefd[0]);
- fp = (FILE *) fdopen (pipefd[1], w);
+ fp = fdopen (pipefd[1], we);
fprintf (fp, CONTEXT X\n);
fprintf (fp, DIR %s\n, cwd);
Index: xsrc/external/mit/xsm/dist/restart.c
diff -u xsrc/external/mit/xsm/dist/restart.c:1.1.1.3 xsrc/external/mit/xsm/dist/restart.c:1.2
--- xsrc/external/mit/xsm/dist/restart.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/restart.c Thu Sep 18 15:13:50 2014
@@ -531,11 +531,11 @@ StartDefaultApps (void)
home = .;
snprintf (filename, sizeof(filename), %s/.xsmstartup, home);
-f = fopen (filename, r);
+f = fopen (filename, re);
if (!f)
{
- f = fopen (SYSTEM_INIT_FILE, r);
+ f = fopen (SYSTEM_INIT_FILE, re);
if (!f)
{
printf (Could not find default apps file. Make sure you did\n);
Index: xsrc/external/mit/xsm/dist/saveutil.c
diff -u xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3 xsrc/external/mit/xsm/dist/saveutil.c:1.2
--- xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/saveutil.c Thu Sep 18 15:13:50 2014
@@ -65,7 +65,7 @@ ReadSave(const char *session_name, char
int state, i;
int version_number;
-f = fopen(session_save_file, r);
+f = fopen(session_save_file, re);
if(!f) {
if (verbose)
printf(No session save file.\n);
@@ -306,7 +306,7 @@ WriteSave(const char *sm_id)
char *p, *c;
int count;
-f = fopen (session_save_file, w);
+f = fopen (session_save_file, we);
if (!f)
{
@@ -427,7 +427,7 @@ DeleteSession(const char *session_name)
snprintf (filename, sizeof(filename), %s/.XSM-%s, dir, session_name);
-f = fopen(filename, r);
+f = fopen(filename, re);
if(!f) {
return (0);
}
CVS commit: xsrc/external/mit/xsm/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 03:48:09 UTC 2010 Update of /cvsroot/xsrc/external/mit/xsm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28600 Log Message: initial import of xsm-1.0.2 Status: Vendor Tag: xorg Release Tags: xsm-1-0-2 U xsrc/external/mit/xsm/dist/printhex.c U xsrc/external/mit/xsm/dist/INSTALL U xsrc/external/mit/xsm/dist/auth.h U xsrc/external/mit/xsm/dist/configure U xsrc/external/mit/xsm/dist/prop.h U xsrc/external/mit/xsm/dist/xsm.c U xsrc/external/mit/xsm/dist/config.sub U xsrc/external/mit/xsm/dist/Makefile.in U xsrc/external/mit/xsm/dist/xsm.man U xsrc/external/mit/xsm/dist/signals.c U xsrc/external/mit/xsm/dist/ChangeLog U xsrc/external/mit/xsm/dist/log.h U xsrc/external/mit/xsm/dist/config.guess U xsrc/external/mit/xsm/dist/choose.c U xsrc/external/mit/xsm/dist/xtwatch.c U xsrc/external/mit/xsm/dist/lock.h U xsrc/external/mit/xsm/dist/save.h U xsrc/external/mit/xsm/dist/info.c U xsrc/external/mit/xsm/dist/saveutil.h U xsrc/external/mit/xsm/dist/Makefile.am U xsrc/external/mit/xsm/dist/list.h U xsrc/external/mit/xsm/dist/restart.c U xsrc/external/mit/xsm/dist/mainwin.h U xsrc/external/mit/xsm/dist/popup.c U xsrc/external/mit/xsm/dist/log.c U xsrc/external/mit/xsm/dist/remote.c U xsrc/external/mit/xsm/dist/config.h.in U xsrc/external/mit/xsm/dist/install-sh U xsrc/external/mit/xsm/dist/system.xsm U xsrc/external/mit/xsm/dist/COPYING U xsrc/external/mit/xsm/dist/auth.c U xsrc/external/mit/xsm/dist/prop.c U xsrc/external/mit/xsm/dist/xsm.h U xsrc/external/mit/xsm/dist/aclocal.m4 U xsrc/external/mit/xsm/dist/depcomp U xsrc/external/mit/xsm/dist/popup.h U xsrc/external/mit/xsm/dist/missing U xsrc/external/mit/xsm/dist/configure.ac U xsrc/external/mit/xsm/dist/README U xsrc/external/mit/xsm/dist/list.c U xsrc/external/mit/xsm/dist/restart.h U xsrc/external/mit/xsm/dist/mainwin.c U xsrc/external/mit/xsm/dist/misc.c U xsrc/external/mit/xsm/dist/choose.h U xsrc/external/mit/xsm/dist/xtwatch.h U xsrc/external/mit/xsm/dist/lock.c U xsrc/external/mit/xsm/dist/save.c U xsrc/external/mit/xsm/dist/info.h U xsrc/external/mit/xsm/dist/saveutil.c N xsrc/external/mit/xsm/dist/app-defaults/XSm No conflicts created by this import
