diff options
| author | Karel Zak | 2006-12-07 00:26:02 +0100 |
|---|---|---|
| committer | Karel Zak | 2006-12-07 00:26:02 +0100 |
| commit | 0e6f4a203d8715710ff09683390be2897cca3804 (patch) | |
| tree | 982a4e50be23b6c30245c61bfed170c592b34e41 /text-utils | |
| parent | Imported from util-linux-2.11u tarball. (diff) | |
| download | kernel-qcow2-util-linux-0e6f4a203d8715710ff09683390be2897cca3804.tar.gz kernel-qcow2-util-linux-0e6f4a203d8715710ff09683390be2897cca3804.tar.xz kernel-qcow2-util-linux-0e6f4a203d8715710ff09683390be2897cca3804.zip | |
Imported from util-linux-2.11v tarball.
Diffstat (limited to 'text-utils')
| -rw-r--r-- | text-utils/more.c | 7 | ||||
| -rw-r--r-- | text-utils/pg.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/text-utils/more.c b/text-utils/more.c index 8a5640a43..452e4ff89 100644 --- a/text-utils/more.c +++ b/text-utils/more.c @@ -1311,11 +1311,10 @@ int command (char *filename, register FILE *f) xprintf ("\n"); if (clreol) cleareol (); - xprintf (_("...skipping %d line"), nlines); - if (nlines > 1) - pr ("s\n"); + if (nlines == 1) + xprintf (_("...skipping one line")); else - pr ("\n"); + xprintf (_("...skipping %d lines"), nlines); if (clreol) cleareol (); diff --git a/text-utils/pg.c b/text-utils/pg.c index 57290756c..177138389 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -173,10 +173,17 @@ See pg(1) for more information.\n\ -------------------------------------------------------\n"; #ifdef HAVE_fseeko +#if defined (_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS) == 64 + extern int fseeko64(FILE *f, off_t off, int whence); + extern off_t ftello64(FILE *f); + #define my_fseeko fseeko64 + #define my_ftello ftello64 +#else extern int fseeko(FILE *f, off_t off, int whence); extern off_t ftello(FILE *f); #define my_fseeko fseeko #define my_ftello ftello +#endif #else static int my_fseeko(FILE *f, off_t off, int whence) { return fseek(f, (long) off, whence); |