[git] Assuan - branch, master, updated. libassuan-2.0.3-5-g5c00c7c
by Werner Koch
cvs at cvs.gnupg.org
Wed Jan 25 16:16:39 CET 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".
The branch, master has been updated
via 5c00c7cc2901a879927a5756e1bb7ecf49439ebc (commit)
via dbfbc908121afd1cf3177249d9378fc787a9cff7 (commit)
from cef55142f2552538714f8296479f58a63d14a239 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5c00c7cc2901a879927a5756e1bb7ecf49439ebc
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jan 25 15:19:45 2012 +0100
Make new functions also visible on non-W32.
* src/system-posix.c (__assuan_read, __assuan_write, __assuan_recvmsg)
(__assuan_sendmsg, __assuan_waitpid): Make functions global.
* src/libassuan.vers: Add above functions.
* configure.ac: Set version to 2.1.0-git.
diff --git a/NEWS b/NEWS
index a4979c9..4876a50 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Noteworthy changes in version 2.1.0 (unreleased)
+------------------------------------------------
+
+ * Support for the nPth library.
+
+ * Interface changes relative to the 2.0.3 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ASSUAN_SYSTEM_NPTH_IMPL NEW macro.
+ ASSUAN_SYSTEM_NPTH NEW macro.
+ __assuan_read NEW (private).
+ __assuan_write NEW (private).
+ __assuan_recvmsg NEW (private).
+ __assuan_sendmsg NEW (private).
+ __assuan_waitpid NEW (private).
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
Noteworthy changes in version 2.0.3 (2011-12-20)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index f08a3d7..c908ef2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.10"
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.0.4])
+m4_define([my_version], [2.1.0])
m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
diff --git a/doc/assuan.texi b/doc/assuan.texi
index 637ad84..1d48391 100644
--- a/doc/assuan.texi
+++ b/doc/assuan.texi
@@ -963,6 +963,12 @@ The following system hook collections are defined by the library for
your convenience:
@table @code
+ at item ASSUAN_SYSTEM_NPTH
+System hooks suitable for use with the nPth library.
+ at item ASSUAN_SYSTEM_NPTH_IMPL
+The implementation of system hooks for use with the nPth library.
+This must be invoked once somewhere in the application, and defines
+the structure that is referenced by @code{ASSUAN_SYSTEM_NPTH}.
@item ASSUAN_SYSTEM_PTH
System hooks suitable for use with the GNU Pth library.
@item ASSUAN_SYSTEM_PTH_IMPL
diff --git a/src/assuan-buffer.c b/src/assuan-buffer.c
index 96d1f99..f2238e7 100644
--- a/src/assuan-buffer.c
+++ b/src/assuan-buffer.c
@@ -46,7 +46,7 @@ writen (assuan_context_t ctx, const char *buffer, size_t length)
while (length)
{
ssize_t nwritten = ctx->engine.writefnc (ctx, buffer, length);
-
+
if (nwritten < 0)
{
if (errno == EINTR)
@@ -202,7 +202,7 @@ _assuan_read_line (assuan_context_t ctx)
ctx->inbound.linelen);
if (monitor_result & ASSUAN_IO_MONITOR_IGNORE)
ctx->inbound.linelen = 0;
-
+
if ( !(monitor_result & ASSUAN_IO_MONITOR_NOLOG))
_assuan_log_control_channel (ctx, 0, NULL,
ctx->inbound.line, ctx->inbound.linelen,
@@ -211,11 +211,11 @@ _assuan_read_line (assuan_context_t ctx)
}
else
{
- _assuan_log_control_channel (ctx, 0, "invalid line",
+ _assuan_log_control_channel (ctx, 0, "invalid line",
NULL, 0, NULL, 0);
*line = 0;
ctx->inbound.linelen = 0;
- return _assuan_error (ctx, ctx->inbound.eof
+ return _assuan_error (ctx, ctx->inbound.eof
? GPG_ERR_ASS_INCOMPLETE_LINE
: GPG_ERR_ASS_LINE_TOO_LONG);
}
@@ -261,7 +261,7 @@ assuan_pending_line (assuan_context_t ctx)
}
-gpg_error_t
+gpg_error_t
_assuan_write_line (assuan_context_t ctx, const char *prefix,
const char *line, size_t len)
{
@@ -272,7 +272,7 @@ _assuan_write_line (assuan_context_t ctx, const char *prefix,
/* Make sure that the line is short enough. */
if (len + prefixlen + 2 > ASSUAN_LINELENGTH)
{
- _assuan_log_control_channel (ctx, 1,
+ _assuan_log_control_channel (ctx, 1,
"supplied line too long - truncated",
NULL, 0, NULL, 0);
if (prefixlen > 5)
@@ -313,7 +313,7 @@ _assuan_write_line (assuan_context_t ctx, const char *prefix,
}
-gpg_error_t
+gpg_error_t
assuan_write_line (assuan_context_t ctx, const char *line)
{
size_t len;
@@ -364,7 +364,7 @@ _assuan_cookie_write_data (void *cookie, const char *buffer, size_t orig_size)
*line++ = ' ';
linelen += 2;
}
-
+
/* Copy data, keep space for the CRLF and to escape one character. */
while (size && linelen < LINELENGTH-2-2)
{
@@ -382,8 +382,8 @@ _assuan_cookie_write_data (void *cookie, const char *buffer, size_t orig_size)
}
size--;
}
-
-
+
+
monitor_result = 0;
if (ctx->io_monitor)
monitor_result = ctx->io_monitor (ctx, ctx->io_monitor_data, 1,
@@ -414,7 +414,7 @@ _assuan_cookie_write_data (void *cookie, const char *buffer, size_t orig_size)
}
-/* Write out any buffered data
+/* Write out any buffered data
This function is used for GNU's custom streams */
int
_assuan_cookie_write_flush (void *cookie)
@@ -435,7 +435,7 @@ _assuan_cookie_write_flush (void *cookie)
if (ctx->io_monitor)
monitor_result = ctx->io_monitor (ctx, ctx->io_monitor_data, 1,
ctx->outbound.data.line, linelen);
-
+
if (linelen)
{
if (!(monitor_result & ASSUAN_IO_MONITOR_NOLOG))
@@ -461,7 +461,7 @@ _assuan_cookie_write_flush (void *cookie)
* @ctx: An assuan context
* @buffer: Data to send or NULL to flush
* @length: length of the data to send/
- *
+ *
* This function may be used by the server or the client to send data
* lines. The data will be escaped as required by the Assuan protocol
* and may get buffered until a line is full. To force sending the
@@ -470,10 +470,10 @@ _assuan_cookie_write_flush (void *cookie)
* also send the terminating "END" command to terminate the reponse on
* a INQUIRE response. However, when assuan_transact() is used, this
* function takes care of sending END itself.
- *
+ *
* If BUFFER is NULL and LENGTH is 1 and we are a client, a "CAN" is
* send instead of an "END".
- *
+ *
* Return value: 0 on success or an error code
**/
diff --git a/src/libassuan.vers b/src/libassuan.vers
index 8126fab..8f3419f 100644
--- a/src/libassuan.vers
+++ b/src/libassuan.vers
@@ -108,6 +108,11 @@ LIBASSUAN_1.0 {
__assuan_usleep;
__assuan_socket;
__assuan_connect;
+ __assuan_read;
+ __assuan_write;
+ __assuan_recvmsg;
+ __assuan_sendmsg;
+ __assuan_waitpid;
local:
*;
diff --git a/src/system-posix.c b/src/system-posix.c
index 68294c0..5bdc676 100644
--- a/src/system-posix.c
+++ b/src/system-posix.c
@@ -62,17 +62,17 @@ __assuan_usleep (assuan_context_t ctx, unsigned int usec)
{
struct timespec req;
struct timespec rem;
-
+
req.tv_sec = 0;
req.tv_nsec = usec * 1000;
-
+
while (nanosleep (&req, &rem) < 0 && errno == EINTR)
req = rem;
}
#else
{
struct timeval tv;
-
+
tv.tv_sec = usec / 1000000;
tv.tv_usec = usec % 1000000;
select (0, NULL, NULL, NULL, &tv);
@@ -101,7 +101,7 @@ __assuan_close (assuan_context_t ctx, assuan_fd_t fd)
-static ssize_t
+ssize_t
__assuan_read (assuan_context_t ctx, assuan_fd_t fd, void *buffer, size_t size)
{
return read (fd, buffer, size);
@@ -109,7 +109,7 @@ __assuan_read (assuan_context_t ctx, assuan_fd_t fd, void *buffer, size_t size)
-static ssize_t
+ssize_t
__assuan_write (assuan_context_t ctx, assuan_fd_t fd, const void *buffer,
size_t size)
{
@@ -118,7 +118,7 @@ __assuan_write (assuan_context_t ctx, assuan_fd_t fd, const void *buffer,
-static int
+int
__assuan_recvmsg (assuan_context_t ctx, assuan_fd_t fd, assuan_msghdr_t msg,
int flags)
{
@@ -133,7 +133,7 @@ __assuan_recvmsg (assuan_context_t ctx, assuan_fd_t fd, assuan_msghdr_t msg,
-static int
+int
__assuan_sendmsg (assuan_context_t ctx, assuan_fd_t fd, assuan_msghdr_t msg,
int flags)
{
@@ -154,7 +154,7 @@ writen (int fd, const char *buffer, size_t length)
while (length)
{
int nwritten = write (fd, buffer, length);
-
+
if (nwritten < 0)
{
if (errno == EINTR)
@@ -201,7 +201,7 @@ __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
"can't open `/dev/null': %s", strerror (errno));
_exit (4);
}
-
+
/* Dup handles to stdin/stdout. */
if (fd_out != STDOUT_FILENO)
{
@@ -213,7 +213,7 @@ __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
_exit (4);
}
}
-
+
if (fd_in != STDIN_FILENO)
{
if (dup2 (fd_in == ASSUAN_INVALID_FD ? fdnul : fd_in,
@@ -224,7 +224,7 @@ __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
_exit (4);
}
}
-
+
/* Dup stderr to /dev/null unless it is in the list of FDs to be
passed to the child. */
fdp = fd_child_list;
@@ -243,7 +243,7 @@ __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
}
}
close (fdnul);
-
+
/* Close all files which will not be duped and are not in the
fd_child_list. */
n = sysconf (_SC_OPEN_MAX);
@@ -259,24 +259,24 @@ __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
while (*fdp != -1 && *fdp != i)
fdp++;
}
-
+
if (!(fdp && *fdp != -1))
close (i);
}
gpg_err_set_errno (0);
-
+
if (! name)
{
/* No name and no args given, thus we don't do an exec
but continue the forked process. */
*argv = "server";
-
+
/* FIXME: Cleanup. */
return 0;
}
-
- execv (name, (char *const *) argv);
-
+
+ execv (name, (char *const *) argv);
+
/* oops - use the pipe to tell the parent about it */
snprintf (errbuf, sizeof(errbuf)-1,
"ERR %d can't exec `%s': %.50s\n",
@@ -289,7 +289,7 @@ __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
if (! name)
*argv = "client";
-
+
*r_pid = pid;
return 0;
@@ -299,7 +299,7 @@ __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
/* FIXME: Add some sort of waitpid function that covers GPGME and
gpg-agent's use of assuan. */
-static pid_t
+pid_t
__assuan_waitpid (assuan_context_t ctx, pid_t pid, int nowait,
int *status, int options)
{
@@ -307,7 +307,7 @@ __assuan_waitpid (assuan_context_t ctx, pid_t pid, int nowait,
NOWAIT in POSIX systems just means the caller already did the
waitpid for this child. */
if (! nowait)
- return waitpid (pid, NULL, 0);
+ return waitpid (pid, NULL, 0);
return 0;
}
commit dbfbc908121afd1cf3177249d9378fc787a9cff7
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jan 25 13:34:26 2012 +0100
Require gitlog-to-changelog to be installed.
* Makefile.am (GITLOG_TO_CHANGELOG): New.
(gen-ChangeLog): Use installed version of gitlog-to-changelog.
* build-aux/gitlog-to-changelog: Remove from repo.
diff --git a/Makefile.am b/Makefile.am
index 3103c7d..7b328f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,11 +21,13 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
+# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+GITLOG_TO_CHANGELOG=gitlog-to-changelog
+
EXTRA_DIST = config.rpath autogen.sh README.GIT \
ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
tests/ChangeLog-2011 contrib/ChangeLog-2011 \
- build-aux/gitlog-to-changelog build-aux/git-log-footer \
- build-aux/git-log-fix
+ build-aux/git-log-footer build-aux/git-log-fix
SUBDIRS = m4 src doc tests
@@ -37,9 +39,10 @@ dist-hook: gen-ChangeLog
gen_start_date = 2011-12-01T00:00:00
.PHONY: gen-ChangeLog
gen-ChangeLog:
+ set -e; \
if test -d $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \
- ./build-aux/gitlog-to-changelog \
+ $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
--amend=build-aux/git-log-fix --tear-off \
--since=$(gen_start_date) ) > $(distdir)/cl-t; \
cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
deleted file mode 100755
index d9f594f..0000000
--- a/build-aux/gitlog-to-changelog
+++ /dev/null
@@ -1,360 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
- & eval 'exec perl -wS "$0" $argv:q'
- if 0;
-# Convert git log output to ChangeLog format.
-
-my $VERSION = '2011-11-02 07:53'; # UTC
-# The definition above must lie within the first 8 lines in order
-# for the Emacs time-stamp write hook (at end) to update it.
-# If you change this file with Emacs, please let the write hook
-# do its job. Otherwise, update this string manually.
-
-# Copyright (C) 2008-2011 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 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/>.
-
-# Written by Jim Meyering
-
-use strict;
-use warnings;
-use Getopt::Long;
-use POSIX qw(strftime);
-
-(my $ME = $0) =~ s|.*/||;
-
-# use File::Coda; # http://meyering.net/code/Coda/
-END {
- defined fileno STDOUT or return;
- close STDOUT and return;
- warn "$ME: failed to close standard output: $!\n";
- $? ||= 1;
-}
-
-sub usage ($)
-{
- my ($exit_code) = @_;
- my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
- if ($exit_code != 0)
- {
- print $STREAM "Try `$ME --help' for more information.\n";
- }
- else
- {
- print $STREAM <<EOF;
-Usage: $ME [OPTIONS] [ARGS]
-
-Convert git log output to ChangeLog format. If present, any ARGS
-are passed to "git log". To avoid ARGS being parsed as options to
-$ME, they may be preceded by '--'.
-
-OPTIONS:
-
- --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that
- makes a change to SHA1's commit log text or metadata.
- --append-dot append a dot to the first line of each commit message if
- there is no other punctuation or blank at the end.
- --tear-off tear off all commit log lines after a '--' line.
- --since=DATE convert only the logs since DATE;
- the default is to convert all log entries.
- --format=FMT set format string for commit subject and body;
- see 'man git-log' for the list of format metacharacters;
- the default is '%s%n%b%n'
-
- --help display this help and exit
- --version output version information and exit
-
-EXAMPLE:
-
- $ME --since=2008-01-01 > ChangeLog
- $ME -- -n 5 foo > last-5-commits-to-branch-foo
-
-In a FILE specified via --amend, comment lines (starting with "#") are ignored.
-FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on
-a line) referring to a commit in the current project, and CODE refers to one
-or more consecutive lines of Perl code. Pairs must be separated by one or
-more blank line.
-
-Here is sample input for use with --amend=FILE, from coreutils:
-
-3a169f4c5d9159283548178668d2fae6fced3030
-# fix typo in title:
-s/all tile types/all file types/
-
-1379ed974f1fa39b12e2ffab18b3f7a607082202
-# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
-# Change the author to be Paul. Note the escaped "@":
-s,Jim .*>,Paul Eggert <eggert\@cs.ucla.edu>,
-
-EOF
- }
- exit $exit_code;
-}
-
-# If the string $S is a well-behaved file name, simply return it.
-# If it contains white space, quotes, etc., quote it, and return the new string.
-sub shell_quote($)
-{
- my ($s) = @_;
- if ($s =~ m![^\w+/.,-]!)
- {
- # Convert each single quote to '\''
- $s =~ s/\'/\'\\\'\'/g;
- # Then single quote the string.
- $s = "'$s'";
- }
- return $s;
-}
-
-sub quoted_cmd(@)
-{
- return join (' ', map {shell_quote $_} @_);
-}
-
-# Parse file F.
-# Comment lines (starting with "#") are ignored.
-# F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1
-# (alone on a line) referring to a commit in the current project, and
-# CODE refers to one or more consecutive lines of Perl code.
-# Pairs must be separated by one or more blank line.
-sub parse_amend_file($)
-{
- my ($f) = @_;
-
- open F, '<', $f
- or die "$ME: $f: failed to open for reading: $!\n";
-
- my $fail;
- my $h = {};
- my $in_code = 0;
- my $sha;
- while (defined (my $line = <F>))
- {
- $line =~ /^\#/
- and next;
- chomp $line;
- $line eq ''
- and $in_code = 0, next;
-
- if (!$in_code)
- {
- $line =~ /^([0-9a-fA-F]{40})$/
- or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
- $fail = 1, next;
- $sha = lc $1;
- $in_code = 1;
- exists $h->{$sha}
- and (warn "$ME: $f:$.: duplicate SHA1\n"),
- $fail = 1, next;
- }
- else
- {
- $h->{$sha} ||= '';
- $h->{$sha} .= "$line\n";
- }
- }
- close F;
-
- $fail
- and exit 1;
-
- return $h;
-}
-
-{
- my $since_date;
- my $format_string = '%s%n%b%n';
- my $amend_file;
- my $append_dot = 0;
- my $tear_off = 0;
- GetOptions
- (
- help => sub { usage 0 },
- version => sub { print "$ME version $VERSION\n"; exit },
- 'since=s' => \$since_date,
- 'format=s' => \$format_string,
- 'amend=s' => \$amend_file,
- 'append-dot' => \$append_dot,
- 'tear-off' => \$tear_off,
- ) or usage 1;
-
-
- defined $since_date
- and unshift @ARGV, "--since=$since_date";
-
- # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
- # that makes a correction in the log or attribution of that commit.
- my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {};
-
- my @cmd = (qw (git log --log-size),
- '--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV);
- open PIPE, '-|', @cmd
- or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
- . "(Is your Git too old? Version 1.5.1 or later is required.)\n");
-
- my $prev_date_line = '';
- my @prev_coauthors = ();
- while (1)
- {
- defined (my $in = <PIPE>)
- or last;
- $in =~ /^log size (\d+)$/
- or die "$ME:$.: Invalid line (expected log size):\n$in";
- my $log_nbytes = $1;
-
- my $log;
- my $n_read = read PIPE, $log, $log_nbytes;
- $n_read == $log_nbytes
- or die "$ME:$.: unexpected EOF\n";
-
- # Extract leading hash.
- my ($sha, $rest) = split ':', $log, 2;
- defined $sha
- or die "$ME:$.: malformed log entry\n";
- $sha =~ /^[0-9a-fA-F]{40}$/
- or die "$ME:$.: invalid SHA1: $sha\n";
-
- # If this commit's log requires any transformation, do it now.
- my $code = $amend_code->{$sha};
- if (defined $code)
- {
- eval 'use Safe';
- my $s = new Safe;
- # Put the unpreprocessed entry into "$_".
- $_ = $rest;
-
- # Let $code operate on it, safely.
- my $r = $s->reval("$code")
- or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
-
- # Note that we've used this entry.
- delete $amend_code->{$sha};
-
- # Update $rest upon success.
- $rest = $_;
- }
-
- my @line = split "\n", $rest;
- my $author_line = shift @line;
- defined $author_line
- or die "$ME:$.: unexpected EOF\n";
- $author_line =~ /^(\d+) (.*>)$/
- or die "$ME:$.: Invalid line "
- . "(expected date/author/email):\n$author_line\n";
-
- my $date_line = sprintf "%s $2\n", strftime ("%F", localtime ($1));
-
- # Format 'Co-authored-by: A U Thor <email at example.com>' lines in
- # standard multi-author ChangeLog format.
- my @coauthors = grep /^Co-authored-by:.*$/, @line;
- for (@coauthors)
- {
- s/^Co-authored-by:\s*/\t /;
- s/\s*</ </;
-
- /<.*?@.*\..*>/
- or warn "$ME: warning: missing email address for "
- . substr ($_, 5) . "\n";
- }
-
- # If this header would be the same as the previous date/name/email/
- # coauthors header, then arrange not to print it.
- if ($date_line ne $prev_date_line or "@coauthors" ne "@prev_coauthors")
- {
- $prev_date_line eq ''
- or print "\n";
- print $date_line;
- @coauthors
- and print join ("\n", @coauthors), "\n";
- }
- $prev_date_line = $date_line;
- @prev_coauthors = @coauthors;
-
- # Omit "Co-authored-by..." and "Signed-off-by..." lines.
- @line = grep !/^Signed-off-by: .*>$/, @line;
- @line = grep !/^Co-authored-by: /, @line;
-
- # Remove everything after a line with 2 dashes at the beginning.
- if ($tear_off)
- {
- my @tmpline;
- foreach (@line)
- {
- last if /^--\s*$/;
- push @tmpline,$_;
- }
- @line = @tmpline;
- }
-
- # Remove leading and trailing blank lines.
- if (@line)
- {
- while ($line[0] =~ /^\s*$/) { shift @line; }
- while ($line[$#line] =~ /^\s*$/) { pop @line; }
- }
-
- # If there were any lines
- if (@line == 0)
- {
- warn "$ME: warning: empty commit message:\n $date_line\n";
- }
- else
- {
- if ($append_dot)
- {
- # If the first line of the message has enough room, then
- if (length $line[0] < 72)
- {
- # append a dot if there is no other punctuation or blank
- # at the end.
- $line[0] =~ /[[:punct:]\s]$/
- or $line[0] .= '.';
- }
- }
-
- # Prefix each non-empty line with a TAB.
- @line = map { length $_ ? "\t$_" : '' } @line;
-
- print "\n", join ("\n", @line), "\n";
- }
-
- defined ($in = <PIPE>)
- or last;
- $in ne "\n"
- and die "$ME:$.: unexpected line:\n$in";
- }
-
- close PIPE
- or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
- # FIXME-someday: include $PROCESS_STATUS in the diagnostic
-
- # Complain about any unused entry in the --amend=F specified file.
- my $fail = 0;
- foreach my $sha (keys %$amend_code)
- {
- warn "$ME:$amend_file: unused entry: $sha\n";
- $fail = 1;
- }
-
- exit $fail;
-}
-
-# Local Variables:
-# mode: perl
-# indent-tabs-mode: nil
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "my $VERSION = '"
-# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "'; # UTC"
-# End:
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 9 +-
NEWS | 16 ++
build-aux/gitlog-to-changelog | 360 -----------------------------------------
configure.ac | 2 +-
doc/assuan.texi | 6 +
src/assuan-buffer.c | 30 ++--
src/libassuan.vers | 5 +
src/system-posix.c | 42 +++---
8 files changed, 70 insertions(+), 400 deletions(-)
delete mode 100755 build-aux/gitlog-to-changelog
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list