Commit 71f50ef7 authored by Robert Luberda's avatar Robert Luberda

New upstream version 0.4.17

parent f23551a6
......@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......
commit ec1fb9cba4104a245fef32cf0ade858a8c4488a7
Author: Yuri D'Elia <yuri.delia@eurac.edu>
Date: Thu Jun 14 17:03:18 2012 +0200
Bump WMND to 0.4.17.
commit c96f86d4e2d925049cdf98d10887f8a468d8db9d
Author: Yuri D'Elia <yuri.delia@eurac.edu>
Date: Wed Jun 6 19:27:13 2012 +0200
Fix the installation path of wmndrc.
commit 4445971e5bc19e77972d86cf322eb9bcab107254
Author: Yuri D'Elia <yuri.delia@eurac.edu>
Date: Wed Jun 6 15:50:16 2012 +0200
Doc fixes: follow the suggestions form Alexey I. Froloff
- Fix FSF address in COPYING, src/list.h
- Recode NEWS to UTF-8
commit a1fe24e2267d4cfa4fa2c372156b66383762f02a
Author: Yuri D'Elia <wavexx@thregr.org>
Date: Sun Jan 22 21:15:13 2012 +0100
Update configure.ac for the latest autoconf.
commit 7a38a98e1000cb77055fc92cda94bac297192b79
Author: Yuri D'Elia <wavexx@thregr.org>
Date: Sun Jan 22 21:14:01 2012 +0100
Reformat documentation.
commit ab81744cb20cb2ad82f5004217e47a57eb380d00
Author: Yuri D'Elia <yuri.delia@eurac.edu>
Date: Mon Aug 16 17:57:46 2010 +0200
......
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
......@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
HP-UX `make' updates targets which have the same time stamps as
their prerequisites, which makes it generally unusable when shipped
generated files such as `configure' are involved. Use GNU `make'
instead.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
......
......@@ -3,5 +3,6 @@ SUBDIRS = src
# extra distribution files
man_MANS = doc/wmnd.1
data_DATA = examples/wmndrc
examplesdir = $(docdir)/examples
dist_examples_DATA = examples/wmndrc
EXTRA_DIST = $(man_MANS) $(data_DATA) ChangeLog.0
This diff is collapsed.
WMND 0.4.16:
WMND 0.4.17
-----------
* Minor documentation/packaging fixes.
WMND 0.4.16
-----------
* Fixed build failure on FreeBSD 8.1.
WMND 0.4.15:
WMND 0.4.15
-----------
* Fixed build failure of the SNMP driver.
WMND 0.4.14:
WMND 0.4.14
-----------
* Fixed build on newer GLIBC versions.
* Remove spurious black line at the bottom of the pixmap
(Thanks to Mikael Magnusson)
WMND 0.4.13:
WMND 0.4.13
-----------
* Fixed crash due to buffer overflow on 64bit systems.
* Fixed incorrect display on linux for devices having similar names.
......@@ -28,7 +38,8 @@ WMND 0.4.13:
* The enhanced dummy driver is now the default.
WMND 0.4.12:
WMND 0.4.12
-----------
* Executed processes are no longer left as zombies.
* Solaris 7 build fixes and kstat enhancements.
......@@ -36,26 +47,30 @@ WMND 0.4.12:
* Maintainers warning: some flag names changed in 'configure'.
WMND 0.4.11:
WMND 0.4.11
-----------
* Édition spécial Parisienne!
* Édition spécial Parisienne!
* Added support for history zoom/inspection through trend.
See README for more details.
WMND 0.4.10:
WMND 0.4.10
-----------
* Fixed generic_snmp for old snmpd by probing both ifName and
ifDesc. --enable-snmp-descr is no longer needed.
WMND 0.4.9:
WMND 0.4.9
----------
* The auto-generated wmndrc now only includes changed values.
* Added a geometry flag (-g, requested by Johannes Middeke).
WMND 0.4.8:
WMND 0.4.8
----------
* linux_proc supports multiple interfaces on the command
line (integrated patch wmnd-0.4.7-lxext, requested by
......@@ -69,7 +84,8 @@ WMND 0.4.8:
Jeff Greenfield a looong time ago).
WMND 0.4.7:
WMND 0.4.7
----------
* WMND statistics are more accurate now with a finer
time-based method (should remove a 10% error). You can switch
......@@ -86,7 +102,8 @@ WMND 0.4.7:
instances into a single dock.
WMND 0.4.6:
WMND 0.4.6
----------
* Fixed a typo in the configure script that could cause some
shells to interrupt the configuration.
......@@ -94,7 +111,8 @@ WMND 0.4.6:
is usually shorter. Again, issues in the README.
WMND 0.4.5:
WMND 0.4.5
----------
* Added a new IF-MIB snmp driver! You can now monitor local
and remote snmp interfaces a-la MRTG, but in realtime! Read
......@@ -102,12 +120,14 @@ WMND 0.4.5:
* Some packaging 'hints' into the README.
WMND 0.4.4a:
WMND 0.4.4a
-----------
* Fixed a bug into the solaris_fpppd driver (won't compile).
WMND 0.4.4:
WMND 0.4.4
----------
* WMND can now be quiet (-q/Q or quiet into ~/.wmndrc).
* Fixed some parts of the configure script. Some options have
......@@ -144,7 +164,8 @@ WMND 0.4.4:
now use it for ppp links.
WMND 0.4.3:
WMND 0.4.3
----------
* Fixed a minor bug into the freebsd_sysctl driver that would
crash WMND under some circumstances.
......@@ -152,7 +173,8 @@ WMND 0.4.3:
* Minor code/spell corrections.
WMND 0.4.2:
WMND 0.4.2
----------
* added the missing -lkstat flag to the solaris kstat driver.
* the graph scrolling speed is now specified in tenth of seconds
......@@ -167,12 +189,14 @@ WMND 0.4.2:
* Tune-up of the freebsd_sysctl driver
WMND 0.4.1:
WMND 0.4.1
----------
* fixed the solaris fpppd driver
WMND 0.4.0:
WMND 0.4.0
----------
* auto-detection stuff
* remove visualization modes from configure
......
WMND - Window Maker Network Devices
===================================
Description
-----------
WMND (WindowMaker Network Devices) is a highly customizable network monitoring
dockapp for Window Maker (and compatibles) for many operative systems and
devices. WMND can be found at http://www.thregr.org/~wavexx/software/wmnd/
Copyright
---------
WMND was originally based on WMiFS, forked around 2001 by Reed Lai. WMND is
currently maintained by Yuri D'Elia and distributed under GNU GPL v2 or
above. See AUTHORS and COPYING for detailed licensing details.
Bugs
----
A list of wishes and bugs can be found at the Debian WMND bugs page[1].
[1] http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=wmnd
The FreeBSD driver is known to have problems on laptop systems where you can
dynamically insert/remove addictional PCMCIA interfaces. This is rather a
design problem of the driver. A developer with FreeBSD's MIB knowledge would be
helpful.
Certainly there are more. I actually test WMND only on Solaris, Linux and IRIX
boxes. You can report bugs to the current maintainer's email:
<wavexx@users.sf.net>. Please be as descriptive as possible and always include
at least:
* WMND version
* your host/target operating system
* compiler used
* A backtrace of the crash would be helpful, but less essential.
.. contents::
Hints for WMND
......@@ -416,3 +384,34 @@ You will need trend[1] to be installed for this feature to work.
Any version of trend starting with Rev #68 02/11/2007 should work.
[1] http://www.thregr.org/~wavexx/software/trend/
Copyright
---------
WMND was originally based on WMiFS, forked around 2001 by Reed Lai. WMND is
currently maintained by Yuri D'Elia and distributed under GNU GPL v2 or
above. See AUTHORS and COPYING for detailed licensing details.
Bugs
----
A list of wishes and bugs can be found at the Debian WMND bugs page[1].
[1] http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=wmnd
The FreeBSD driver is known to have problems on laptop systems where you can
dynamically insert/remove addictional PCMCIA interfaces. This is rather a
design problem of the driver. A developer with FreeBSD's MIB knowledge would be
helpful.
Certainly there are more. I actually test WMND only on Solaris, Linux and IRIX
boxes. You can report bugs to the current maintainer's email:
<wavexx@users.sf.net>. Please be as descriptive as possible and always include
at least:
* WMND version
* your host/target operating system
* compiler used
* A backtrace of the crash would be helpful, but less essential.
Reed Lai http://bv4qo.wingeer.org/
Reed Lai http://bv4qo.wingeer.org/:
* Project initiation.
Arthur Korn <arthur@korn.ch>
Arthur Korn <arthur@korn.ch>:
* Original WMND man page author.
* Old Makefile system maintenance.
* Debian package maintenance: http://packages.debian.org/wmnd/
Michael Leuchtenburg
Michael Leuchtenburg:
* Old web site administration: http://wmnd.wingeer.org/
* English refinement of articles
Paul van Tilburg (Mozillion) http://www.utopiamoo.net/
Paul van Tilburg (Mozillion) http://www.utopiamoo.net/:
* Provided ultimate test environment for function and stability
of WMND.
Timecop <timecop@japan.co.jp> http://www.ne.jp/asahi/linux/timecop/
Timecop <timecop@japan.co.jp> http://www.ne.jp/asahi/linux/timecop/:
* Source code optimization (Re-wrote the source code of WMND 0.2.0)
Yuri D'Elia (wave++) <wavexx@users.sf.net> http://www.thregr.org/~wavexx/
Yuri D'Elia (wave++) <wavexx@users.sf.net> http://www.thregr.org/~wavexx/:
* Driver architecture, new visualization structs, re-wrote source
code of WMND 0.3 series.
* Many minor things (see ChangeLog)
Sebastian Liusnea <sebaks@csit-sun.pub.ro>
Sebastian Liusnea <sebaks@csit-sun.pub.ro>:
* A different Solaris port of WMND 0.2.0.
Paulo E. Abreu <qtabreu@ci.uc.pt>
Paulo E. Abreu <qtabreu@ci.uc.pt>:
* Old RPM package maintenance.
......
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -13,18 +14,21 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
......@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.1], [],
m4_if([$1], [1.11.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.1])dnl
[AM_AUTOMAKE_VERSION([1.11.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
......@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 10
# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
......@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
......@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
msvisualcpp | msvcmsys)
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
......@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
AC_SUBST([am__nodep])dnl
_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
......@@ -557,12 +567,15 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
......@@ -694,12 +707,15 @@ else
fi
])
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
......@@ -722,13 +738,14 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 4
# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
......@@ -736,13 +753,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
# ------------------------------
# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
# ----------------------------------
# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
......@@ -818,12 +835,14 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
......@@ -846,13 +865,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 2
# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
......@@ -861,13 +880,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -889,10 +908,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility.
AM_MISSING_PROG([AMTAR], [tar])
[# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
[am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
[am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,13 +2,14 @@
# report bugs and comments to wavexx@users.sf.net
# initialization
AC_INIT(wmnd, 0.4.16, wavexx@users.sf.net)
AC_INIT(wmnd, 0.4.17, wavexx@users.sf.net)
AC_CONFIG_SRCDIR(src/wmnd.c)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
# C compiler rules
AC_LANG([C])
AC_PROG_CC
AC_HEADER_STDC
AC_HEADER_TIME
......@@ -84,11 +85,11 @@ AS_IF([test "$ac_drivers" = "auto"],
# freebsd_sysctl
AC_MSG_CHECKING(for FreeBSD sysctl availability)
AC_PREPROC_IFELSE(
AC_PREPROC_IFELSE([AC_LANG_SOURCE(
[
#include <net/if_mib.h>
#include <sys/sysctl.h>
], [
])], [
ac_drivers="$ac_drivers freebsd_sysctl"
AC_MSG_RESULT(yes)
], [
......@@ -111,7 +112,7 @@ AS_IF([test "$ac_drivers" = "auto"],
# netbsd_ioctl
AC_MSG_CHECKING(for NetBSD ioctl availability)
AC_COMPILE_IFELSE(
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
#include <sys/types.h>
#include <sys/sockio.h>
......@@ -120,7 +121,7 @@ AS_IF([test "$ac_drivers" = "auto"],
#include <ifaddrs.h>
void aFunc() { ioctl(0, SIOCGIFDATA, NULL); }
], [
])], [
ac_drivers="$ac_drivers netbsd_ioctl"
AC_MSG_RESULT(yes)
], [
......
This diff is collapsed.
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2009-04-28.21; # UTC
scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -156,6 +156,10 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
-T) no_target_directory=true;;
......@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
done
fi
......@@ -200,7 +208,11 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
trap '(exit $?); exit' 1 2 13 15
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
......@@ -228,9 +240,9 @@ fi
for src
do
# Protect names starting with `-'.
# Protect names problematic for `test' and other utilities.
case $src in
-*) src=./$src;;
-* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
......@@ -252,12 +264,7 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dst_arg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
......@@ -385,7 +392,7 @@ do
case $dstdir in
/*) prefix='/';;
-*) prefix='./';;
[-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
......@@ -403,7 +410,7 @@ do
for d
do
test -z "$d" && continue
test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
......
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
scriptversion=2009-04-28.21; # UTC
scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
# 2008, 2009 Free Software Foundation, Inc.
# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
......@@ -84,7 +84,6 @@ Supported PROGRAM values:
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
......@@ -122,15 +121,6 @@ case $1 in
# Not GNU programs, they don't have --version.
;;
tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
exit 1
fi
;;
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
......@@ -226,7 +216,7 @@ WARNING: \`$1' $msg. You should only need it if
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
eval LASTARG="\${$#}"
eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
......@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg. You should only need it if
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
eval LASTARG="\${$#}"
eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
......@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
tar*)
shift
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
# messages.
if (gnutar --version > /dev/null 2>&1); then
gnutar "$@" && exit 0