Compare commits

...

34 Commits
v0.7.3 ... main

Author SHA1 Message Date
6e577f1906 Simplify README.md
All checks were successful
Build / build (push) Successful in 39s
2023-08-24 16:42:59 -04:00
925ba68c3c Add auto-pager 2023-06-09 13:56:16 -04:00
Shav Kinderlehrer
1577a74d58 Backseat -e
Will do later if determined to be worth it
2023-05-18 10:02:21 -04:00
Shav Kinderlehrer
ecd9879655 Revert extension 2023-05-18 10:01:14 -04:00
Shav Kinderlehrer
fa8e81e288 Prep for new extension system 2023-05-18 08:51:12 -04:00
ef68f9c378 Revert extension 2023-05-04 09:59:52 -04:00
4618e66f55 Add extension exec scaffolding 2023-05-03 09:22:02 -04:00
0e157084ea Update README
- More correct
2023-05-02 09:38:25 -04:00
6b227ba908 Cleanup 2023-05-01 18:47:37 -04:00
7f18ff6773 Fix typo 2023-05-01 18:43:20 -04:00
36c5d3f68a Update README 2023-05-01 18:39:27 -04:00
e4f517c020 Start implementing -e
- extensions
2023-05-01 18:13:13 -04:00
0f9a68c578 Refactor codebase 2023-05-01 18:13:13 -04:00
1c90bf55b1 Fix memory leak and NULL-check error 2023-05-01 18:07:53 -04:00
36af47eab8 Cleanup
- Cleanup unneeded headers
- Fix helptext typos/bugs
- add noreturn to die(), and equiv
2023-04-26 18:05:13 -04:00
cf740c34c3 Bump version 2023-04-22 15:37:13 -04:00
51588e455b Update README
- QOL for *.tape files
2023-04-22 15:33:08 -04:00
b7b16197f9 Move to getopt
- everything is single-letter now
2023-04-20 20:31:21 -04:00
efd1d76428 Socials 2023-04-20 13:45:57 -04:00
cc842efe0b Create c-cpp.yml 2023-04-20 13:35:55 -04:00
2c0eb3aff1 Add social 2023-04-20 10:33:28 -04:00
576b1389c8 Argparsing bug hotfix 2023-04-20 10:31:56 -04:00
bc06589fb3 Helptext spelling hotfix 2023-04-20 00:51:09 -04:00
83929dd8aa Add args
- --literal
- fix outputting format for less and piped output (finally)
2023-04-19 22:30:55 -04:00
c713312b22 Check stdin for binary too 2023-04-19 13:28:06 -04:00
219075499f Fix --help grammar 2023-04-19 12:43:54 -04:00
23ede20d7c Add args
- --pager
2023-04-19 10:49:26 -04:00
e586f29e6d Revise --binary functionality 2023-04-18 08:58:23 -04:00
0e1183a62c Update help message
- add usage
- add env
- add description
2023-04-18 00:00:40 -04:00
0247ecc2a1 Fix long args bug 2023-04-17 22:11:59 -04:00
b60ecd747b Add args
- --headers
2023-04-17 22:04:03 -04:00
f8bdf764b2 Update version message 2023-04-17 21:55:08 -04:00
2abab7c9e8 Add args
- --binary
2023-04-17 21:13:20 -04:00
f853dabe7f Fix stdin support 2023-04-17 18:40:17 -04:00
21 changed files with 692 additions and 137 deletions

21
.github/workflows/c-cpp.yml vendored Normal file
View File

@ -0,0 +1,21 @@
name: Build
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: prep
run: make prep
- name: make
run: make
- name: test
run: ./build/lat -V

1
.gitignore vendored
View File

@ -130,4 +130,3 @@ $RECYCLE.BIN/
*.lnk *.lnk
# End of https://www.toptal.com/developers/gitignore/api/c,macos,windows,linux,c # End of https://www.toptal.com/developers/gitignore/api/c,macos,windows,linux,c

23
LICENSE Normal file
View File

@ -0,0 +1,23 @@
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

View File

@ -6,7 +6,11 @@ ODIR:=obj
BINDIR:=build BINDIR:=build
CC:=cc CC:=cc
CFLAGS:=-I$(IDIR) -Wall -Wextra -pedantic -Ofast # OMG SO FAST (see https://www.shlomifish.org/humour/by-others/funroll-loops/Gentoo-is-Rice.html)
# CFLAGS:=-I$(IDIR) -Wall -Wextra -pedantic -Ofast -faggressive-loop-optimizations -funroll-all-loops -march=native
# For a stable experience
CFLAGS:=-I$(IDIR) -Wall -Wextra -pedantic -O2 -march=native
LIB:= LIB:=
DEPS:=$($(IDIR)/%.h) DEPS:=$($(IDIR)/%.h)
@ -30,7 +34,6 @@ prep:
-@mkdir -p $(IDIR) -@mkdir -p $(IDIR)
-@mkdir -p $(ODIR) -@mkdir -p $(ODIR)
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)
@echo $(BINDIR)/ >> .gitignore
.PHONY: clean .PHONY: clean
clean: clean:

47
README.md Normal file
View File

@ -0,0 +1,47 @@
# lat
> lat | lazy cat - a cat clone with some quality-of-life embellishments
## About
`lat` is a solution to a problem that doesn't exist. It's the awkward middle child in-between `cat` and `bat`. It was created because the author didn't want to have to configure `bat` just to get decent file printing, but wanted a little more control than `cat` offered.
`lat` does not expect to be used. `lat` expects to be forgotten and shunted into a corner because it does not belong in the slightest.
## Install
`lat` is not yet at a stable version (`v1.0.0`), so it is not on any package managers.
```bash
git clone https://github.com/secondary-smiles/lat.git
cd lat
make
./build/lat -V
# now add lat to your $PATH/do whatever you want with the binary
```
## Helptext
> `lat -h`
```text
lat | lazy cat - a cat clone with some quality-of-life embellishments
usage: lat [-cltbrpneVh] [file...]
options:
-c toggle color
-l toggle line numbers
-t toggle file info headers
-b set binary mode, -b forces binary and -bb forces NOT binary
-r print everything (headers, line numbers, etc.) to stdout (or equivalent)
-p print file with the pager (uses less)
-n <name> manually set the name of the file shown in the title
-e <program> link extension to lat
-V show program version
-h display this help text
environment:
NO_COLOR, see https://no-color.org/
```

View File

@ -2,12 +2,19 @@
#define ARG_H #define ARG_H
#include <stdbool.h> #include <stdbool.h>
#define LAT_VERSION "0.4.0" #define LAT_VERSION "0.13.0"
struct config { struct config {
bool isstdin;
bool process; bool process;
bool color; bool color;
bool lines; bool lines;
bool headers;
int force_binary;
bool literal;
bool pager;
char *name;
char *extension;
bool has_read_stdin; bool has_read_stdin;
}; };

View File

@ -1,7 +1,8 @@
#ifndef FILE_H #ifndef FILE_H
#define FILE_H #define FILE_H
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
struct filedata readfile(FILE *fp); struct filedata readfile(FILE *fp, bool isstdin);
#endif #endif

54
social/binary.tape Normal file
View File

@ -0,0 +1,54 @@
Require lat
Output social/render/binary.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "lat src/main.c"
Sleep 2s
Enter
Sleep 5s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat -b src/main.c"
Sleep 2s
Enter
Sleep 5s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat ./build/lat"
Sleep 2s
Enter
Sleep 5s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat -bb ./build/lat"
Sleep 2s
Enter
Sleep 5s

31
social/color.tape Normal file
View File

@ -0,0 +1,31 @@
Require lat
Output social/render/color.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "lat src/main.c"
Sleep 2s
Enter
Sleep 5s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat -c src/main.c"
Sleep 2s
Enter
Sleep 5s

41
social/fzf_embed.tape Normal file
View File

@ -0,0 +1,41 @@
Require lat
Output social/render/fzf_embed.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "fzf --preview 'lat -r {}'"
Sleep 1s
Enter
Sleep 2s
Type "main.c"
Sleep 2s
Backspace 7
Sleep 1s
Type "types.h"
Sleep 1s
Backspace 8
Sleep 2s
Type "file.c"
Sleep 3s
Backspace 7
Sleep 2s
Up@3s 15
Sleep 3s
Enter
Sleep 2s

32
social/headers.tape Normal file
View File

@ -0,0 +1,32 @@
Require lat
Output social/render/headers.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "lat src/main.c"
Sleep 2s
Enter
Sleep 5s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat -t src/main.c"
Sleep 2s
Enter
Sleep 5s

24
social/lat_demo.tape Normal file
View File

@ -0,0 +1,24 @@
Require lat
Output social/render/lat_demo.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 2000
Set TypingSpeed 0.2
Type "lat Makefile"
Sleep 2s
Enter
Sleep 4s
Type "lat -h"
Sleep 2s
Enter
Sleep 4s

30
social/line_numbers.tape Normal file
View File

@ -0,0 +1,30 @@
Require lat
Output social/render/line_numbers.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "lat src/main.c"
Sleep 2s
Enter
Sleep 4s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat -n src/main.c"
Sleep 2s
Enter
Sleep 4s

46
social/literal.tape Normal file
View File

@ -0,0 +1,46 @@
Require lat
Output social/render/literal.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "lat src/main.c > example.c"
Sleep 2s
Enter
Sleep 5s
Type "cat example.c"
Sleep 2s
Enter
Sleep 5s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat -r src/main.c > example.c"
Sleep 2s
Enter
Sleep 3s
Type "cat example.c"
Sleep 2s
Enter
Sleep 5s
Hide
Type "rm example.c"
Enter

37
social/name.tape Normal file
View File

@ -0,0 +1,37 @@
Require lat
Output social/render/name.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "lat"
Sleep 2s
Enter
Type "hello, world!"
Enter
Sleep 3s
Ctrl+d
Sleep 3s
Type "lat -n "custom name" src/main.c"
Sleep 2s
Enter
Type "hello, world!"
Enter
Sleep 3s
Ctrl+d
Sleep 4s

40
social/pager.tape Normal file
View File

@ -0,0 +1,40 @@
Require lat
Output social/render/pager.gif
Set Theme "Gruvbox Dark"
Set WindowBar Rings
Set BorderRadius 10
Set Margin 10
Set FontSize 32
Set Width 2400
Set Height 1200
Set TypingSpeed 0.2
Type "lat src/main.c"
Sleep 2s
Enter
Sleep 5s
Type "clear"
Sleep 1s
Enter
Sleep 2s
Type "lat -p src/main.c"
Sleep 2s
Enter
Sleep 5s
Down 100
Sleep 3s
Type "q"
Sleep 4s

View File

@ -1,109 +1,93 @@
#include "arg.h"
#include "util.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <stdnoreturn.h>
#include <sys/ioctl.h>
#include <unistd.h>
#define LAT_USAGE "usage: lat [-cnVh] [files..]" #include "arg.h"
#include "util.h"
#define LAT_SHORT_ARGS "cltbrpn:e:Vh"
#define LAT_USAGE "usage: lat [-cltbrpneVh] [file...]"
struct config conf;
void help(void) { void help(void) {
printf("%s\n", LAT_USAGE); printf("lat | lazy cat - a cat clone with some quality-of-life "
"embellishments\n\n");
printf("%s\n\n", LAT_USAGE);
printf("options:\n" printf("options:\n"
"\t-c, --color\t toggle whether to print color or not\n" "\t-c toggle color\n"
"\t-n, --lines\t toggle whether to print line numbers or not\n" "\t-l toggle line numbers\n"
"\t-V, --version\t show program version\n" "\t-t toggle file info headers\n"
"\t-h, --help\t display this help text\n"); "\t-b set binary mode, -b forces binary and -bb forces NOT "
"binary\n"
"\t-r print everything (headers, line numbers, etc.) to "
"stdout (or equivalent)\n"
"\t-p disable or enable pager (uses less)\n"
"\t-n <name> manually set the name of the file shown in the title\n"
// "\t-e <program> NONFUNCTIONAL (will be added soon) link extension
// to lat\n"
"\t-V show program version\n"
"\t-h display this help text\n\n");
printf("environment:\n"
"\tNO_COLOR, see https://no-color.org/\n");
} }
void version(void) { void version(void) {
printf("lat - v%s | %s:%s\n", LAT_VERSION, __DATE__, __TIME__); printf("lat - v%s built %s at %s\n", LAT_VERSION, __DATE__, __TIME__);
} }
struct config conf; noreturn void argerr(void) {
void argerr(char *r, char *arg) { printf("\n%s\n", LAT_USAGE);
printf("lat: %s '%s'\n", r, arg); printf("run '-h' for more information\n");
printf("%s\n", LAT_USAGE);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
void parselongarg(char *arg) { int parseargs(int argc, char *argv[]) {
if (strcmp(arg, "--color") == 0) { char opt;
conf.color = !conf.color; while ((opt = getopt(argc, argv, LAT_SHORT_ARGS)) != -1) {
return; switch (opt) {
}
if (strcmp(arg, "--lines") == 0) {
conf.lines = !conf.lines;
return;
}
if (strcmp(arg, "--help") == 0) {
help();
exit(EXIT_SUCCESS);
return;
}
if (strcmp(arg, "--version") == 0) {
version();
exit(EXIT_SUCCESS);
return;
}
argerr("unrecognized arg", arg);
}
void parseshortarg(char *arg) {
size_t i = 1;
while (arg[i] != '\0') {
char c = arg[i];
switch (c) {
case 'c': case 'c':
conf.color = !conf.color; conf.color = !conf.color;
break; break;
case 'n': case 'l':
conf.lines = !conf.lines; conf.lines = !conf.lines;
break; break;
case 'h': case 't':
help(); conf.headers = !conf.headers;
exit(EXIT_SUCCESS); break;
case 'b':
if (conf.force_binary < 0)
conf.force_binary = 1;
else
conf.force_binary = !conf.force_binary;
break;
case 'r':
conf.literal = !conf.literal;
break;
case 'p':
conf.pager = !conf.pager;
break;
case 'n':
conf.name = optarg;
break;
case 'e':
conf.extension = optarg;
break; break;
case 'V': case 'V':
version(); version();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
default: { case 'h':
char *str = malloc(2); help();
str[0] = c; exit(EXIT_SUCCESS);
str[1] = '\0'; break;
argerr("unrecognized flag", str); default:
free(str); argerr();
break; break;
} }
}
i++;
} }
} return optind;
int parseargs(int argc, char *argv[]) {
int i;
for (i = 1; i < argc; i++) { // offset for argv[0]
char *arg = argv[i];
if (arg[0] == '-' && arg[1] == '\0') {
return i;
}
if (arg[0] == '-') {
if (arg[1] == '-') {
parselongarg(arg);
continue;
}
parseshortarg(arg);
} else {
return i;
}
}
return i;
} }

View File

@ -4,6 +4,24 @@
#include "types.h" #include "types.h"
#include "util.h" #include "util.h"
#include "arg.h"
bool isbinary(struct filedata *f) {
// guess if printable
// from https://github.com/sharkdp/content_inspector/blob/master/src/lib.rs
int testlen = f->buflen >= 64 ? 64 : f->buflen;
char *testbuf[testlen];
memcpy(testbuf, f->buf, testlen);
char *result = memchr(testbuf, 0x00, testlen);
if (result) {
return true;
} else {
return false;
}
}
struct filedata readfile(FILE *fp) { struct filedata readfile(FILE *fp) {
struct filedata f; struct filedata f;
@ -15,6 +33,39 @@ struct filedata readfile(FILE *fp) {
f.buf = NULL; f.buf = NULL;
f.lines = NULL; f.lines = NULL;
if (conf.isstdin) {
size_t bufsize = 1024;
f.buf = malloc(bufsize);
if (f.buf == NULL)
die("malloc");
char c;
while (fread(&c, 1, 1, fp) > 0) {
if (f.buflen == bufsize - 1) {
bufsize *= 2;
char *new_buf = realloc(f.buf, bufsize);
if (new_buf == NULL)
die("realloc");
f.buf = new_buf;
}
f.buf[f.buflen++] = c;
}
if (f.buflen < bufsize - 1) {
char *new_buf = realloc(f.buf, f.buflen + 1);
if (new_buf == NULL)
die("realloc");
f.buf = new_buf;
}
f.buf[f.buflen] = '\0';
f.binary = isbinary(&f);
return f;
}
// expects to be at beginning of file // expects to be at beginning of file
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
f.buflen = ftell(fp); f.buflen = ftell(fp);
@ -28,19 +79,7 @@ struct filedata readfile(FILE *fp) {
die("fread"); die("fread");
} }
// guess if printable f.binary = isbinary(&f);
// from https://github.com/sharkdp/content_inspector/blob/master/src/lib.rs
int testlen = f.buflen >= 64 ? 64 : f.buflen;
char *testbuf[testlen];
memcpy(testbuf, f.buf, testlen);
char *result = memchr(testbuf, 0x00, testlen);
if (result) {
f.binary = 1;
} else {
f.binary = 0;
}
return f; return f;
} }

View File

@ -1,12 +1,15 @@
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include "types.h" #include "types.h"
#include "util.h" #include "util.h"
void appendline(struct filedata *f, char *data, size_t len) { void appendline(struct filedata *f, char *data, size_t len) {
f->lines = realloc(f->lines, sizeof(struct line) * (f->lc + 1)); f->lines = realloc(f->lines, sizeof(struct line) * (f->lc + 1));
if (f->lines == NULL)
die("realloc");
size_t loc = f->lc; size_t loc = f->lc;
@ -20,7 +23,7 @@ void loadlines(struct filedata *f) {
f->lc = 0; f->lc = 0;
size_t offset = 0; size_t offset = 0;
size_t linelen = 4096; size_t linelen = 1024;
char *line = malloc(linelen); char *line = malloc(linelen);
if (line == NULL) if (line == NULL)
die("malloc"); die("malloc");
@ -28,10 +31,11 @@ void loadlines(struct filedata *f) {
for (size_t i = 0; i < f->buflen; i++) { for (size_t i = 0; i < f->buflen; i++) {
char c = f->buf[i]; char c = f->buf[i];
if (c == '\n') { if (c == '\n') {
if (offset < linelen) { // shrink if (offset >= 1 && offset < linelen) { // shrink to fit
char *new_line = realloc(line, offset); char *new_line = realloc(line, offset);
if (new_line == NULL) if (new_line == NULL)
die("realloc"); die("realloc");
line = new_line; line = new_line;
} }
@ -59,7 +63,7 @@ void loadlines(struct filedata *f) {
} }
// capture last line // capture last line
if (offset < linelen) { // shrink if (offset >= 1 && offset < linelen) { // shrink
char *new_line = realloc(line, offset); char *new_line = realloc(line, offset);
if (new_line == NULL) if (new_line == NULL)
die("realloc"); die("realloc");

View File

@ -1,8 +1,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/ioctl.h> #include <stdnoreturn.h>
void die(const char *message) { noreturn void die(const char *message) {
perror(message); perror(message);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

View File

@ -1,7 +1,6 @@
#include <libgen.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
#include "arg.h" #include "arg.h"
@ -15,63 +14,139 @@
#define GREY "\x1b[90m" #define GREY "\x1b[90m"
#define RESET "\x1b[0m" #define RESET "\x1b[0m"
FILE *st;
FILE *err;
struct colors {
char *invert_t;
char *grey;
char *reset;
};
struct colors c;
void initcolor(void) {
c.invert_t = conf.color ? INVERT_T : "";
c.grey = conf.color ? GREY : "";
c.reset = conf.color ? RESET : "";
}
void printheadertop(char *filename, bool binary) {
char *name = conf.name == NULL ? filename : conf.name;
char *addon = binary ? "<binary>" : "";
if (conf.isstdin && !conf.pager)
fprintf(err, "\x1b[2K\r%s%s%s%s\n", c.invert_t, name, addon, c.reset);
else
fprintf(err, "%s%s%s%s\n", c.invert_t, name, addon, c.reset);
}
void printheaderbottom(size_t buflen) {
float rounded;
char *format = formatbytes(buflen, &rounded);
fprintf(err, "%s%.2f %s%s\n", c.invert_t, rounded, format, c.reset);
}
void run(FILE *fp, char *filename, bool tty) { void run(FILE *fp, char *filename, bool tty) {
const char *invert_t = conf.color ? INVERT_T : ""; initcolor();
const char *grey = conf.color ? GREY : "";
const char *reset = conf.color ? RESET : "";
struct filedata f; struct filedata f;
f = readfile(fp); f = readfile(fp, conf.isstdin);
if (tty) {
char *addon = f.binary ? "<binary>" : "";
fprintf(stderr, "\r\x1b[2K%s%s%s%s\r\n", invert_t, basename(filename),
addon, reset);
}
// any/all processing to be done
// TODO: maybe multithread?
conf.process = (tty && !f.binary); conf.process = (tty && !f.binary);
if (conf.process) { // file display processing if (conf.process) { // file display processing
loadlines(&f); loadlines(&f);
} }
if (conf.process) { if (conf.extension != NULL) {
int linecount = 0; // TODO
}
struct winsize w;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1 || w.ws_col != 0) {
if (w.ws_row <= f.lc + 5) {
conf.pager = !conf.pager;
}
}
if (conf.pager) {
st = popen("less", "w");
err = st;
if (st == NULL)
die("popen 'less'");
}
if (conf.literal) {
err = st;
}
if (conf.force_binary > 0) {
f.binary = true;
} else if (conf.force_binary == 0) {
f.binary = false;
}
if (conf.headers) {
printheadertop(filename, f.binary);
}
if (conf.process) {
int linecount = 1;
for (int i = 0; i < f.lc; i++) { for (int i = 0; i < f.lc; i++) {
if (conf.lines) { if (conf.lines) {
char *padding = linepad(linecount, f.lc); { // line numbers
printf("%s%s%d:%s %s\n", grey, padding, i, reset, f.lines[i].buf); char *padding = linepad(linecount, f.lc);
free(padding); fprintf(err, "%s%s%d│%s ", c.grey, padding, i + 1, c.reset);
free(padding);
}
fwrite(f.lines[i].buf, 1, f.lines[i].len, st);
fprintf(st, "\n");
linecount++; linecount++;
} else { } else {
printf("%s\n", f.lines[i].buf); fprintf(st, "%s\n", f.lines[i].buf);
} }
free(f.lines[i].buf); free(f.lines[i].buf);
} }
} else { } else {
fwrite(f.buf, 1, f.buflen, stdout); fwrite(f.buf, 1, f.buflen, st);
fflush(st);
if (tty)
fwrite("\n", 1, 1, err);
} }
free(f.buf); free(f.buf);
free(f.lines);
fflush(stdout); // prevent timing inconsistencies between stdout and stderr fflush(st); // prevent timing inconsistencies between st and err
fflush(err);
if (tty) { if (conf.headers) {
float rounded; printheaderbottom(f.buflen);
char *format = formatbytes(f.buflen, &rounded); }
// char *cnewline = c == '\n' ? "" : "\n"; if (conf.pager) {
char *cnewline = ""; pclose(st); // err is already the same as st
fprintf(stderr, "\r%s%s%.2f %s%s\r\n", cnewline, invert_t, rounded, format,
reset);
} }
} }
void initconf(void) { void initconf(void) {
conf.force_binary = -1;
conf.isstdin = false;
conf.has_read_stdin = false;
conf.pager = false;
conf.literal = false;
conf.process = true; conf.process = true;
conf.headers = true;
conf.color = true; conf.color = true;
conf.lines = true; conf.lines = true;
conf.has_read_stdin = false;
conf.name = NULL;
conf.extension = NULL;
} }
void clearstdin(void) { void clearstdin(void) {
@ -83,6 +158,9 @@ void clearstdin(void) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
initconf(); initconf();
st = stdout;
err = stderr;
// init no_color first so that args take priority // init no_color first so that args take priority
char *no_color = getenv("NO_COLOR"); char *no_color = getenv("NO_COLOR");
@ -91,32 +169,46 @@ int main(int argc, char *argv[]) {
} }
bool tty = isatty(STDOUT_FILENO); bool tty = isatty(STDOUT_FILENO);
int offset = parseargs(argc, argv);
conf.headers = conf.headers && tty;
if (argc > 1) { if (argc > 1) {
int offset = parseargs(argc, argv);
tty = tty || conf.literal;
for (int i = offset; i < argc; i++) { for (int i = offset; i < argc; i++) {
if (*argv[i] == '-') { if (*argv[i] == '-') {
if (conf.has_read_stdin) if (conf.has_read_stdin)
clearstdin(); clearstdin();
conf.has_read_stdin = true; conf.has_read_stdin = true;
conf.isstdin = true;
run(stdin, "stdin", tty); run(stdin, "stdin", tty);
if (tty && (i + 1 != argc)) {
fprintf(err, "\n"); // separate concurrent files in tty
}
continue; continue;
} }
conf.isstdin = false;
FILE *fp = fopen(argv[i], "rb"); FILE *fp = fopen(argv[i], "rb");
if (fp == NULL) if (fp == NULL)
die(argv[i]); die(argv[i]);
run(fp, argv[i], tty); run(fp, argv[i], tty);
fclose(fp); fclose(fp);
if (tty && (i + 1 != argc)) { if (tty && (i + 1 != argc)) {
fprintf(stderr, "\r\n"); // separate concurrent files in tty fprintf(err, "\n"); // separate concurrent files in tty
} }
} }
if (offset == argc) { if (offset == argc) {
conf.isstdin = true;
run(stdin, "stdin", tty); run(stdin, "stdin", tty);
} }
} else { } else {
conf.isstdin = true;
run(stdin, "stdin", tty); // for piped-input or repl-like behavior run(stdin, "stdin", tty); // for piped-input or repl-like behavior
} }