kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

pager(1) now supports reading from stdin.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2012-03-07 21:06:29 +01:00
parent cde10097e6
commit 9ed2031dd2
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
utils/pager.cpp
View file

@ -8,9 +8,28 @@
#include <errno.h> #include <errno.h>
#include <error.h> #include <error.h>
char* stdinargv[2];
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
if ( argc < 2 ) { printf("usage: %s [FILE] ...\n", argv[0]); return 0; } if ( isatty(0) && argc < 2 )
{
printf("usage: %s [FILE] ...\n", argv[0]);
return 0;
}
if ( !isatty(0) && argc < 2 )
{
stdinargv[0] = argv[0];
stdinargv[1] = (char*) "-";
argv = stdinargv;
argc = 2;
}
int stdinfd = dup(0);
close(0);
int ttyfd = open("/dev/tty", O_RDONLY);
if ( ttyfd != 0 ) { perror("/dev/tty"); return 1; }
const int HEIGHT = 25; const int HEIGHT = 25;
const int WIDTH = 80; const int WIDTH = 80;
int linesleft = HEIGHT-1; int linesleft = HEIGHT-1;
@ -18,7 +37,7 @@ int main(int argc, char* argv[])
size_t charleft = WIDTH; size_t charleft = WIDTH;
for ( int i = 1; i < argc; i++ ) for ( int i = 1; i < argc; i++ )
{ {
int fd = ( strcmp(argv[i], "-") == 0 ) ? 0 : open(argv[i], O_RDONLY); int fd = ( strcmp(argv[i], "-") == 0 ) ? stdinfd : open(argv[i], O_RDONLY);
if ( fd < 0 ) { result = 1; perror(argv[i]); continue; } if ( fd < 0 ) { result = 1; perror(argv[i]); continue; }
const size_t BUFFER_SIZE = 4096; const size_t BUFFER_SIZE = 4096;
char buffer[BUFFER_SIZE]; char buffer[BUFFER_SIZE];
@ -68,7 +87,7 @@ int main(int argc, char* argv[])
if ( c == '\t' ) { charleft &= ~(4-1); } if ( c == '\t' ) { charleft &= ~(4-1); }
} }
} }
if ( fd != 0 ) { close(fd); } if ( fd != stdinfd ) { close(fd); }
} }
return result; return result;
} }