summaryrefslogtreecommitdiffstats
path: root/text-utils/more.c
diff options
context:
space:
mode:
authorKarel Zak2006-12-07 00:25:49 +0100
committerKarel Zak2006-12-07 00:25:49 +0100
commite8f2641919de90b488ce3788a7795b88311750b5 (patch)
tree68f3732da38ff1b21ec49780d7c830250329fec9 /text-utils/more.c
parentImported from util-linux-2.11f tarball. (diff)
downloadkernel-qcow2-util-linux-e8f2641919de90b488ce3788a7795b88311750b5.tar.gz
kernel-qcow2-util-linux-e8f2641919de90b488ce3788a7795b88311750b5.tar.xz
kernel-qcow2-util-linux-e8f2641919de90b488ce3788a7795b88311750b5.zip
Imported from util-linux-2.11m tarball.
Diffstat (limited to 'text-utils/more.c')
-rw-r--r--text-utils/more.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/text-utils/more.c b/text-utils/more.c
index 0411b17fe..62c44006b 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -508,7 +508,7 @@ checkf (fs, clearfirst)
{
struct stat stbuf;
register FILE *f;
- char c;
+ int c;
if (stat (fs, &stbuf) == -1) {
(void)fflush(stdout);
@@ -1186,12 +1186,10 @@ int command (char *filename, register FILE *f)
xprintf ("\n");
if (clreol)
cleareol ();
- xprintf (_("...back %d page"), nlines);
- if (nlines > 1)
- pr ("s\n");
+ if (nlines != 1)
+ xprintf (_("...back %d pages"), nlines);
else
- pr ("\n");
-
+ xprintf (_("...back 1 page"));
if (clreol)
cleareol ();
pr ("\n");
@@ -1680,8 +1678,10 @@ void skipf (register int nskip)
pr ("\n");
if (clreol)
cleareol ();
- pr (_("...Skipping "));
- pr (nskip > 0 ? _("to file ") : _("back to file "));
+ if (nskip > 0)
+ pr (_("...Skipping to file "));
+ else
+ pr (_("...Skipping back to file "));
pr (fnames[fnum]);
pr ("\n");
if (clreol)