summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Burda <quent.burda@gmail.com>2023-07-30 06:08:58 +0200
committerLouis Burda <quent.burda@gmail.com>2023-07-30 06:15:09 +0200
commit446c7a8998749b9ff993bd418c4df482f5553a68 (patch)
treef4b09f41e395579a864d4b144d795b77e0095cde
parenta019364e51a8831fc2e7ea3ac57dbc56df5e2a5b (diff)
downloadtabular-446c7a8998749b9ff993bd418c4df482f5553a68.tar.gz
tabular-446c7a8998749b9ff993bd418c4df482f5553a68.zip
Rename main.c to tabular.c and remove default pad
-rw-r--r--build.jst.tmpl2
-rw-r--r--tabular.c (renamed from main.c)15
2 files changed, 11 insertions, 6 deletions
diff --git a/build.jst.tmpl b/build.jst.tmpl
index 706b1d3..45eb28a 100644
--- a/build.jst.tmpl
+++ b/build.jst.tmpl
@@ -29,7 +29,7 @@ target lib/liballoc/build/liballoc.a
just lib/liballoc
target tabular
- cc main.c lib/libdvec/build/libdvec.a lib/libhmap/build/libhmap.a
+ cc tabular.c lib/libdvec/build/libdvec.a lib/libhmap/build/libhmap.a
lib/libtabular/build/libtabular.a lib/liballoc/build/liballoc.a
command clean
diff --git a/main.c b/tabular.c
index 8327572..d5c30ca 100644
--- a/main.c
+++ b/tabular.c
@@ -57,15 +57,15 @@ static struct tabular_cfg cfg = {
.fit_rows = false,
- .hsep = "│ ",
+ .hsep = "│",
.vsep = "─",
- .xsep = "┼─",
+ .xsep = "┼",
.outw = 0,
.outh = 0,
- .lpad = 1,
- .rpad = 1,
+ .lpad = 0,
+ .rpad = 0,
.user.ptr = NULL,
.row_gen = row_gen,
@@ -252,7 +252,11 @@ parse(int argc, const char **argv)
/* get general flags */
for (dst = arg = argv + 1; *arg; arg++) {
- if (!strcmp(*arg, "--hsep")) {
+ if (!strcmp(*arg, "-h") || !strcmp(*arg, "--help")) {
+ fprintf(stderr, "Usage: tabular "
+ "[--col NAME].. [--NAME-OPT VAL]..\n");
+ exit(1);
+ } else if (!strcmp(*arg, "--hsep")) {
if (!*++arg) die("missing args");
cfg.hsep = *arg;
} else if (!strcmp(*arg, "--vsep")) {
@@ -370,6 +374,7 @@ parse(int argc, const char **argv)
/* set column attrs */
for (dst = arg = argv + 1; *arg; arg++) {
if (!strncmp(*arg, "--", 2)) {
+ n = 0;
rc = sscanf(*arg, "--%63[^-]-%n", namebuf, &n);
if (rc != 1 || *(*arg+n-1) != '-') goto skip;
link = hmap_get(&colmap,