...
 
Commits (14)
  • Colin Watson's avatar
    Switch to bootstrap · 9b7b0d22
    Colin Watson authored
    We no longer keep autogenerated files in git.
    
    * .gitignore: Add **/Makefile.in, /INSTALL, /aclocal.m4, /build-aux,
    /config.h.in, /configure, /gl, and /gnulib.  Remove gnulib/*.
    * INSTALL, Makefile.in, aclocal.m4, autogen.sh, build-aux, config.h.in,
    configure, gnulib, lib/Makefile.in, man/Makefile.in, tests/Makefile.in:
    Remove.
    * bootstrap, bootstrap.conf: New files.
    * Makefile.am (SUBDIRS, EXTRA_DIST, ACLOCAL_AMFLAGS): Refer to gl/
    rather than gnulib/ (gnulib/ now contains pristine source).
    (EXTRA_DIST): Replace autogen.sh with bootstrap and bootstrap.conf.
    Remove gnulib/m4/gnulib-cache.m4 and gnulib/m4/gnulib-tool.m4.
    * configure.ac (AC_CONFIG_FILES): Refer to gl/ rather than gnulib/.
    * lib/Makefile.am (libpipeline_la_CPPFLAGS, libpipeline_la_LIBADD):
    Likewise.
    * tests/Makefile.am (LIBS, AM_CPPFLAGS): Likewise.
    * release.sh: Call ./bootstrap rather than ./autogen.sh.
    9b7b0d22
  • Colin Watson's avatar
    Upgrade to Gnulib 20180527 · 98002165
    Colin Watson authored
    * bootstrap.conf (GNULIB_URL): Remove.
    (GNULIB_REVISION): Set to 90f289f249a266b1afb9c63e182f5d979d17df5f.
    * configure.ac (AM_PROG_AR, LT_INIT): Move below gl_EARLY.
    98002165
  • Colin Watson's avatar
    Clean up bootstrap configuration slightly · 9253fb77
    Colin Watson authored
    * bootstrap.conf (gnulib_name, source_base, m4_base): Set these instead
    of the corresponding options in gnulib_tool_option_extras.
    9253fb77
  • Colin Watson's avatar
    Prefer the Gnulib versions of some more files · 59b4307c
    Colin Watson authored
    * bootstrap.conf (gnulib_extra_files): Remove.  (This has the effect of
    reverting to bootstrap's default of also copying some files in
    build-aux/ from Gnulib.)
    59b4307c
  • Colin Watson's avatar
    Avoid gl directory confusion · 74a1eccc
    Colin Watson authored
    * bootstrap.conf (local_gl_dir): Set to 'gnulib-local'.
    74a1eccc
  • Colin Watson's avatar
    Use (void *) 0 as a variadic sentinel · e6ff06b8
    Colin Watson authored
    NULL is formally incorrect here since the standard allows it to be an
    integer constant expression.
    
    * lib/pipeline.c (argstr_get_word, pipecmd_tostring, pipeline_tostring):
    Use (void *) rather than NULL as a sentinel for variadic functions.
    e6ff06b8
  • Colin Watson's avatar
    More (void *) 0 as variadic sentinel · 1569f8f1
    Colin Watson authored
    * tests/basic.c (test_basic_status, test_basic_args,
    test_basic_pipeline, test_basic_wait_all, test_basic_setenv,
    test_basic_unsetenv, test_basic_clearenv, test_basic_chdir,
    test_basic_fchdir, test_basic_pre_exec, test_basic_sequence): Use
    (void *) rather than NULL as a sentinel for variadic functions.
    * tests/common.c (temp_dir_teardown): Likewise.
    * tests/exec.c (test_exec_process): Likewise.
    * tests/inspect.c (test_inspect_command, test_inspect_pipeline):
    Likewise.
    * tests/pump.c (fail_unless_files_equal,
    test_pump_connect_attaches_correctly, test_pump_tee): Likewise.
    * tests/redirect.c (test_redirect_files, test_redirect_outfile):
    Likewise.
    1569f8f1
  • Colin Watson's avatar
    Use tar --sort=name if available · 1c2faf2c
    Colin Watson authored
    * m4/pipeline-tar-sort-name.m4: New file.
    * configure.ac: Call PIPELINE_TAR_SORT_NAME.
    1c2faf2c
  • Colin Watson's avatar
    Upgrade to Gnulib 20190105 · 384358ad
    Colin Watson authored
    In line with Gnulib, we now require Autoconf 2.63 and Automake 1.11.
    
    * bootstrap: Sync to Gnulib d271f868a8df9bbec29049d01e056481b7a1a263.
    * bootstrap.conf (GNULIB_REVISION): Set to
    d271f868a8df9bbec29049d01e056481b7a1a263.
    (buildreq): Bump required autoconf version to 2.63.
    * configure.ac (AM_INIT_AUTOMAKE): Bump to 1.11.
    (AM_SILENT_RULES, AM_PROG_AR): Remove conditionals, which were there for
    Automake 1.10 support.
    (AC_PREREQ): Bump to 2.63.
    * NEWS: Document this.
    384358ad
  • Colin Watson's avatar
    Note requirement of Automake 1.11.2 · 32d61235
    Colin Watson authored
    AM_PROG_AR was actually introduced in 1.11.2, not 1.11.
    
    * bootstrap.conf (buildreq): Bump required automake version to 1.11.2.
    * NEWS: Clarify.
    32d61235
  • Colin Watson's avatar
    Update to Gnulib 20190124 · 146bcd85
    Colin Watson authored
    * bootstrap.conf (GNULIB_REVISION): Set to
    34881aff4043847f2640d90cf9aa325cc3ad08d6.
    146bcd85
  • Colin Watson's avatar
    050cb99b
  • Colin Watson's avatar
    Version: 1.5.1 · a399d471
    Colin Watson authored
    a399d471
  • Colin Watson's avatar
    Import libpipeline_1.5.1.orig.tar.gz · c5605373
    Colin Watson authored
    c5605373
......@@ -7,27 +7,21 @@
**/.deps
**/.libs
**/Makefile
**/Makefile.in
/INSTALL
/aclocal.m4
/autom4te.cache
/build-aux
/config.h
/config.h.in
/config.log
/config.status
/config.status.lineno
/configure
/gl
/gnulib
/libtool
/stamp-h*
gnulib/lib/alloca.h
gnulib/lib/arg-nonnull.h
gnulib/lib/c++defs.h
gnulib/lib/fcntl.h
gnulib/lib/glthread/.dirstamp
gnulib/lib/signal.h
gnulib/lib/stdio.h
gnulib/lib/stdlib.h
gnulib/lib/string.h
gnulib/lib/sys
gnulib/lib/time.h
gnulib/lib/unistd.h
gnulib/lib/warn-on-use.h
gnulib/lib/wchar.h
lib/libpipeline.pc
tests/*.log
tests/*.trs
......
2019-01-27 Colin Watson <cjwatson@debian.org>
Version: 1.5.1
* NEWS: Note Gnulib portability improvements.
2019-01-27 Colin Watson <cjwatson@debian.org>
Update to Gnulib 20190124
* bootstrap.conf (GNULIB_REVISION): Set to
34881aff4043847f2640d90cf9aa325cc3ad08d6.
2019-01-05 Colin Watson <cjwatson@debian.org>
Note requirement of Automake 1.11.2
AM_PROG_AR was actually introduced in 1.11.2, not 1.11.
* bootstrap.conf (buildreq): Bump required automake version to 1.11.2.
* NEWS: Clarify.
2019-01-05 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20190105
In line with Gnulib, we now require Autoconf 2.63 and Automake 1.11.
* bootstrap: Sync to Gnulib d271f868a8df9bbec29049d01e056481b7a1a263.
* bootstrap.conf (GNULIB_REVISION): Set to
d271f868a8df9bbec29049d01e056481b7a1a263.
(buildreq): Bump required autoconf version to 2.63.
* configure.ac (AM_INIT_AUTOMAKE): Bump to 1.11.
(AM_SILENT_RULES, AM_PROG_AR): Remove conditionals, which were there for
Automake 1.10 support.
(AC_PREREQ): Bump to 2.63.
* NEWS: Document this.
2019-01-05 Colin Watson <cjwatson@debian.org>
Use tar --sort=name if available
* m4/pipeline-tar-sort-name.m4: New file.
* configure.ac: Call PIPELINE_TAR_SORT_NAME.
2018-12-24 Colin Watson <cjwatson@debian.org>
More (void *) 0 as variadic sentinel
* tests/basic.c (test_basic_status, test_basic_args,
test_basic_pipeline, test_basic_wait_all, test_basic_setenv,
test_basic_unsetenv, test_basic_clearenv, test_basic_chdir,
test_basic_fchdir, test_basic_pre_exec, test_basic_sequence): Use
(void *) rather than NULL as a sentinel for variadic functions.
* tests/common.c (temp_dir_teardown): Likewise.
* tests/exec.c (test_exec_process): Likewise.
* tests/inspect.c (test_inspect_command, test_inspect_pipeline):
Likewise.
* tests/pump.c (fail_unless_files_equal,
test_pump_connect_attaches_correctly, test_pump_tee): Likewise.
* tests/redirect.c (test_redirect_files, test_redirect_outfile):
Likewise.
2018-12-24 Colin Watson <cjwatson@debian.org>
Use (void *) 0 as a variadic sentinel
NULL is formally incorrect here since the standard allows it to be an
integer constant expression.
* lib/pipeline.c (argstr_get_word, pipecmd_tostring, pipeline_tostring):
Use (void *) rather than NULL as a sentinel for variadic functions.
2018-05-29 Colin Watson <cjwatson@debian.org>
Avoid gl directory confusion
* bootstrap.conf (local_gl_dir): Set to 'gnulib-local'.
2018-05-28 Colin Watson <cjwatson@debian.org>
Prefer the Gnulib versions of some more files
* bootstrap.conf (gnulib_extra_files): Remove. (This has the effect of
reverting to bootstrap's default of also copying some files in
build-aux/ from Gnulib.)
2018-05-28 Colin Watson <cjwatson@debian.org>
Clean up bootstrap configuration slightly
* bootstrap.conf (gnulib_name, source_base, m4_base): Set these instead
of the corresponding options in gnulib_tool_option_extras.
2018-05-28 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20180527
* bootstrap.conf (GNULIB_URL): Remove.
(GNULIB_REVISION): Set to 90f289f249a266b1afb9c63e182f5d979d17df5f.
* configure.ac (AM_PROG_AR, LT_INIT): Move below gl_EARLY.
2018-05-28 Colin Watson <cjwatson@debian.org>
Switch to bootstrap
We no longer keep autogenerated files in git.
* .gitignore: Add **/Makefile.in, /INSTALL, /aclocal.m4, /build-aux,
/config.h.in, /configure, /gl, and /gnulib. Remove gnulib/*.
* INSTALL, Makefile.in, aclocal.m4, autogen.sh, build-aux, config.h.in,
configure, gnulib, lib/Makefile.in, man/Makefile.in, tests/Makefile.in:
Remove.
* bootstrap, bootstrap.conf: New files.
* Makefile.am (SUBDIRS, EXTRA_DIST, ACLOCAL_AMFLAGS): Refer to gl/
rather than gnulib/ (gnulib/ now contains pristine source).
(EXTRA_DIST): Replace autogen.sh with bootstrap and bootstrap.conf.
Remove gnulib/m4/gnulib-cache.m4 and gnulib/m4/gnulib-tool.m4.
* configure.ac (AC_CONFIG_FILES): Refer to gl/ rather than gnulib/.
* lib/Makefile.am (libpipeline_la_CPPFLAGS, libpipeline_la_LIBADD):
Likewise.
* tests/Makefile.am (LIBS, AM_CPPFLAGS): Likewise.
* release.sh: Call ./bootstrap rather than ./autogen.sh.
2017-11-14 Colin Watson <cjwatson@debian.org>
Version: 1.5.0.
......
This diff is collapsed.
......@@ -19,7 +19,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
## USA
SUBDIRS = gnulib/lib lib man
SUBDIRS = gl/lib lib man
if RUN_TESTS
SUBDIRS += tests
endif
......@@ -29,22 +29,21 @@ dist_noinst_DATA = NEWS
EXTRA_DIST = \
.gitignore \
ChangeLog-2013 \
autogen.sh \
gnulib/m4/gnulib-cache.m4 \
gnulib/m4/gnulib-tool.m4 \
bootstrap \
bootstrap.conf \
release.sh
# These macro files are imported by gnulib-tool, but at present not used. We
# include them in the distribution anyway for maximum consistency.
EXTRA_DIST += \
gnulib/m4/math_h.m4
gl/m4/math_h.m4
# Note that autopoint installs into the first directory here. Yes, this
# means that it installs into gnulib/m4, so we always run gnulib-tool after
# means that it installs into gl/m4, so we always run gnulib-tool after
# autopoint, at least for now. See
# http://lists.gnu.org/archive/html/bug-gnulib/2009-03/msg00154.html and
# thread.
ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
ACLOCAL_AMFLAGS = -I gl/m4 -I m4
dist-hook: gen-ChangeLog
......
This diff is collapsed.
libpipeline 1.5.1 (27 January 2019)
===================================
Building libpipeline now requires Autoconf >= 2.63 and Automake >= 1.11.2.
Various portability improvements, via Gnulib.
libpipeline 1.5.0 (14 November 2017)
====================================
......
This diff is collapsed.
#! /bin/sh
set -e
# Copyright (C) 2010 Colin Watson.
#
# This file is free software; the author gives unlimited permission to copy
# and/or distribute it, with or without modifications, as long as this
# notice is preserved.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
if type gnulib-tool >/dev/null 2>&1; then
gnulib-tool --update >/dev/null
fi
LIBTOOLIZE_OPTIONS=--quiet
export LIBTOOLIZE_OPTIONS
autoreconf -fi "$@"
This diff is collapsed.
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# Bootstrap configuration.
# Copyright (C) 2006-2018 Free Software Foundation, Inc.
# 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 3 of the License, or
# (at your option) any later version.
#
# This file is distributed in the hope that it will be useful,
# 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 file. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License,
# this file may be distributed as part of a program that
# contains a configuration script generated by Autoconf, under
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
#
# This file represents the specification of how gnulib-tool is used.
# It acts as a cache: It is written and read by gnulib-tool.
# In projects that use version control, this file is meant to be put under
# version control, like the configure.ac and various Makefile.am files.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Specification in the form of a command-line invocation:
# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf
GNULIB_REVISION=34881aff4043847f2640d90cf9aa325cc3ad08d6
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([])
gl_MODULES([
# gnulib modules used by this package.
gnulib_modules="
dirname
environ
error
......@@ -57,17 +45,32 @@ gl_MODULES([
xalloc
xstrndup
xvasprintf
])
gl_AVOID([])
gl_SOURCE_BASE([gnulib/lib])
gl_M4_BASE([gnulib/m4])
gl_PO_BASE([])
gl_DOC_BASE([doc])
gl_TESTS_BASE([tests])
gl_LIB([libgnu])
gl_MAKEFILE_NAME([])
gl_LIBTOOL
gl_MACRO_PREFIX([gl])
gl_PO_DOMAIN([])
gl_WITNESS_C_MACRO([])
gl_VC_FILES([false])
"
gnulib_tool_option_extras="\
--no-conditional-dependencies \
--libtool \
--macro-prefix=gl \
--no-vc-files \
"
# This doesn't currently exist, but we set it to avoid confusion with 'gl'
# as the local output directory.
local_gl_dir=gnulib-local
gnulib_name=libgnu
source_base=gl/lib
m4_base=gl/m4
checkout_only_file=
copy=true
vc_ignore=
SKIP_PO=t
# Build prerequisites
buildreq="\
autoconf 2.63
automake 1.11.2
git 1.5.5
"
......@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-03-01.08; # UTC
# Copyright (C) 2010-2017 Free Software Foundation, Inc.
# Copyright (C) 2010-2018 Free Software Foundation, Inc.
# Written by Peter Rosin <peda@lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # 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
......
#! /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-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# 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
......@@ -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:
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
# Copyright 1996-2014 Free Software Foundation, Inc.
# Copyright 1996-2019 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
......@@ -367,11 +367,7 @@ else
dgux*)
hardcode_libdir_flag_spec='-L$libdir'
;;
freebsd2.2*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
freebsd2*)
freebsd2.[01]*)
hardcode_direct=yes
hardcode_minus_L=yes
;;
......@@ -548,13 +544,11 @@ case "$host_os" in
dgux*)
library_names_spec='$libname$shrext'
;;
freebsd[23].*)
library_names_spec='$libname$shrext$versuffix'
;;
freebsd* | dragonfly*)
case "$host_os" in
freebsd[123]*)
library_names_spec='$libname$shrext$versuffix' ;;
*)
library_names_spec='$libname$shrext' ;;
esac
library_names_spec='$libname$shrext'
;;
gnu*)
library_names_spec='$libname$shrext'
......
This diff is collapsed.
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2016-01-11.22; # UTC
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# 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
......@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # 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
......@@ -783,7 +783,7 @@ exit 0
# 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: "UTC0"
......
This diff is collapsed.
#!/bin/sh
# Sign files and upload them.
scriptversion=2013-03-19.17; # UTC
scriptversion=2018-05-19.18; # UTC
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2019 Free Software Foundation, Inc.
#
# 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
......@@ -16,7 +16,7 @@ scriptversion=2013-03-19.17; # 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/>.
# Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
# The master copy of this file is maintained in the gnulib Git repository.
......@@ -24,7 +24,30 @@ scriptversion=2013-03-19.17; # UTC
set -e
GPG='gpg --batch --no-tty'
GPG=gpg
# Choose the proper version of gpg, so as to avoid a
# "gpg-agent is not available in this session" error
# when gpg-agent is version 3 but gpg is still version 1.
# FIXME-2020: remove, once all major distros ship gpg version 3 as /usr/bin/gpg
gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'`
case "$gpg_agent_version" in
2.*)
gpg_version=`(gpg --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'`
case "$gpg_version" in
1.*)
if (type gpg2) >/dev/null 2>/dev/null; then
# gpg2 is present.
GPG=gpg2
else
# gpg2 is missing. Ubuntu users should install the package 'gnupg2'.
echo "WARNING: Using 'gpg', which is too old. You should install 'gpg2'." 1>&2
fi
;;
esac
;;
esac
GPG="${GPG} --batch --no-tty"
conffile=.gnuploadrc
to=
dry_run=false
......@@ -54,10 +77,10 @@ Options:
--user NAME sign with key NAME
--replace allow replacements of existing files
--symlink-regex[=EXPR] use sed script EXPR to compute symbolic link names
--dry-run do nothing, show what would have been done
-n, --dry-run do nothing, show what would have been done
(including the constructed directive file)
--version output version information and exit
--help print this help text and exit
-h, --help print this help text and exit
If --symlink-regex is given without EXPR, then the link target name
is created by replacing the version information with '-latest', e.g.:
......@@ -78,7 +101,7 @@ in the current working directory, its contents are prepended to the
actual command line options. Use this to keep your defaults. Comments
(#) and empty lines in $conffile are allowed.
<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
<https://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
gives some further background.
Examples:
......@@ -108,7 +131,7 @@ Examples:
gnupload executes a program ncftpput to do the transfers; if you don't
happen to have an ncftp package installed, the ncftpput-ftp script in
the build-aux/ directory of the gnulib package
(http://savannah.gnu.org/projects/gnulib) may serve as a replacement.
(https://savannah.gnu.org/projects/gnulib) may serve as a replacement.
Send patches and bug reports to <bug-gnulib@gnu.org>."
......@@ -125,7 +148,7 @@ while test -n "$1"; do
-*)
collect_var=
case $1 in
--help)
-h | --help)
echo "$usage"
exit $?
;;
......@@ -171,7 +194,7 @@ while test -n "$1"; do
--symlink)
collect_var=symlink_files
;;
--dry-run|-n)
-n | --dry-run)
dry_run=:
;;
--version)
......@@ -432,9 +455,9 @@ done
exit 0
# Local variables:
# 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:
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2014-09-12.12; # UTC
scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -271,15 +271,18 @@ do
fi
dst=$dst_arg
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
# If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstbase=`basename "$src"`
case $dst in
*/) dst=$dst$dstbase;;
*) dst=$dst/$dstbase;;
esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
......@@ -288,6 +291,11 @@ do
fi
fi
case $dstdir in
*/) dstdirslash=$dstdir;;
*) dstdirslash=$dstdir/;;
esac
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
......@@ -324,14 +332,16 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
# $RANDOM is not portable (e.g. dash); use it when possible to
# lower collision chance
# Note that $RANDOM variable is not portable (e.g. dash); Use it
# here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
# As "mkdir -p" follows symlinks and we work in /tmp possibly; so
# create the $tmpdir first (and fail if unsuccessful) to make sure
# that nobody tries to guess the $tmpdir name.
# Because "mkdir -p" follows existing symlinks and we likely work
# directly in world-writeable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p' feature.
if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
......@@ -434,8 +444,8 @@ do
else
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
dsttmp=${dstdirslash}_inst.$$_
rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
......@@ -500,9 +510,9 @@ do
done
# Local variables:
# 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:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#if !defined _Noreturn && __STDC_VERSION__ < 201112
# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
|| 0x5110 <= __SUNPRO_C)
# define _Noreturn __attribute__ ((__noreturn__))
# elif 1200 <= _MSC_VER
# define _Noreturn __declspec (noreturn)
# else
# define _Noreturn
# endif
#endif
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.