Use m_output instead of checking printing functions return code

Cleans up the code. And as a side effect, we get rid of bogus checks
for EOF, which should have been checking for negative return values.

dpkg-deb/extract.c

@@ -207,12 +207,12 @@ void extracthalf(const char *debar, const char *directory,
       }
     }
 
-    if (admininfo >= 2)
-      if (printf(_(" new debian package, version %s.\n"
-                 " size %ld bytes: control archive= %zi bytes.\n"),
-                 versionbuf, (long)stab.st_size, ctrllennum) == EOF ||
-          fflush(stdout)) werr("stdout");
-    
+    if (admininfo >= 2) {
+      printf(_(" new debian package, version %s.\n"
+               " size %ld bytes: control archive= %zi bytes.\n"),
+             versionbuf, (long)stab.st_size, ctrllennum);
+      m_output(stdout, _("<standard output>"));
+    }
   } else if (!strncmp(versionbuf,"0.93",4) &&
              sscanf(versionbuf,"%f%c%d",&versionnum,&nlc,&dummy) == 2 &&
              nlc == '\n') {
@@ -226,13 +226,14 @@ void extracthalf(const char *debar, const char *directory,
     if (sscanf(ctrllenbuf,"%zi%c%d",&ctrllennum,&nlc,&dummy) !=2 || nlc != '\n')
       ohshit(_("archive has malformatted control length `%s'"), ctrllenbuf);
 
-    if (admininfo >= 2)
-      if (printf(_(" old debian package, version %s.\n"
-                 " size %ld bytes: control archive= %zi, main archive= %ld.\n"),
-                 versionbuf, (long)stab.st_size, ctrllennum,
-                 (long) (stab.st_size - ctrllennum - strlen(ctrllenbuf) - l)) == EOF ||
-          fflush(stdout)) werr("stdout");
-    
+    if (admininfo >= 2) {
+      printf(_(" old debian package, version %s.\n"
+               " size %ld bytes: control archive= %zi, main archive= %ld.\n"),
+             versionbuf, (long)stab.st_size, ctrllennum,
+             (long) (stab.st_size - ctrllennum - strlen(ctrllenbuf) - l));
+      m_output(stdout, _("<standard output>"));
+    }
+
     ctrlarea = m_malloc(ctrllennum);
 
     errno=0; if (fread(ctrlarea,1,ctrllennum,ar) != ctrllennum)

dpkg-deb/info.c

@@ -163,28 +163,29 @@ static void info_list(const char *debar, const char *directory) {
       if (ferror(cc)) ohshite(_("failed to read `%.255s' (in `%.255s')"),
                               cdep->d_name,directory);
       fclose(cc);
-      if (printf(_(" %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"),
-                 (long)stab.st_size, lines,
-                 S_IXUSR & stab.st_mode ? '*' : ' ',
-                 cdep->d_name, interpreter) == EOF)
-        werr("stdout");
+      printf(_(" %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"),
+             (long)stab.st_size, lines, S_IXUSR & stab.st_mode ? '*' : ' ',
+             cdep->d_name, interpreter);
     } else {
-      if (printf(_("     not a plain file          %.255s\n"),cdep->d_name) == EOF)
-        werr("stdout");
+      printf(_("     not a plain file          %.255s\n"), cdep->d_name);
     }
   }
   if (!(cc= fopen("control","r"))) {
     if (errno != ENOENT) ohshite(_("failed to read `control' (in `%.255s')"),directory);
-    if (fputs(_("(no `control' file in control archive!)\n"),stdout) < 0) werr("stdout");
+    fputs(_("(no `control' file in control archive!)\n"), stdout);
   } else {
     lines= 1;
     while ((c= getc(cc))!= EOF) {
-      if (lines) if (putc(' ',stdout) == EOF) werr("stdout");
-      if (putc(c,stdout) == EOF) werr("stdout");
+      if (lines)
+        putc(' ', stdout);
+      putc(c, stdout);
       lines= c=='\n';
     }
-    if (!lines) if (putc('\n',stdout) == EOF) werr("stdout");
+    if (!lines)
+      putc('\n', stdout);
   }
+
+  m_output(stdout, _("<standard output>"));
 }
 
 static void info_field(const char *debar, const char *directory,

dpkg-deb/main.c

@@ -53,22 +53,24 @@ const char* showformat	= "${Package}\t${Version}\n";
 void
 printversion(void)
 {
-  if (printf(_("Debian `%s' package archive backend version %s.\n"),
-	     BACKEND, DPKG_VERSION_ARCH) < 0) werr("stdout");
-  if (printf(_("This is free software; see the GNU General Public License version 2 or\n"
-	       "later for copying conditions. There is NO warranty.\n"
-	       "See %s --license for copyright and license details.\n"),
-	     BACKEND) < 0) werr("stdout");
+  printf(_("Debian `%s' package archive backend version %s.\n"),
+         BACKEND, DPKG_VERSION_ARCH);
+  printf(_(
+"This is free software; see the GNU General Public License version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+"See %s --license for copyright and license details.\n"), BACKEND);
+
+  m_output(stdout, _("<standard output>"));
 }
 
 void
 usage(void)
 {
-  if (printf(_(
+  printf(_(
 "Usage: %s [<option> ...] <command>\n"
-"\n"), BACKEND) < 0) werr("stdout");
+"\n"), BACKEND);
 
-  if (printf(_(
+  printf(_(
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
 "  -c|--contents <deb>              List contents.\n"
@@ -79,21 +81,21 @@ usage(void)
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "  -h|--help                        Show this help message.\n"
 "  --version                        Show the version.\n"
 "  --license|--licence              Show the copyright licensing terms.\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "<deb> is the filename of a Debian format archive.\n"
 "<cfile> is the name of an administrative file component.\n"
 "<cfield> is the name of a field in the main `control' file.\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
 "  -D                               Enable debugging output.\n"
@@ -103,23 +105,24 @@ usage(void)
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when building.\n"
 "                                     Allowed values: gzip, bzip2, lzma, none.\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
 "  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
 "  by inserting variable references to package fields using the ${var[;width]}\n"
 "  syntax. Fields will be right-aligned unless the width is negative in which\n"
-"  case left alignment will be used.\n")) < 0) werr("stdout");
+"  case left alignment will be used.\n"));
 
-  if (printf(_(
+  printf(_(
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
 "`dselect' or `aptitude' for user-friendly package management.  Packages\n"
-"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n")) < 0)
-    werr("stdout");
+"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"));
+
+  m_output(stdout, _("<standard output>"));
 }
 
 const char thisname[]= BACKEND;

dpkg-split/main.c

@@ -45,23 +45,25 @@
 void
 printversion(void)
 {
-  if (printf(_("Debian `%s' package split/join tool; version %s.\n"),
-	     SPLITTER, DPKG_VERSION_ARCH) < 0) werr ("stdout");
-  if (printf(_("Copyright (C) 1994-1996 Ian Jackson.\n")) < 0) werr ("stdout");
-  if (printf(_("This is free software; see the GNU General Public License version 2 or\n"
-	       "later for copying conditions. There is NO warranty.\n"
-	       "See %s --license for copyright and license details.\n"),
-	     SPLITTER) < 0) werr("stdout");
+  printf(_("Debian `%s' package split/join tool; version %s.\n"),
+         SPLITTER, DPKG_VERSION_ARCH);
+  printf(_("Copyright (C) 1994-1996 Ian Jackson.\n"));
+  printf(_(
+"This is free software; see the GNU General Public License version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+"See %s --license for copyright and license details.\n"), SPLITTER);
+
+  m_output(stdout, _("<standard output>"));
 }
 
 void
 usage(void)
 {
-  if (printf(_(
+  printf(_(
 "Usage: %s [<option> ...] <command>\n"
-"\n"), SPLITTER) < 0) werr("stdout");
+"\n"), SPLITTER);
 
-  if (printf(_(
+  printf(_(
 "Commands:\n"
 "  -s|--split <file> [<prefix>]     Split an archive.\n"
 "  -j|--join <part> <part> ...      Join parts together.\n"
@@ -69,15 +71,15 @@ usage(void)
 "  -a|--auto -o <complete> <part>   Auto-accumulate parts.\n"
 "  -l|--listq                       List unmatched pieces.\n"
 "  -d|--discard [<filename> ...]    Discard unmatched pieces.\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "  -h|--help                        Show this help message.\n"
 "  --version                        Show the version.\n"
 "  --license|--licence              Show the copyright licensing terms.\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
@@ -86,7 +88,9 @@ usage(void)
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
 "Exit status: 0 = OK;  1 = -a is not a part;  2 = trouble!\n"),
-	     ADMINDIR, PARTSDIR) < 0) werr("stdout");
+         ADMINDIR, PARTSDIR);
+
+  m_output(stdout, _("<standard output>"));
 }
 
 const char thisname[]= SPLITTER;

dselect/main.cc

@@ -169,54 +169,58 @@ static const char licensestring[]= N_(
 void
 printversion(void)
 {
-  if (printf(gettext(programdesc), DSELECT, DPKG_VERSION_ARCH) < 0)
-    werr("stdout");
-  if (printf(gettext(copyrightstring)) < 0) werr("stdout");
-  if (printf(gettext(licensestring), DSELECT) < 0) werr("stdout");
+  printf(gettext(programdesc), DSELECT, DPKG_VERSION_ARCH);
+  printf(gettext(copyrightstring));
+  printf(gettext(licensestring), DSELECT);
+
+  m_output(stdout, _("<standard output>"));
 }
 
 void
 usage(void)
 {
   int i;
-  if (printf(_(
+
+  printf(_(
 "Usage: %s [<option> ...] [<action> ...]\n"
-"\n"), DSELECT) < 0) werr("stdout");
+"\n"), DSELECT);
 
-  if (printf(_(
+  printf(_(
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
 "  --expert                   Turn on expert mode.\n"
 "  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
 "  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
 "                             Configure screen colours.\n"
-"\n"), ADMINDIR) < 0) werr("stdout");
+"\n"), ADMINDIR);
 
-  if (printf(_(
+  printf(_(
 "  --help                     Show this help message.\n"
 "  --version                  Show the version.\n"
 "  --license | --licence      Show the license.\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "Actions:\n"
 "  access update select install config remove quit\n"
-"\n")) < 0) werr("stdout");
+"\n"));
 
   printf(_("Screenparts:\n"));
   for (i=0; screenparttable[i].name; i++)
     printf("  %s", screenparttable[i].name);
-  if (!fputs("\n\n", stdout)) werr("stdout");
+  fputs("\n\n", stdout);
 
   printf(_("Colours:\n"));
   for (i=0; colourtable[i].name; i++)
     printf("  %s", colourtable[i].name);
-  if (!fputs("\n\n", stdout)) werr("stdout");
+  fputs("\n\n", stdout);
 
   printf(_("Attributes:\n"));
   for (i=0; attrtable[i].name; i++)
     printf("  %s", attrtable[i].name);
-  if (!fputs("\n\n", stdout)) werr("stdout");
+  fputs("\n\n", stdout);
+
+  m_output(stdout, _("<standard output>"));
 }
 
 /* These are called by C code, so need to have C calling convention */

src/enquiry.c

@@ -385,7 +385,7 @@ void printarch(const char *const *argv) {
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  if (printf("%s\n",architecture) == EOF) werr("stdout");
+  printf("%s\n", architecture);
 
   m_output(stdout, _("<standard output>"));
 }
@@ -444,8 +444,7 @@ void cmpversions(const char *const *argv) {
   if (*argv[0] && strcmp(argv[0],"<unknown>")) {
     emsg= parseversion(&a,argv[0]);
     if (emsg) {
-      if (printf(_("dpkg: version '%s' has bad syntax: %s\n"), argv[0], emsg) == EOF)
-        werr("stdout");
+      printf(_("dpkg: version '%s' has bad syntax: %s\n"), argv[0], emsg);
       m_output(stdout, _("<standard output>"));
       exit(1);
     }
@@ -455,8 +454,7 @@ void cmpversions(const char *const *argv) {
   if (*argv[2] && strcmp(argv[2],"<unknown>")) {
     emsg= parseversion(&b,argv[2]);
     if (emsg) {
-      if (printf(_("dpkg: version '%s' has bad syntax: %s\n"), argv[2], emsg) == EOF)
-        werr("stdout");
+      printf(_("dpkg: version '%s' has bad syntax: %s\n"), argv[2], emsg);
       m_output(stdout, _("<standard output>"));
       exit(1);
     }

src/main.c

@@ -53,12 +53,14 @@
 void
 printversion(void)
 {
-  if (printf(_("Debian `%s' package management program version %s.\n"),
-	     DPKG, DPKG_VERSION_ARCH) < 0) werr("stdout");
-  if (printf(_("This is free software; see the GNU General Public License version 2 or\n"
-	       "later for copying conditions. There is NO warranty.\n"
-	       "See %s --license for copyright and license details.\n"),
-	     DPKG) < 0) werr("stdout");
+  printf(_("Debian `%s' package management program version %s.\n"),
+         DPKG, DPKG_VERSION_ARCH);
+  printf(_(
+"This is free software; see the GNU General Public License version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+"See %s --license for copyright and license details.\n"), DPKG);
+
+  m_output(stdout, _("<standard output>"));
 }
 /*
    options that need fixing:
@@ -67,11 +69,11 @@ printversion(void)
 void
 usage(void)
 {
-  if (fprintf (stdout, _(
+  printf(_(
 "Usage: %s [<option> ...] <command>\n"
-"\n"), DPKG) < 0) werr ("stdout");
+"\n"), DPKG);
 
-  if (fprintf (stdout, _(
+  printf(_(
 "Commands:\n"
 "  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
 "  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
@@ -97,25 +99,25 @@ usage(void)
 "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
 "  --force-help                     Show help on forcing.\n"
 "  -Dh|--debug=help                 Show help on debugging.\n"
-"\n")) < 0) werr ("stdout");
+"\n"));
 
-  if (fprintf (stdout, _(
+  printf(_(
 "  -h|--help                        Show this help message.\n"
 "  --version                        Show the version.\n"
 "  --license|--licence              Show the copyright licensing terms.\n"
-"\n")) < 0) werr ("stdout");
+"\n"));
 
-  if (fprintf (stdout, _(
+  printf(_(
 "Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help).\n"
-"\n"), BACKEND) < 0) werr ("stdout");
+"\n"), BACKEND);
 
-  if (fprintf (stdout, _(
+  printf(_(
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
 "  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep.\n"
-"\n")) < 0) werr ("stdout");
+"\n"));
 
-  if (fprintf (stdout, _(
+  printf(_(
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
@@ -137,18 +139,19 @@ usage(void)
 "  --no-force-...|--refuse-...\n"
 "                             Stop when problems encountered.\n"
 "  --abort-after <n>          Abort after encountering <n> errors.\n"
-"\n"), ADMINDIR) < 0) werr ("stdout");
+"\n"), ADMINDIR);
 
-  if (fprintf (stdout, _(
+  printf(_(
 "Comparison operators for --compare-versions are:\n"
 "  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 "  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
-"\n")) < 0) werr ("stdout");
+"\n"));
 
-  if (fprintf (stdout, _(
-"Use `dselect' or `aptitude' for user-friendly package management.\n")) < 0)
-  werr ("stdout");
+  printf(_(
+"Use `dselect' or `aptitude' for user-friendly package management.\n"));
+
+  m_output(stdout, _("<standard output>"));
 }
 
 const char thisname[]= "dpkg";
@@ -223,7 +226,7 @@ static void setdebug(const struct cmdinfo *cpi, const char *value) {
   char *endp;
 
   if (*value == 'h') {
-    if (printf(_(
+    printf(_(
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
 "\n"
 " number  ref. in source   description\n"
@@ -242,8 +245,8 @@ static void setdebug(const struct cmdinfo *cpi, const char *value) {
 "   2000   stupidlyverbose   Insane amounts of drivel\n"
 "\n"
 "Debugging options are be mixed using bitwise-or.\n"
-"Note that the meanings and values are subject to change.\n"),
-             DPKG) < 0) werr("stdout");
+"Note that the meanings and values are subject to change.\n"), DPKG);
+    m_output(stdout, _("<standard output>"));
     exit(0);
   }
   
@@ -378,7 +381,7 @@ static void setforce(const struct cmdinfo *cip, const char *value) {
   const struct forceinfo *fip;
 
   if (!strcmp(value,"help")) {
-    if (printf(_(
+    printf(_(
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
 "  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
@@ -409,8 +412,8 @@ static void setforce(const struct cmdinfo *cip, const char *value) {
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
 "WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"),
-               DPKG) < 0) werr("stdout");
+"Forcing options marked [*] are enabled by default.\n"), DPKG);
+    m_output(stdout, _("<standard output>"));
     exit(0);
   }
 

src/query.c

@@ -439,22 +439,23 @@ void showpackages(const char *const *argv) {
 void
 printversion(void)
 {
-  if (printf(_("Debian `%s' package management program query tool\n"),
-	     DPKGQUERY) < 0) werr("stdout");
-  if (printf(_("This is free software; see the GNU General Public License version 2 or\n"
-	       "later for copying conditions. There is NO warranty.\n"
-	       "See %s --license for copyright and license details.\n"),
-	     DPKGQUERY) < 0) werr("stdout");
+  printf(_("Debian `%s' package management program query tool\n"), DPKGQUERY);
+  printf(_(
+"This is free software; see the GNU General Public License version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+"See %s --license for copyright and license details.\n"), DPKGQUERY);
+
+  m_output(stdout, _("<standard output>"));
 }
 
 void
 usage(void)
 {
-  if (printf(_(
+  printf(_(
 "Usage: %s [<option> ...] <command>\n"
-"\n"), DPKGQUERY) < 0) werr ("stdout");
+"\n"), DPKGQUERY);
 
-  if (printf(_(
+  printf(_(
 "Commands:\n"
 "  -s|--status <package> ...        Display package status details.\n"
 "  -p|--print-avail <package> ...   Display available version details.\n"
@@ -462,28 +463,30 @@ usage(void)
 "  -l|--list [<pattern> ...]        List packages concisely.\n"
 "  -W|--show <pattern> ...          Show information on package(s).\n"
 "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"\n")) < 0) werr ("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "  -h|--help                        Show this help message.\n"
 "  --version                        Show the version.\n"
 "  --license|--licence              Show the copyright licensing terms.\n"
-"\n")) < 0) werr ("stdout");
+"\n"));
 
-  if (printf(_(
+  printf(_(
 "Options:\n"
 "  --admindir=<directory>           Use <directory> instead of %s.\n"
 "  -f|--showformat=<format>         Use alternative format for --show.\n"
-"\n"), ADMINDIR) < 0) werr ("stdout");
+"\n"), ADMINDIR);
 
-  if (printf(_(
+  printf(_(
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
 "  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
 "  by inserting variable references to package fields using the ${var[;width]}\n"
 "  syntax. Fields will be right-aligned unless the width is negative in which\n"
-"  case left alignment will be used.\n")) < 0) werr ("stdout");
+"  case left alignment will be used.\n"));
+
+  m_output(stdout, _("<standard output>"));
 }
 
 const char thisname[]= "dpkg-query";

src/trigcmd.c

@@ -75,47 +75,45 @@ const char printforhelp[] = N_(
 void
 printversion(void)
 {
-	if (printf(_("Debian %s package trigger utility.\n"), thisname) < 0)
-		werr("stdout");
+	printf(_("Debian %s package trigger utility.\n"), thisname);
 
-	if (printf(_(
+	printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
-"See %s --license for copyright and license details.\n"), thisname) < 0)
-		werr("stdout");
+"See %s --license for copyright and license details.\n"), thisname);
+
+	m_output(stdout, _("<standard output>"));
 }
 
 void
 usage(void)
 {
-	if (printf(_(
+	printf(_(
 "Usage: %s [<options> ...] <trigger-name>\n"
 "       %s [<options> ...] <command>\n"
-"\n"), thisname, thisname) < 0)
-		werr ("stdout");
+"\n"), thisname, thisname);
 
-	if (printf(_(
+	printf(_(
 "Commands:\n"
 "  --check-supported                Check if the running dpkg supports triggers.\n"
-"\n")) < 0)
-		werr ("stdout");
+"\n"));
 
-	if (printf(_(
+	printf(_(
 "  -h|--help                        Show this help message.\n"
 "  --version                        Show the version.\n"
 "  --license|--licence              Show the copyright licensing terms.\n"
-"\n")) < 0)
-		werr ("stdout");
+"\n"));
 
-	if (printf(_(
+	printf(_(
 "Options:\n"
 "  --admindir=<directory>           Use <directory> instead of %s.\n"
 "  --by-package=<package>           Override trigger awaiter (normally set\n"
 "                                     by dpkg).\n"
 "  --no-await                       No package needs to await the processing.\n"
 "  --no-act                         Just test - don't actually change anything.\n"
-"\n"), admindir) < 0)
-		werr("stdout");
+"\n"), admindir);
+
+	m_output(stdout, _("<standard output>"));
 }
 
 static int done_trig, ctrig;