Module Name: xsrc
Committed By: mrg
Date: Sun Jul 19 23:04:04 UTC 2015
Modified Files:
xsrc/external/mit/xman/dist: handler.c misc.c vendor.h
Added Files:
xsrc/external/mit/xmh/dist: compile
Removed Files:
xsrc/external/mit/xlsfonts/dist: autogen.sh xlsfonts.man xlsfonts.sgml
xsrc/external/mit/xmag/dist: Makefile config.h config.log config.status
stamp-h1
xsrc/external/mit/xmag/dist/.deps: CutPaste.Po RootWin.Po Scale.Po
xmag.Po
xsrc/external/mit/xmag/dist/man: Makefile
xsrc/external/mit/xmh/dist: xmh.man
Log Message:
merge xlsfonts 1.0.4, xmag 1.0.6, xman 1.1.4 and xmh 1.0.3.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xlsfonts/dist/autogen.sh
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xlsfonts/dist/xlsfonts.man \
xsrc/external/mit/xlsfonts/dist/xlsfonts.sgml
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmag/dist/Makefile \
xsrc/external/mit/xmag/dist/config.h \
xsrc/external/mit/xmag/dist/config.log \
xsrc/external/mit/xmag/dist/config.status \
xsrc/external/mit/xmag/dist/stamp-h1
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmag/dist/.deps/CutPaste.Po \
xsrc/external/mit/xmag/dist/.deps/RootWin.Po \
xsrc/external/mit/xmag/dist/.deps/Scale.Po \
xsrc/external/mit/xmag/dist/.deps/xmag.Po
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmag/dist/man/Makefile
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xman/dist/handler.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xman/dist/misc.c \
xsrc/external/mit/xman/dist/vendor.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xmh/dist/compile
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/xmh/dist/xmh.man
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/xman/dist/handler.c
diff -u xsrc/external/mit/xman/dist/handler.c:1.4 xsrc/external/mit/xman/dist/handler.c:1.5
--- xsrc/external/mit/xman/dist/handler.c:1.4 Sun Mar 30 18:46:06 2014
+++ xsrc/external/mit/xman/dist/handler.c Sun Jul 19 23:04:04 2015
@@ -320,10 +320,8 @@ SaveFormattedPage(Widget w, XEvent * eve
* If we are not active then take no action.
*/
-#if ARRAY_COMPARISON_TO_NULL_POINTER_MAKES_SENSE
- if (man_globals->tempfile == NULL)
+ if (man_globals->tempfile == NULL || man_globals->tempfile[0] == '\0')
return;
-#endif
switch (params[0][0]) {
case 'S':
@@ -589,17 +587,17 @@ Search(Widget w, XEvent * event, String
case 'O':
case 'o':
if (file != NULL) {
- Widget w;
+ Widget w2;
char *label;
- w = CreateManpage(file);
- if (w) {
+ w2 = CreateManpage(file);
+ if (w2) {
man_pages_shown++;
/* Put title into new manual page. */
label = man_globals->manpage_title;
- man_globals = GetGlobals(w);
+ man_globals = GetGlobals(w2);
strcpy(man_globals->manpage_title, label);
ChangeLabel(man_globals->label, label);
}
Index: xsrc/external/mit/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.6 xsrc/external/mit/xman/dist/misc.c:1.7
--- xsrc/external/mit/xman/dist/misc.c:1.6 Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xman/dist/misc.c Sun Jul 19 23:04:04 2015
@@ -526,7 +526,9 @@ Format(ManpageGlobals * man_globals, con
if (fgets(line, sizeof(line), file) != NULL) {
if (strncmp(line, ".so ", 4) == 0) {
- line[strlen(line) - 1] = '\0';
+ size_t len = strlen(line); /* must be >= 4 to pass strncmp */
+ if (line[len - 1] == '\n')
+ line[len - 1] = '\0';
fclose(file);
remove(filename);
if (line[4] != '/') {
Index: xsrc/external/mit/xman/dist/vendor.h
diff -u xsrc/external/mit/xman/dist/vendor.h:1.6 xsrc/external/mit/xman/dist/vendor.h:1.7
--- xsrc/external/mit/xman/dist/vendor.h:1.6 Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xman/dist/vendor.h Sun Jul 19 23:04:04 2015
@@ -159,12 +159,12 @@ from the X Consortium.
# define REFER "refer"
# if defined(CSRG_BASED)
# define FORMAT "nroff -mandoc"
-# elif defined(linux)
+# elif defined(linux) || defined(__CYGWIN__)
# define FORMAT "GROFF_NO_SGR= groff -Tlatin1 -mandoc"
# elif defined(__DARWIN__)
# define FORMAT "nroff -man"
# else
-# define FORMAT "groff -man"
+# define FORMAT "GROFF_NO_SGR= groff -Tlatin1 -man"
# endif
# define DEFAULT_MANROFFSEQ "et"
#endif /*HANDLE_ROFFSEQ */
Added files:
Index: xsrc/external/mit/xmh/dist/compile
diff -u /dev/null xsrc/external/mit/xmh/dist/compile:1.3
--- /dev/null Sun Jul 19 23:04:04 2015
+++ xsrc/external/mit/xmh/dist/compile Sun Jul 19 23:04:04 2015
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <[email protected]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[email protected]> or send patches to
+# <[email protected]>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <[email protected]>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
