From 884a109e4b8b243d62781de6bf9beecf580213a5 Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Sun, 2 Jun 2002 04:26:46 +0000 Subject: [PATCH] Revert last modification. It'll be fixed properly for dpkg 1.11. --- ChangeLog | 6 ++++++ dpkg-deb/main.c | 14 ++++++++------ dselect/main.cc | 4 ++-- main/main.c | 14 ++++++++------ main/query.c | 15 ++++++++------- split/main.c | 13 +++++++------ 6 files changed, 39 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index da766c79..8cd6bdb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 1 23:22:19 CDT 2002 Adam Heath + + * dpkg-deb/main.c, main/main.c, main/query.c, dselect/main.cc, + split/main.c: Revert last modification. It'll be fixed properly for + dpkg 1.11. + Sat Jun 1 16:45:13 CDT 2002 Adam Heath * dpkg-deb/main.c, main/main.c, main/query.c, dselect/main.cc, diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index 030974c2..54b10618 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -43,12 +43,14 @@ const char* showformat = "${pkg:Package}\t${pkg:Version}\n"; static void printversion(void) { - if (printf(_("Debian `%s' package archive backend version %s."), BACKEND, DPKG_VERSION_ARCH) < 0) werr("stdout"); - if (printf(_("This is free software; see the GNU General Public Licence version 2 or\n" - "later for copying conditions. There is NO warranty.\n" - "See %s --licence for copyright and license details.\n"), - BACKEND) < 0) werr("stdout"); - if (fflush(stdout) < 0) werr("stdout"); + if (fputs(_("Debian `"), stdout) < 0) werr("stdout"); + if (fputs(BACKEND, stdout) < 0) werr("stdout"); + if (fputs(_("' package archive backend version "), stdout) < 0) werr("stdout"); + if (fputs(DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout"); + if (fputs(_("This is free software; see the GNU General Public Licence version 2 or\n" + "later for copying conditions. There is NO warranty.\n" + "See dpkg-deb --licence for details.\n"), + stdout) < 0) werr("stdout"); } static void usage(void) { diff --git a/dselect/main.cc b/dselect/main.cc index 492d2bed..831bfef9 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -154,12 +154,12 @@ static const char copyrightstring[]= N_( "Copyright (C) 2000,2001 Wichert Akkerman.\n" "This is free software; see the GNU General Public Licence version 2\n" "or later for copying conditions. There is NO warranty. See\n" - "%s --licence for copyright and license details.\n"); + "dselect --licence for details.\n"); static void printversion(void) { if (fprintf(stdout,gettext(programdesc),DSELECT) == EOF) werr("stdout"); if (fprintf(stdout,"\n") == EOF) werr("stdout"); - if (fprintf(stdout,gettext(copyrightstring), DPKG_VERSION_ARCH, DSELECT) == EOF) werr("stdout"); + if (fprintf(stdout,gettext(copyrightstring), DPKG_VERSION_ARCH) == EOF) werr("stdout"); } static void usage(void) { diff --git a/main/main.c b/main/main.c index f7ef3a3c..407702b9 100644 --- a/main/main.c +++ b/main/main.c @@ -41,12 +41,14 @@ #include "main.h" static void printversion(void) { - if (printf(_("Debian `%s' package management program version %s."), DPKG, DPKG_VERSION_ARCH) < 0) werr("stdout"); - if (printf(_("This is free software; see the GNU General Public Licence version 2 or\n" - "later for copying conditions. There is NO warranty.\n" - "See %s --licence for copyright and license details.\n"), - DPKG) < 0) werr("stdout"); - if (fflush(stdout) < 0) werr("stdout"); + if (fputs(_("Debian GNU/Linux `"), stdout) < 0) werr("stdout"); + if (fputs(DPKG, stdout) < 0) werr("stdout"); + if (fputs(_("' package management program version "), stdout) < 0) werr("stdout"); + if (fputs( DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout"); + if (fputs(_( "This is free software; see the GNU General Public Licence version 2 or\n" + "later for copying conditions. There is NO warranty.\n" + "See " DPKG " --licence for copyright and license details.\n"), + stdout) < 0) werr("stdout"); } /* options that need fixing: diff --git a/main/query.c b/main/query.c index 320fe769..9b8c69cb 100644 --- a/main/query.c +++ b/main/query.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include "filesdb.h" @@ -428,12 +427,14 @@ void showpackages(const char *const *argv) { } static void printversion(void) { - if (printf(_("Debian `%s' package management program query tool version %s."), DPKGQUERY, DPKG_VERSION_ARCH) < 0) werr("stdout"); - if (printf(_("This is free software; see the GNU General Public Licence version 2 or\n" - "later for copying conditions. There is NO warranty.\n" - "See %s --licence for copyright and license details.\n"), - DPKGQUERY) < 0) werr("stdout"); - if (fflush(stdout) < 0) werr("stdout"); + if (fputs(_("Debian `"), stdout) < 0) werr("stdout"); + if (fputs(DPKGQUERY, stdout) < 0) werr("stdout"); + if (fputs(_("' package management program query tool\n"), stdout) < 0) + werr("stdout"); + if (fputs(_( "This is free software; see the GNU General Public Licence version 2 or\n" + "later for copying conditions. There is NO warranty.\n" + "See " DPKGQUERY " --licence for copyright and license details.\n"), + stdout) < 0) werr("stdout"); } /* options that need fixing: diff --git a/split/main.c b/split/main.c index df447c55..0f9d77b0 100644 --- a/split/main.c +++ b/split/main.c @@ -34,12 +34,13 @@ #include "dpkg-split.h" static void printversion(void) { - if (printf(_("Debian `%s' package split/join tool; version %s."), SPLITTER, DPKG_VERSION_ARCH) < 0) werr("stdout"); - if (printf(_("This is free software; see the GNU General Public Licence version 2 or\n" - "later for copying conditions. There is NO warranty.\n" - "See %s --licence for copyright and license details.\n"), - SPLITTER) < 0) werr("stdout"); - if (fflush(stdout) < 0) werr("stdout"); + if (fputs + (_("Debian GNU/Linux `dpkg-split' package split/join tool; version "), stdout) < 0) werr ("stdout"); + if (fputs (DPKG_VERSION_ARCH ".\n", stdout) < 0) werr ("stdout"); + if (fputs (_("Copyright (C) 1994-1996 Ian Jackson. This is free software; see the\n" + "GNU General Public Licence version 2 or later for copying conditions.\n" + "There is NO warranty. See dpkg-split --licence for details.\n"), + stdout) < 0) werr("stdout"); } static void usage(void) { -- 2.39.5