From 232d8c6c12c8ee1c88594bd2fbefc798d76ad4d2 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 28 Dec 2016 17:09:05 +0000 Subject: [PATCH] Update the publicly shown copyright information Set the publicly shown copyright holder to "The strace developers.". * COPYING: Update copyright information. * configure.ac: Add AC_COPYRIGHT. * strace.c (print_version): New function. (init): Use it. * tests/strace-V.test: Update expected output. --- COPYING | 1 + configure.ac | 1 + strace.c | 12 +++++++++++- tests/strace-V.test | 7 ++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index e9078d3e..68dc370f 100644 --- a/COPYING +++ b/COPYING @@ -4,6 +4,7 @@ Copyright (c) 1993 Ulrich Pegelow Copyright (c) 1995, 1996 Michael Elizabeth Chastain Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey Copyright (C) 1998-2001 Wichert Akkerman +Copyright (C) 2001-2016 The strace developers. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/configure.ac b/configure.ac index 56b9957e..2d766453 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,7 @@ AC_INIT([strace], [strace-devel@lists.sourceforge.net], [strace], [https://strace.io]) +AC_COPYRIGHT([Copyright (C) 1999-2016 The strace developers.]) AC_CONFIG_SRCDIR([strace.c]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) diff --git a/strace.c b/strace.c index 23ca108d..9df942ec 100644 --- a/strace.c +++ b/strace.c @@ -192,6 +192,16 @@ strerror(int err_no) #endif /* HAVE_STERRROR */ +static void +print_version(void) +{ + printf("%s -- version %s\n" + "Copyright (C) %s The strace developers <%s>.\n" + "This is free software; see the source for copying conditions. There is NO\n" + "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", + PACKAGE_NAME, PACKAGE_VERSION, "1991-2016", PACKAGE_URL); +} + static void usage(void) { @@ -1666,7 +1676,7 @@ init(int argc, char *argv[]) qualify("abbrev=none"); break; case 'V': - printf("%s -- version %s\n", PACKAGE_NAME, VERSION); + print_version(); exit(0); break; case 'z': diff --git a/tests/strace-V.test b/tests/strace-V.test index d441371e..2f0ff327 100755 --- a/tests/strace-V.test +++ b/tests/strace-V.test @@ -11,7 +11,12 @@ getval() sed -r -n 's/#define[[:space:]]*'"$1"'[[:space:]]*"([^"]*)".*/\1/p' ../config.h } -printf "%s -- version %s\n" "$(getval PACKAGE_NAME)" "$(getval VERSION)" > "$EXP" +cat > "$EXP" << __EOF__ +$(getval PACKAGE_NAME) -- version $(getval PACKAGE_VERSION) +Copyright (C) 1991-2016 The strace developers <$(getval PACKAGE_URL)>. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +__EOF__ match_diff "$EXP" "$LOG" rm -f "$EXP" -- 2.40.0