Module Name: xsrc
Committed By: mrg
Date: Thu Jul 4 00:26:57 UTC 2024
Modified Files:
xsrc/external/mit/xbiff/dist: compile
xsrc/external/mit/xbiff/include: config.h
xsrc/external/mit/xconsole/dist: xconsole.c
xsrc/external/mit/xman/dist: handler.c misc.c search.c vendor.h
xsrc/external/mit/xmore/dist: compile
Log Message:
merge xbiff 1.0.5, xconsole 1.1.0, xditview 1.0.7, xedit 1.2.4,
xev 1.2.6, xeyes 1.3.0, xload 1.2.0, xman 1.2.0, xmessage 1.0.7,
and xmore 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xbiff/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xbiff/include/config.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xman/dist/handler.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xman/dist/search.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xman/dist/vendor.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmore/dist/compile
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/xbiff/dist/compile
diff -u xsrc/external/mit/xbiff/dist/compile:1.3 xsrc/external/mit/xbiff/dist/compile:1.4
--- xsrc/external/mit/xbiff/dist/compile:1.3 Mon Jul 15 04:54:47 2019
+++ xsrc/external/mit/xbiff/dist/compile Thu Jul 4 00:26:56 2024
@@ -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/xbiff/include/config.h
diff -u xsrc/external/mit/xbiff/include/config.h:1.2 xsrc/external/mit/xbiff/include/config.h:1.3
--- xsrc/external/mit/xbiff/include/config.h:1.2 Mon Jul 15 04:54:47 2019
+++ xsrc/external/mit/xbiff/include/config.h Thu Jul 4 00:26:57 2024
@@ -44,7 +44,7 @@
#define PACKAGE_NAME "xbiff"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xbiff 1.0.4"
+#define PACKAGE_STRING "xbiff 1.0.5"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xbiff"
@@ -53,7 +53,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.4"
+#define PACKAGE_VERSION "1.0.5"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -62,10 +62,10 @@
#define PACKAGE_VERSION_MINOR 0
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 4
+#define PACKAGE_VERSION_PATCHLEVEL 5
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.4"
+#define VERSION "1.0.5"
Index: xsrc/external/mit/xconsole/dist/xconsole.c
diff -u xsrc/external/mit/xconsole/dist/xconsole.c:1.6 xsrc/external/mit/xconsole/dist/xconsole.c:1.7
--- xsrc/external/mit/xconsole/dist/xconsole.c:1.6 Mon Jul 11 08:49:36 2022
+++ xsrc/external/mit/xconsole/dist/xconsole.c Thu Jul 4 00:26:57 2024
@@ -157,15 +157,8 @@ static XrmOptionDescRec options[] = {
# endif
#endif
-#if defined(_AIX)
-# define USE_PTS
-#endif
-
#if !defined (USE_FILE) || defined (linux)
# include <sys/ioctl.h>
-# ifdef hpux
-# include <termios.h>
-# endif
# if defined (SVR4) || defined (USE_PTS)
# include <termios.h>
# ifndef HAS_OPENPTY
@@ -181,39 +174,21 @@ static int tty_fd, pty_fd;
# endif
#endif
-#if (defined(SVR4) && !defined(sun)) || (defined(SYSV) && defined(i386))
-#define USE_OSM
-#include <signal.h>
-#endif
-
#ifdef USE_PTY
static int get_pty(int *pty, int *tty);
#endif
-#ifdef USE_OSM
-static FILE *osm_pipe(void);
-static int child_pid;
-#endif
-
/* Copied from xterm/ptyx.h */
#ifndef PTYCHAR1
-#ifdef __hpux
-#define PTYCHAR1 "zyxwvutsrqp"
-#else /* !__hpux */
#define PTYCHAR1 "pqrstuvwxyzPQRSTUVWXYZ"
-#endif /* !__hpux */
#endif /* !PTYCHAR1 */
#ifndef PTYCHAR2
-#ifdef __hpux
-#define PTYCHAR2 "fedcba9876543210"
-#else /* !__hpux */
#ifdef __FreeBSD__
#define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv"
#else /* !__FreeBSD__ */
#define PTYCHAR2 "0123456789abcdef"
#endif /* !__FreeBSD__ */
-#endif /* !__hpux */
#endif /* !PTYCHAR2 */
static void
@@ -260,11 +235,6 @@ OpenConsole(void)
}
#endif /* USE_PTY */
}
-#ifdef USE_OSM
- /* Don't have to be owner of /dev/console when using /dev/osm. */
- if (!input)
- input = osm_pipe();
-#endif
if (input && app_resources.verbose)
{
char *hostname;
@@ -327,39 +297,13 @@ CloseConsole (void)
#endif
}
-#ifdef USE_OSM
-static void
-KillChild(int sig)
-{
- if (child_pid > 0)
- kill(child_pid, SIGTERM);
- _exit(0);
-}
-#endif
-
/*ARGSUSED*/
static void _X_NORETURN
Quit(Widget widget, XEvent *event, String *params, Cardinal *num_params)
{
-#ifdef USE_OSM
- if (child_pid > 0)
- kill(child_pid, SIGTERM);
-#endif
exit (0);
}
-#ifdef USE_OSM
-static int (*ioerror)(Display *);
-
-static int
-IOError(Display *dpy)
-{
- if (child_pid > 0)
- kill(child_pid, SIGTERM);
- return (*ioerror)(dpy);
-}
-#endif
-
static void
Notify(void)
{
@@ -608,6 +552,20 @@ InsertSelection(Widget w, XtPointer clie
OpenConsole ();
}
+static void _X_NORETURN
+usage(int exitval)
+{
+ const char *usage_message =
+ "usage: xconsole [-toolkitoption ...] [-file file-name] [-notify|-nonotify]\n"
+ " [-stripNonprint] [-daemon] [-verbose] [-exitOnFail]\n"
+ " [-saveLines count]\n"
+ " xconsole -help\n"
+ " xconsole -version\n";
+
+ fputs(usage_message, stderr);
+ exit(exitval);
+}
+
int
main(int argc, char *argv[])
{
@@ -615,8 +573,34 @@ main(int argc, char *argv[])
Cardinal num_args;
XtSetLanguageProc(NULL,NULL,NULL);
+
+ /* Handle args that don't require opening a display */
+ for (int n = 1; n < argc; n++) {
+ const char *argn = argv[n];
+ /* accept single or double dash for -help & -version */
+ if (argn[0] == '-' && argn[1] == '-') {
+ argn++;
+ }
+ if (strcmp(argn, "-help") == 0) {
+ usage(0);
+ }
+ if (strcmp(argn, "-version") == 0) {
+ puts(PACKAGE_STRING);
+ exit(0);
+ }
+ }
+
top = XtInitialize ("xconsole", "XConsole", options, XtNumber (options),
&argc, argv);
+ if (argc != 1) {
+ fputs("Unknown argument(s):", stderr);
+ for (int n = 1; n < argc; n++) {
+ fprintf(stderr, " %s", argv[n]);
+ }
+ fputs("\n\n", stderr);
+ usage(1);
+ }
+
XtGetApplicationResources (top, (XtPointer)&app_resources, resources,
XtNumber (resources), NULL, 0);
@@ -655,9 +639,6 @@ main(int argc, char *argv[])
ConvertSelection, LoseSelection, NULL);
OpenConsole ();
}
-#ifdef USE_OSM
- ioerror = XSetIOErrorHandler(IOError);
-#endif
XtMainLoop ();
return 0;
}
@@ -799,11 +780,7 @@ get_pty(int *pty, int *tty)
static char ttydev[64], ptydev[64];
#if defined (SVR4) || defined (USE_PTS)
-#if defined (_AIX)
- if ((*pty = open ("/dev/ptc", O_RDWR)) < 0)
-#else
if ((*pty = open ("/dev/ptmx", O_RDWR)) < 0)
-#endif
return 1;
grantpt(*pty);
unlockpt(*pty);
@@ -861,80 +838,3 @@ get_pty(int *pty, int *tty)
#endif /* HAS_OPENPTY */
}
#endif
-
-#ifdef USE_OSM
-/*
- * On SYSV386 there is a special device, /dev/osm, where system messages
- * are sent. Problem is that we can't perform a select(2) on this device.
- * So this routine creates a streams-pty where one end reads the device and
- * sends the output to xconsole.
- */
-
-#ifdef SCO325
-#define OSM_DEVICE "/dev/error"
-#else
-#ifdef __UNIXWARE__
-#define OSM_DEVICE "/dev/osm2"
-#define NO_READAHEAD
-#else
-#define OSM_DEVICE "/dev/osm"
-#endif
-#endif
-
-static FILE *
-osm_pipe(void)
-{
- int tty;
- char ttydev[64];
-
- if (access(OSM_DEVICE, R_OK) < 0)
- return NULL;
-#if defined (_AIX)
- if ((tty = open("/dev/ptc", O_RDWR)) < 0)
-#else
- if ((tty = open("/dev/ptmx", O_RDWR)) < 0)
-#endif
- return NULL;
-
- grantpt(tty);
- unlockpt(tty);
- strcpy(ttydev, (char *)ptsname(tty));
-
- if ((child_pid = fork()) == 0)
- {
- int pty, osm, nbytes, skip;
- char cbuf[128];
-
- skip = 0;
-#ifndef NO_READAHEAD
- osm = open(OSM_DEVICE, O_RDONLY);
- if (osm >= 0)
- {
- while ((nbytes = read(osm, cbuf, sizeof(cbuf))) > 0)
- skip += nbytes;
- close(osm);
- }
-#endif
- pty = open(ttydev, O_RDWR);
- if (pty < 0)
- exit(1);
- osm = open(OSM_DEVICE, O_RDONLY);
- if (osm < 0)
- exit(1);
- for (nbytes = 0; skip > 0 && nbytes >= 0; skip -= nbytes)
- {
- nbytes = skip;
- if (nbytes > sizeof(cbuf))
- nbytes = sizeof(cbuf);
- nbytes = read(osm, cbuf, nbytes);
- }
- while ((nbytes = read(osm, cbuf, sizeof(cbuf))) >= 0)
- write(pty, cbuf, nbytes);
- exit(0);
- }
- signal(SIGHUP, KillChild);
- signal(SIGINT, KillChild);
- signal(SIGTERM, KillChild);
- return fdopen(tty, "r");
-}
-#endif /* USE_OSM */
Index: xsrc/external/mit/xman/dist/handler.c
diff -u xsrc/external/mit/xman/dist/handler.c:1.6 xsrc/external/mit/xman/dist/handler.c:1.7
--- xsrc/external/mit/xman/dist/handler.c:1.6 Mon Jul 20 08:20:04 2015
+++ xsrc/external/mit/xman/dist/handler.c Thu Jul 4 00:26:57 2024
@@ -41,10 +41,6 @@ from the X Consortium.
#include <sys/stat.h>
#include "globals.h"
#include "vendor.h"
-#ifdef INCLUDE_XPRINT_SUPPORT
-#include "printdialog.h"
-#include "print.h"
-#endif /* INCLUDE_XPRINT_SUPPORT */
#ifdef RELEASE_VERSION
#define XMAN_VERSION "Xman Version " PACKAGE_VERSION " - X11R" RELEASE_VERSION
@@ -90,10 +86,6 @@ OptionCallback(Widget w, XtPointer point
RemoveThisManpage(XtParent(w), NULL, NULL, NULL);
else if (w == man_globals->open_entry) /* Open new manpage */
CreateNewManpage(XtParent(w), NULL, NULL, NULL);
-#ifdef INCLUDE_XPRINT_SUPPORT
- else if (w == man_globals->print_entry) /* Print current manpage */
- PrintThisManpage(XtParent(w), NULL, NULL, NULL);
-#endif /* INCLUDE_XPRINT_SUPPORT */
else if (w == man_globals->version_entry) /* Get version */
ShowVersion(XtParent(w), NULL, NULL, NULL);
else if (w == man_globals->quit_entry) /* Quit. */
@@ -327,21 +319,15 @@ SaveFormattedPage(Widget w, XEvent * eve
case 'S':
case 's':
-#ifndef NO_COMPRESS
if (!man_globals->compress)
-#endif
-
snprintf(cmdbuf, sizeof(cmdbuf), "%s %s %s", COPY,
man_globals->tempfile, man_globals->save_file);
-
-#ifndef NO_COMPRESS
else if (man_globals->gzip)
snprintf(cmdbuf, sizeof(cmdbuf), "%s < %s > %s", GZIP_COMPRESS,
man_globals->tempfile, man_globals->save_file);
else
snprintf(cmdbuf, sizeof(cmdbuf), "%s < %s > %s", COMPRESS,
man_globals->tempfile, man_globals->save_file);
-#endif
if (!system(cmdbuf)) {
/* make sure the formatted man page is fully accessible by the world */
@@ -487,11 +473,34 @@ PopupSearch(Widget w, XEvent * event, St
XtRealizeWidget(man_globals->search_widget);
AddCursor(man_globals->search_widget,
resources.cursors.search_entry);
+/*
+ * Set up ICCCM delete window.
+ */
+ XtOverrideTranslations(man_globals->search_widget,
+ XtParseTranslationTable("<Message>WM_PROTOCOLS: RemoveSearch()"));
+ XSetWMProtocols(XtDisplay(man_globals->search_widget),
+ XtWindow(man_globals->search_widget),
+ &wm_delete_window, 1);
}
Popup(man_globals->search_widget, XtGrabNone);
}
}
+/* Function Name: RemoveSearch
+ * Description: Removes this search widget.
+ * Arguments: w - search widget
+ * event - NOT USED.
+ * params, num_params - NOT USED.
+ * Returns: none.
+ */
+
+/*ARGSUSED*/
+void
+RemoveSearch(Widget w, XEvent * event, String * params, Cardinal * num_params)
+{
+ XtPopdown(w);
+}
+
/* Function Name: CreateNewManpage
* Description: Creates A New Manual Page.
* Arguments: w - NOT USED.
@@ -616,112 +625,6 @@ Search(Widget w, XEvent * event, String
}
}
-#ifdef INCLUDE_XPRINT_SUPPORT
-static void
-printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
-{
- ManpageGlobals *mg = GetGlobals(w);
-
- XawPrintDialogClosePrinterConnection(mg->printdialog, False);
-}
-
-static void
-printOKXtProc(Widget w, XtPointer client_data, XtPointer callData)
-{
- XawPrintDialogCallbackStruct *pdcs =
- (XawPrintDialogCallbackStruct *) callData;
- Cardinal n;
- Arg args[2];
- ManpageGlobals *mg = GetGlobals(w);
- Widget topwindow = mg->This_Manpage;
- FILE *file;
-
- Log(("printOKXtProc: OK.\n"));
-
- /* Get file object */
- n = 0;
- XtSetArg(args[n], XtNfile, &file);
- n++;
- XtGetValues(mg->manpagewidgets.manpage, args, n);
- Assertion(file != NULL, (("printOKXtProc: file == NULL.\n")));
-
- DoPrintManpage("Xman",
- file, topwindow,
- pdcs->pdpy, pdcs->pcontext, pdcs->colorspace,
- printshellDestroyXtProc,
- mg->manpage_title,
- pdcs->printToFile ? pdcs->printToFileName : NULL);
-
- XtPopdown(mg->printdialog_shell);
-}
-
-static void
-printCancelXtProc(Widget w, XtPointer client_data, XtPointer callData)
-{
- ManpageGlobals *mg = GetGlobals(w);
-
- Log(("printCancelXtProc: cancel.\n"));
- XtPopdown(mg->printdialog_shell);
-
- Log(("destroying print dialog shell...\n"));
- XtDestroyWidget(mg->printdialog_shell);
- mg->printdialog_shell = NULL;
- mg->printdialog = NULL;
- Log(("... done\n"));
-}
-
-/* Function Name: PrintThisManpage
- * Description: Print the current manual page.
- * Arguments: mg - manpage globals
- * Returns: none.
- */
-
-/*ARGSUSED*/
-void
-PrintThisManpage(Widget w, XEvent * event, String * params,
- Cardinal * num_params)
-{
- ManpageGlobals *mg = GetGlobals(w);
- Dimension width, height;
- Position x, y;
- Widget parent = mg->This_Manpage;
- Widget topwindow = mg->This_Manpage;
-
- Log(("print!\n"));
-
- if (!mg->printdialog) {
- int n;
- Arg args[20];
-
- n = 0;
- XtSetArg(args[n], XtNallowShellResize, True);
- n++;
- mg->printdialog_shell = XtCreatePopupShell("printdialogshell",
- transientShellWidgetClass,
- topwindow, args, n);
- n = 0;
- mg->printdialog =
- XtCreateManagedWidget("printdialog", printDialogWidgetClass,
- mg->printdialog_shell, args, n);
- XtAddCallback(mg->printdialog, XawNOkCallback, printOKXtProc, NULL);
- XtAddCallback(mg->printdialog, XawNCancelCallback, printCancelXtProc,
- NULL);
-
- XtRealizeWidget(mg->printdialog_shell);
- }
-
- /* Center dialog */
- XtVaGetValues(mg->printdialog_shell,
- XtNwidth, &width, XtNheight, &height, NULL);
-
- x = (Position) (XWidthOfScreen(XtScreen(parent)) - width) / 2;
- y = (Position) (XHeightOfScreen(XtScreen(parent)) - height) / 3;
-
- XtVaSetValues(mg->printdialog_shell, XtNx, x, XtNy, y, NULL);
-
- XtPopup(mg->printdialog_shell, XtGrabNonexclusive);
-}
-#endif /* INCLUDE_XPRINT_SUPPORT */
/* Function Name: ShowVersion
* Description: Show current version.
Index: xsrc/external/mit/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.9 xsrc/external/mit/xman/dist/misc.c:1.10
--- xsrc/external/mit/xman/dist/misc.c:1.9 Mon Jul 15 04:54:48 2019
+++ xsrc/external/mit/xman/dist/misc.c Thu Jul 4 00:26:57 2024
@@ -60,16 +60,6 @@ static Boolean ConstructCommand(char *cm
const char *filename, const char *tempfile);
#endif
-#if defined(ISC) || defined(__SCO__) || defined(__UNIXWARE__)
-static char *uncompress_format = NULL;
-
-static char *uncompress_formats[] = {
- UNCOMPRESS_FORMAT_1,
- UNCOMPRESS_FORMAT_2,
- UNCOMPRESS_FORMAT_3
-};
-#endif
-
/* Function Name: PopupWarning
* Description: This function pops up a warning message.
* Arguments: string - the specific warning string.
@@ -196,10 +186,6 @@ FindManualFile(ManpageGlobals * man_glob
const char *entry = manual[section_num].entries[entry_num];
int len_cat = strlen(CAT);
-#if defined(ISC) || defined(__SCO__) || defined(__UNIXWARE__)
- int i;
-#endif
-
temp = CreateManpageName(entry, 0, 0);
snprintf(man_globals->manpage_title, sizeof(man_globals->manpage_title),
"The current manual page is: %s.", temp);
@@ -227,7 +213,6 @@ FindManualFile(ManpageGlobals * man_glob
* Then for compressed files in an uncompressed directory.
*/
-#if !defined(ISC) && !defined(__UNIXWARE__)
#if defined(__OpenBSD__) || defined(__NetBSD__)
/* look in machine subdir first */
snprintf(filename, sizeof(filename), "%s/%s%s/%s/%s.%s", path, CAT,
@@ -277,18 +262,6 @@ FindManualFile(ManpageGlobals * man_glob
return (file);
}
#endif
-#else
- for (i = 0; i < strlen(COMPRESSION_EXTENSIONS); i++) {
- snprintf(filename, sizeof(filename), "%s/%s%s/%s.%c", path, CAT,
- section + len_cat, page, COMPRESSION_EXTENSIONS[i]);
- uncompress_format = uncompress_formats[i];
-#ifdef DEBUG
- printf("Trying .%c ...\n", COMPRESSION_EXTENSIONS[i]);
-#endif
- if ((file = Uncompress(man_globals, filename)) != NULL)
- return (file);
- }
-#endif
/*
* And lastly files in a compressed directory.
@@ -668,7 +641,8 @@ ConstructCommand(char *cmdbuf, const cha
const char *filename, const char *tempfile)
{
#ifdef HAVE_MANDB
- int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null",
+ int used = snprintf(cmdbuf, BUFSIZ, "MAN_KEEP_FORMATTING=x GROFF_NO_SGR= "
+ "man -l %s > %s 2>/dev/null",
filename, tempfile);
if (used >= BUFSIZ - 1)
return FALSE;
Index: xsrc/external/mit/xman/dist/search.c
diff -u xsrc/external/mit/xman/dist/search.c:1.3 xsrc/external/mit/xman/dist/search.c:1.4
--- xsrc/external/mit/xman/dist/search.c:1.3 Tue Jan 10 21:50:59 2017
+++ xsrc/external/mit/xman/dist/search.c Thu Jul 4 00:26:57 2024
@@ -189,7 +189,7 @@ DoSearch(ManpageGlobals * man_globals, i
fd = mkstemp(tmp);
umask(omask);
if (fd < 0) {
- PopupWarning(man_globals, "Cant create temp file");
+ PopupWarning(man_globals, "Can't create temp file");
return NULL;
}
mantmp = tmp;
@@ -214,12 +214,8 @@ DoSearch(ManpageGlobals * man_globals, i
snprintf(label, sizeof(label),
"Results of apropos search on: %s", search_string);
-#ifdef NO_MANPATH_SUPPORT /* not quite correct, but the best I can do. */
- snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, search_string, mantmp);
-#else
snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, path, search_string,
mantmp);
-#endif
if (system(cmdbuf) != 0) { /* execute search. */
snprintf(error_buf, sizeof(error_buf),
Index: xsrc/external/mit/xman/dist/vendor.h
diff -u xsrc/external/mit/xman/dist/vendor.h:1.7 xsrc/external/mit/xman/dist/vendor.h:1.8
--- xsrc/external/mit/xman/dist/vendor.h:1.7 Sun Jul 19 23:04:04 2015
+++ xsrc/external/mit/xman/dist/vendor.h Thu Jul 4 00:26:57 2024
@@ -51,10 +51,7 @@ from the X Consortium.
*/
#define SEARCHDIR MAN
-
-#if (defined(sgi) || (defined(SVR4) && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) || defined(__CYGWIN__) )
-# define SEARCHOTHER CAT
-#endif
+#define SEARCHOTHER CAT
/*
* The default manual page directory.
@@ -64,20 +61,14 @@ from the X Consortium.
#ifndef SYSMANPATH
-#if defined(__bsdi__)
-# define SYSMANPATH "/usr/share/man:/usr/contrib/man:/usr/contrib/isode/man:/usr/local/man"
-#elif defined(__OpenBSD__) || defined(__DARWIN__)
+#if defined(__OpenBSD__) || defined(__DARWIN__)
# define SYSMANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
#elif defined(SVR4) && defined(sun)
# define SYSMANPATH "/usr/share/man:/usr/X11/man:/usr/openwin/share/man:/usr/dt/share/man:/usr/sfw/share/man"
-#elif defined(SVR4) || defined(__osf__) || (defined(BSD) && (BSD >= 199103))
-# define SYSMANPATH "/usr/share/man"
-#elif defined(sgi)
-# define SYSMANPATH "/usr/catman/a_man:/usr/catman/g_man:/usr/catman/p_man:/usr/catman/u_man:/usr/man/p_man:/usr/man/u_man:/usr/man"
#endif
#ifndef SYSMANPATH
-# define SYSMANPATH "/usr/man"
+# define SYSMANPATH "/usr/share/man"
#endif
#endif
@@ -86,59 +77,29 @@ from the X Consortium.
* Compression Definitions.
*/
-#if defined(sgi)
-# define COMPRESSION_EXTENSION "z"
-# define UNCOMPRESS_FORMAT "pcat %s > %s"
-# define NO_COMPRESS /* mac can't handle using pack as a filter and
- xman needs it to be done that way. */
-#elif defined (ISC) || defined(__SCO__) || defined(__UNIXWARE__)
-# define COMPRESSION_EXTENSION "Z" /* dummy */
-# if !defined(__SCO__) && !defined(__UNIXWARE__)
-# define COMPRESSION_EXTENSIONS "zZF" /* pack, compress, freeze */
-# else
-# define COMPRESSION_EXTENSIONS "zZ" /* pack, compress */
-# endif
-# define UNCOMPRESS_FORMAT uncompress_format
-# define UNCOMPRESS_FORMAT_1 "pcat %s > %s"
-# define UNCOMPRESS_FORMAT_2 "zcat < %s > %s"
-# define UNCOMPRESS_FORMAT_3 "fcat < %s > %s"
-# define NO_COMPRESS
-#else
-# define COMPRESSION_EXTENSION "Z"
-# define UNCOMPRESS_FORMAT "zcat < %s >> %s"
-# define COMPRESS "compress"
-# define GZIP_EXTENSION "gz"
-# define GUNZIP_FORMAT "gzip -c -d < %s >> %s"
-# define GZIP_COMPRESS "gzip"
-# define BZIP2_EXTENSION "bz2"
-# define BUNZIP2_FORMAT "bunzip2 -c -d < %s >> %s"
-# define BZIP2_COMPRESS "bzip2"
-# define LZMA_EXTENSION "lzma"
-# define UNLZMA_FORMAT "unlzma -c -d < %s >> %s"
-# define LZMA_COMPRESS "lzma"
-#endif
-
+#define COMPRESSION_EXTENSION "Z"
+#define UNCOMPRESS_FORMAT "zcat < %s >> %s"
+#define COMPRESS "compress"
+#define GZIP_EXTENSION "gz"
+#define GUNZIP_FORMAT "gzip -c -d < %s >> %s"
+#define GZIP_COMPRESS "gzip"
+#define BZIP2_EXTENSION "bz2"
+#define BUNZIP2_FORMAT "bunzip2 -c -d < %s >> %s"
+#define BZIP2_COMPRESS "bzip2"
+#define LZMA_EXTENSION "lzma"
+#define UNLZMA_FORMAT "unlzma -c -d < %s >> %s"
+#define LZMA_COMPRESS "lzma"
/*
* The command filters for the manual and apropos searches.
*/
-#if defined(hpux)
-# define NO_MANPATH_SUPPORT
-#endif
-
-#ifdef NO_MANPATH_SUPPORT
-# define APROPOS_FORMAT ("man -k %s | pr -h Apropos >> %s")
-#else
-# define APROPOS_FORMAT ("man -M %s -k %s | pr -h Apropos >> %s")
-#endif
+#define APROPOS_FORMAT ("man -M %s -k %s | pr -h Apropos >> %s")
#ifndef HANDLE_ROFFSEQ
# if defined(CSRG_BASED)
# define FORMAT "| eqn | tbl | nroff -mandoc"
-# elif defined(BSD) && (BSD >= 199103)
-# define FORMAT "| eqn | tbl | nroff -man"
# elif defined(linux) || defined(__CYGWIN__)
# define FORMAT "| pic | eqn | tbl -Tlatin1 | GROFF_NO_SGR= groff -Tlatin1 -mandoc"
# else
@@ -173,17 +134,8 @@ from the X Consortium.
* Names of the man and cat dirs.
*/
-#ifdef __bsdi__
-#define MAN "cat"
-#else
#define MAN "man"
-#endif
-
-#if defined(SCO)
-# define CAT "cat."
-#else
-# define CAT "cat"
-#endif
+#define CAT "cat"
/* Solaris has nroff man pages in "man" and sgml man pages in "sman" */
#if defined(sun) && defined(SVR4)
Index: xsrc/external/mit/xmore/dist/compile
diff -u xsrc/external/mit/xmore/dist/compile:1.3 xsrc/external/mit/xmore/dist/compile:1.4
--- xsrc/external/mit/xmore/dist/compile:1.3 Sun Mar 3 21:38:01 2019
+++ xsrc/external/mit/xmore/dist/compile Thu Jul 4 00:26:57 2024
@@ -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:
