diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/df.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,5 +1,9 @@ 2007-10-27 Jim Meyering <meyering@redhat.com> + Adjust format string so msgfmt doesn't object. + * src/df.c (main): Use "%s%s" (not %smsg) to print "msg" with or + without a "Warning: " prefix. Reported by Clytie Siddall. + Clean up tests/Makefile.am. * tests/Makefile.am (EXTRA_DIST): Remove $(TESTS). No longer defined. (TESTS_ENVIRONMENT): Remove definition. @@ -938,10 +938,10 @@ main (int argc, char **argv) /* Couldn't read the table of mounted file systems. Fail if df was invoked with no file name arguments; Otherwise, merely give a warning and proceed. */ + int status = (optind < argc ? 0 : EXIT_FAILURE); const char *warning = (optind < argc ? _("Warning: ") : ""); - int status = (optind < argc ? 0 : EXIT_FAILURE); - error (status, errno, - _("%scannot read table of mounted file systems"), warning); + error (status, errno, "%s%s", warning, + _("cannot read table of mounted file systems")); } if (require_sync) |