Hello, I think there are still some things to be consolidated. The same with verbose output should be done in the case of install(when making dir) and in the case of rmdir. In the case of shred should be mentioned in info that verbose output is to standard error. Those things done in attached patch, should break no tests (as rmdir has no verbose test and install verbose test redirects stdout and stderr to the one file)
Greetings,
Ondrej Vasik
Jim Meyering wrote:
> Steven Schubiger <[EMAIL PROTECTED]> wrote:
> > +2008-02-01 Steven Schubiger <[EMAIL PROTECTED]>
> > +
> > + * src/mkdir.c: Send --verbose output to stdout.
> > + * src/split.c: Likewise.
> > + Update texinfo documentation for split.
> > + Adjust tests for mkdir/split.
> > + * tests/mkdir/p-v: Capture verbose output which previously was
> > + being emitted to stderr from stdout.
> > + * tests/misc/split-a: Likewise.
>
> Thanks for the patch.
> I've made some minor changes and handled the usual administrivia.
>
> mkdir, split: write --verbose output to stdout, not stderr.
>
> * src/mkdir.c (verbose_output): New function.
> (announce_mkdir): Use it.
> * src/split.c (usage): Update.
> * src/split.c (cwrite): Write to stdout, not stderr.
> * doc/coreutils.texi (split invocation): Remove the mention
> of --verbose output being printed to stderr.
> * tests/mkdir/p-v: Redirect stdout, not stderr.
> * tests/misc/split-a: Likewise.
> * NEWS: Mention this change.
> * TODO: Remove this item.
>
> Signed-off-by: Jim Meyering <[EMAIL PROTECTED]>
diff --git a/ChangeLog-2008 b/ChangeLog-2008
index aac9feb..5975e20 100644
--- a/ChangeLog-2008
+++ b/ChangeLog-2008
@@ -1,3 +1,13 @@
+2008-03-03 Ondrej Vasik <[EMAIL PROTECTED]>
+
+ rmdir, install: write --verbose output to stdout, not stderr.
+ * src/rmdir.c (main): write to stdout, not stderr
+ * src/rmdir.c (remove_parents): write to stdout, not stderr
+ * src/install.c (announce_mkdir): write to stdout, not stderr
+ * doc/coreutils.texi: mention that shred verbose output is
+ to stderr
+ * NEWS: Mention that change.
+
2008-02-07 Jim Meyering <[EMAIL PROTECTED]>
We *do* need two different version files.
diff --git a/NEWS b/NEWS
index b549513..1c9510f 100644
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,8 @@ GNU coreutils NEWS -*- outline -*-
** Consistency
- mkdir and split now write --verbose output to stdout, not stderr.
+ mkdir, split, install and rmdir now write --verbose output to stdout,
+ not stderr.
* Noteworthy changes in release 6.10 (2008-01-22) [stable]
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index df6792d..e3a0d50 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -8190,7 +8190,7 @@ If a file has multiple links, only the named links will be removed.
@itemx --verbose
@opindex -v
@opindex --verbose
-Display status updates as sterilization proceeds.
+Display to standard error all status updates as sterilization proceeds.
@item -x
@itemx --exact
diff --git a/src/install.c b/src/install.c
index db08751..b594a53 100644
--- a/src/install.c
+++ b/src/install.c
@@ -1,5 +1,5 @@
/* install - copy files and set attributes
- Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc.
+ Copyright (C) 89, 90, 91, 1995-2008 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
@@ -762,7 +762,7 @@ announce_mkdir (char const *dir, void *options)
{
struct cp_options const *x = options;
if (x->verbose)
- error (0, 0, _("creating directory %s"), quote (dir));
+ printf (_("%s: creating directory %s\n"), program_name, quote (dir));
}
/* Make ancestor directory DIR, whose last file name component is
diff --git a/src/rmdir.c b/src/rmdir.c
index bb1a0c8..abbf87f 100644
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -1,6 +1,6 @@
/* rmdir -- remove directories
- Copyright (C) 90, 91, 1995-2002, 2004, 2005, 2006, 2007 Free Software
+ Copyright (C) 90, 91, 1995-2002, 2004-2008 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -134,7 +134,7 @@ remove_parents (char *dir)
/* Give a diagnostic for each attempted removal if --verbose. */
if (verbose)
- error (0, 0, _("removing directory, %s"), quote (dir));
+ printf(_("%s: removing directory, %s\n"), program_name, quote (dir));
ok = (rmdir (dir) == 0);
@@ -233,7 +233,7 @@ main (int argc, char **argv)
/* Give a diagnostic for each attempted removal if --verbose. */
if (verbose)
- error (0, 0, _("removing directory, %s"), dir);
+ printf(_("%s: removing directory, %s\n"), program_name, dir);
if (rmdir (dir) != 0)
{
signature.asc
Description: Toto je digitálně podepsaná část zprávy
_______________________________________________ Bug-coreutils mailing list Bug-coreutils@gnu.org http://lists.gnu.org/mailman/listinfo/bug-coreutils
